t/t1411: test reflog with formats
[git/dscho.git] / unpack-trees.c
blob1ca41b1a6986559a7c5ddc3983d751d75a0d23ff
1 #define NO_THE_INDEX_COMPATIBILITY_MACROS
2 #include "cache.h"
3 #include "dir.h"
4 #include "tree.h"
5 #include "tree-walk.h"
6 #include "cache-tree.h"
7 #include "unpack-trees.h"
8 #include "progress.h"
9 #include "refs.h"
10 #include "attr.h"
13 * Error messages expected by scripts out of plumbing commands such as
14 * read-tree. Non-scripted Porcelain is not required to use these messages
15 * and in fact are encouraged to reword them to better suit their particular
16 * situation better. See how "git checkout" and "git merge" replaces
17 * them using setup_unpack_trees_porcelain(), for example.
19 const char *unpack_plumbing_errors[NB_UNPACK_TREES_ERROR_TYPES] = {
20 /* ERROR_WOULD_OVERWRITE */
21 "Entry '%s' would be overwritten by merge. Cannot merge.",
23 /* ERROR_NOT_UPTODATE_FILE */
24 "Entry '%s' not uptodate. Cannot merge.",
26 /* ERROR_NOT_UPTODATE_DIR */
27 "Updating '%s' would lose untracked files in it",
29 /* ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN */
30 "Untracked working tree file '%s' would be overwritten by merge.",
32 /* ERROR_WOULD_LOSE_UNTRACKED_REMOVED */
33 "Untracked working tree file '%s' would be removed by merge.",
35 /* ERROR_BIND_OVERLAP */
36 "Entry '%s' overlaps with '%s'. Cannot bind.",
38 /* ERROR_SPARSE_NOT_UPTODATE_FILE */
39 "Entry '%s' not uptodate. Cannot update sparse checkout.",
41 /* ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN */
42 "Working tree file '%s' would be overwritten by sparse checkout update.",
44 /* ERROR_WOULD_LOSE_ORPHANED_REMOVED */
45 "Working tree file '%s' would be removed by sparse checkout update.",
48 #define ERRORMSG(o,type) \
49 ( ((o) && (o)->msgs[(type)]) \
50 ? ((o)->msgs[(type)]) \
51 : (unpack_plumbing_errors[(type)]) )
53 void setup_unpack_trees_porcelain(struct unpack_trees_options *opts,
54 const char *cmd)
56 int i;
57 const char **msgs = opts->msgs;
58 const char *msg;
59 char *tmp;
60 const char *cmd2 = strcmp(cmd, "checkout") ? cmd : "switch branches";
61 if (advice_commit_before_merge)
62 msg = "Your local changes to the following files would be overwritten by %s:\n%%s"
63 "Please, commit your changes or stash them before you can %s.";
64 else
65 msg = "Your local changes to the following files would be overwritten by %s:\n%%s";
66 tmp = xmalloc(strlen(msg) + strlen(cmd) + strlen(cmd2) - 2);
67 sprintf(tmp, msg, cmd, cmd2);
68 msgs[ERROR_WOULD_OVERWRITE] = tmp;
69 msgs[ERROR_NOT_UPTODATE_FILE] = tmp;
71 msgs[ERROR_NOT_UPTODATE_DIR] =
72 "Updating the following directories would lose untracked files in it:\n%s";
74 if (advice_commit_before_merge)
75 msg = "The following untracked working tree files would be %s by %s:\n%%s"
76 "Please move or remove them before you can %s.";
77 else
78 msg = "The following untracked working tree files would be %s by %s:\n%%s";
79 tmp = xmalloc(strlen(msg) + strlen(cmd) + strlen("removed") + strlen(cmd2) - 4);
80 sprintf(tmp, msg, "removed", cmd, cmd2);
81 msgs[ERROR_WOULD_LOSE_UNTRACKED_REMOVED] = tmp;
82 tmp = xmalloc(strlen(msg) + strlen(cmd) + strlen("overwritten") + strlen(cmd2) - 4);
83 sprintf(tmp, msg, "overwritten", cmd, cmd2);
84 msgs[ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN] = tmp;
87 * Special case: ERROR_BIND_OVERLAP refers to a pair of paths, we
88 * cannot easily display it as a list.
90 msgs[ERROR_BIND_OVERLAP] = "Entry '%s' overlaps with '%s'. Cannot bind.";
92 msgs[ERROR_SPARSE_NOT_UPTODATE_FILE] =
93 "Cannot update sparse checkout: the following entries are not up-to-date:\n%s";
94 msgs[ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN] =
95 "The following Working tree files would be overwritten by sparse checkout update:\n%s";
96 msgs[ERROR_WOULD_LOSE_ORPHANED_REMOVED] =
97 "The following Working tree files would be removed by sparse checkout update:\n%s";
99 opts->show_all_errors = 1;
100 /* rejected paths may not have a static buffer */
101 for (i = 0; i < ARRAY_SIZE(opts->unpack_rejects); i++)
102 opts->unpack_rejects[i].strdup_strings = 1;
105 static void add_entry(struct unpack_trees_options *o, struct cache_entry *ce,
106 unsigned int set, unsigned int clear)
108 unsigned int size = ce_size(ce);
109 struct cache_entry *new = xmalloc(size);
111 clear |= CE_HASHED | CE_UNHASHED;
113 if (set & CE_REMOVE)
114 set |= CE_WT_REMOVE;
116 memcpy(new, ce, size);
117 new->next = NULL;
118 new->ce_flags = (new->ce_flags & ~clear) | set;
119 add_index_entry(&o->result, new, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE);
123 * add error messages on path <path>
124 * corresponding to the type <e> with the message <msg>
125 * indicating if it should be display in porcelain or not
127 static int add_rejected_path(struct unpack_trees_options *o,
128 enum unpack_trees_error_types e,
129 const char *path)
131 if (!o->show_all_errors)
132 return error(ERRORMSG(o, e), path);
135 * Otherwise, insert in a list for future display by
136 * display_error_msgs()
138 string_list_append(&o->unpack_rejects[e], path);
139 return -1;
143 * display all the error messages stored in a nice way
145 static void display_error_msgs(struct unpack_trees_options *o)
147 int e, i;
148 int something_displayed = 0;
149 for (e = 0; e < NB_UNPACK_TREES_ERROR_TYPES; e++) {
150 struct string_list *rejects = &o->unpack_rejects[e];
151 if (rejects->nr > 0) {
152 struct strbuf path = STRBUF_INIT;
153 something_displayed = 1;
154 for (i = 0; i < rejects->nr; i++)
155 strbuf_addf(&path, "\t%s\n", rejects->items[i].string);
156 error(ERRORMSG(o, e), path.buf);
157 strbuf_release(&path);
159 string_list_clear(rejects, 0);
161 if (something_displayed)
162 printf("Aborting\n");
166 * Unlink the last component and schedule the leading directories for
167 * removal, such that empty directories get removed.
169 static void unlink_entry(struct cache_entry *ce)
171 if (!check_leading_path(ce->name, ce_namelen(ce)))
172 return;
173 if (remove_or_warn(ce->ce_mode, ce->name))
174 return;
175 schedule_dir_for_removal(ce->name, ce_namelen(ce));
178 static struct checkout state;
179 static int check_updates(struct unpack_trees_options *o)
181 unsigned cnt = 0, total = 0;
182 struct progress *progress = NULL;
183 struct index_state *index = &o->result;
184 int i;
185 int errs = 0;
187 if (o->update && o->verbose_update) {
188 for (total = cnt = 0; cnt < index->cache_nr; cnt++) {
189 struct cache_entry *ce = index->cache[cnt];
190 if (ce->ce_flags & (CE_UPDATE | CE_WT_REMOVE))
191 total++;
194 progress = start_progress_delay("Checking out files",
195 total, 50, 1);
196 cnt = 0;
199 if (o->update)
200 git_attr_set_direction(GIT_ATTR_CHECKOUT, &o->result);
201 for (i = 0; i < index->cache_nr; i++) {
202 struct cache_entry *ce = index->cache[i];
204 if (ce->ce_flags & CE_WT_REMOVE) {
205 display_progress(progress, ++cnt);
206 if (o->update)
207 unlink_entry(ce);
208 continue;
211 remove_marked_cache_entries(&o->result);
212 remove_scheduled_dirs();
214 for (i = 0; i < index->cache_nr; i++) {
215 struct cache_entry *ce = index->cache[i];
217 if (ce->ce_flags & CE_UPDATE) {
218 display_progress(progress, ++cnt);
219 ce->ce_flags &= ~CE_UPDATE;
220 if (o->update) {
221 errs |= checkout_entry(ce, &state, NULL);
225 stop_progress(&progress);
226 if (o->update)
227 git_attr_set_direction(GIT_ATTR_CHECKIN, NULL);
228 return errs != 0;
231 static int verify_uptodate_sparse(struct cache_entry *ce, struct unpack_trees_options *o);
232 static int verify_absent_sparse(struct cache_entry *ce, enum unpack_trees_error_types, struct unpack_trees_options *o);
234 static int apply_sparse_checkout(struct cache_entry *ce, struct unpack_trees_options *o)
236 int was_skip_worktree = ce_skip_worktree(ce);
238 if (ce->ce_flags & CE_NEW_SKIP_WORKTREE)
239 ce->ce_flags |= CE_SKIP_WORKTREE;
240 else
241 ce->ce_flags &= ~CE_SKIP_WORKTREE;
244 * if (!was_skip_worktree && !ce_skip_worktree()) {
245 * This is perfectly normal. Move on;
250 * Merge strategies may set CE_UPDATE|CE_REMOVE outside checkout
251 * area as a result of ce_skip_worktree() shortcuts in
252 * verify_absent() and verify_uptodate().
253 * Make sure they don't modify worktree if they are already
254 * outside checkout area
256 if (was_skip_worktree && ce_skip_worktree(ce)) {
257 ce->ce_flags &= ~CE_UPDATE;
260 * By default, when CE_REMOVE is on, CE_WT_REMOVE is also
261 * on to get that file removed from both index and worktree.
262 * If that file is already outside worktree area, don't
263 * bother remove it.
265 if (ce->ce_flags & CE_REMOVE)
266 ce->ce_flags &= ~CE_WT_REMOVE;
269 if (!was_skip_worktree && ce_skip_worktree(ce)) {
271 * If CE_UPDATE is set, verify_uptodate() must be called already
272 * also stat info may have lost after merged_entry() so calling
273 * verify_uptodate() again may fail
275 if (!(ce->ce_flags & CE_UPDATE) && verify_uptodate_sparse(ce, o))
276 return -1;
277 ce->ce_flags |= CE_WT_REMOVE;
279 if (was_skip_worktree && !ce_skip_worktree(ce)) {
280 if (verify_absent_sparse(ce, ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN, o))
281 return -1;
282 ce->ce_flags |= CE_UPDATE;
284 return 0;
287 static inline int call_unpack_fn(struct cache_entry **src, struct unpack_trees_options *o)
289 int ret = o->fn(src, o);
290 if (ret > 0)
291 ret = 0;
292 return ret;
295 static void mark_ce_used(struct cache_entry *ce, struct unpack_trees_options *o)
297 ce->ce_flags |= CE_UNPACKED;
299 if (o->cache_bottom < o->src_index->cache_nr &&
300 o->src_index->cache[o->cache_bottom] == ce) {
301 int bottom = o->cache_bottom;
302 while (bottom < o->src_index->cache_nr &&
303 o->src_index->cache[bottom]->ce_flags & CE_UNPACKED)
304 bottom++;
305 o->cache_bottom = bottom;
309 static void mark_all_ce_unused(struct index_state *index)
311 int i;
312 for (i = 0; i < index->cache_nr; i++)
313 index->cache[i]->ce_flags &= ~(CE_UNPACKED | CE_ADDED | CE_NEW_SKIP_WORKTREE);
316 static int locate_in_src_index(struct cache_entry *ce,
317 struct unpack_trees_options *o)
319 struct index_state *index = o->src_index;
320 int len = ce_namelen(ce);
321 int pos = index_name_pos(index, ce->name, len);
322 if (pos < 0)
323 pos = -1 - pos;
324 return pos;
328 * We call unpack_index_entry() with an unmerged cache entry
329 * only in diff-index, and it wants a single callback. Skip
330 * the other unmerged entry with the same name.
332 static void mark_ce_used_same_name(struct cache_entry *ce,
333 struct unpack_trees_options *o)
335 struct index_state *index = o->src_index;
336 int len = ce_namelen(ce);
337 int pos;
339 for (pos = locate_in_src_index(ce, o); pos < index->cache_nr; pos++) {
340 struct cache_entry *next = index->cache[pos];
341 if (len != ce_namelen(next) ||
342 memcmp(ce->name, next->name, len))
343 break;
344 mark_ce_used(next, o);
348 static struct cache_entry *next_cache_entry(struct unpack_trees_options *o)
350 const struct index_state *index = o->src_index;
351 int pos = o->cache_bottom;
353 while (pos < index->cache_nr) {
354 struct cache_entry *ce = index->cache[pos];
355 if (!(ce->ce_flags & CE_UNPACKED))
356 return ce;
357 pos++;
359 return NULL;
362 static void add_same_unmerged(struct cache_entry *ce,
363 struct unpack_trees_options *o)
365 struct index_state *index = o->src_index;
366 int len = ce_namelen(ce);
367 int pos = index_name_pos(index, ce->name, len);
369 if (0 <= pos)
370 die("programming error in a caller of mark_ce_used_same_name");
371 for (pos = -pos - 1; pos < index->cache_nr; pos++) {
372 struct cache_entry *next = index->cache[pos];
373 if (len != ce_namelen(next) ||
374 memcmp(ce->name, next->name, len))
375 break;
376 add_entry(o, next, 0, 0);
377 mark_ce_used(next, o);
381 static int unpack_index_entry(struct cache_entry *ce,
382 struct unpack_trees_options *o)
384 struct cache_entry *src[5] = { NULL };
385 int ret;
387 src[0] = ce;
389 mark_ce_used(ce, o);
390 if (ce_stage(ce)) {
391 if (o->skip_unmerged) {
392 add_entry(o, ce, 0, 0);
393 return 0;
396 ret = call_unpack_fn(src, o);
397 if (ce_stage(ce))
398 mark_ce_used_same_name(ce, o);
399 return ret;
402 static int find_cache_pos(struct traverse_info *, const struct name_entry *);
404 static void restore_cache_bottom(struct traverse_info *info, int bottom)
406 struct unpack_trees_options *o = info->data;
408 if (o->diff_index_cached)
409 return;
410 o->cache_bottom = bottom;
413 static int switch_cache_bottom(struct traverse_info *info)
415 struct unpack_trees_options *o = info->data;
416 int ret, pos;
418 if (o->diff_index_cached)
419 return 0;
420 ret = o->cache_bottom;
421 pos = find_cache_pos(info->prev, &info->name);
423 if (pos < -1)
424 o->cache_bottom = -2 - pos;
425 else if (pos < 0)
426 o->cache_bottom = o->src_index->cache_nr;
427 return ret;
430 static int traverse_trees_recursive(int n, unsigned long dirmask, unsigned long df_conflicts, struct name_entry *names, struct traverse_info *info)
432 int i, ret, bottom;
433 struct tree_desc t[MAX_UNPACK_TREES];
434 void *buf[MAX_UNPACK_TREES];
435 struct traverse_info newinfo;
436 struct name_entry *p;
438 p = names;
439 while (!p->mode)
440 p++;
442 newinfo = *info;
443 newinfo.prev = info;
444 newinfo.name = *p;
445 newinfo.pathlen += tree_entry_len(p->path, p->sha1) + 1;
446 newinfo.conflicts |= df_conflicts;
448 for (i = 0; i < n; i++, dirmask >>= 1) {
449 const unsigned char *sha1 = NULL;
450 if (dirmask & 1)
451 sha1 = names[i].sha1;
452 buf[i] = fill_tree_descriptor(t+i, sha1);
455 bottom = switch_cache_bottom(&newinfo);
456 ret = traverse_trees(n, t, &newinfo);
457 restore_cache_bottom(&newinfo, bottom);
459 for (i = 0; i < n; i++)
460 free(buf[i]);
462 return ret;
466 * Compare the traverse-path to the cache entry without actually
467 * having to generate the textual representation of the traverse
468 * path.
470 * NOTE! This *only* compares up to the size of the traverse path
471 * itself - the caller needs to do the final check for the cache
472 * entry having more data at the end!
474 static int do_compare_entry(const struct cache_entry *ce, const struct traverse_info *info, const struct name_entry *n)
476 int len, pathlen, ce_len;
477 const char *ce_name;
479 if (info->prev) {
480 int cmp = do_compare_entry(ce, info->prev, &info->name);
481 if (cmp)
482 return cmp;
484 pathlen = info->pathlen;
485 ce_len = ce_namelen(ce);
487 /* If ce_len < pathlen then we must have previously hit "name == directory" entry */
488 if (ce_len < pathlen)
489 return -1;
491 ce_len -= pathlen;
492 ce_name = ce->name + pathlen;
494 len = tree_entry_len(n->path, n->sha1);
495 return df_name_compare(ce_name, ce_len, S_IFREG, n->path, len, n->mode);
498 static int compare_entry(const struct cache_entry *ce, const struct traverse_info *info, const struct name_entry *n)
500 int cmp = do_compare_entry(ce, info, n);
501 if (cmp)
502 return cmp;
505 * Even if the beginning compared identically, the ce should
506 * compare as bigger than a directory leading up to it!
508 return ce_namelen(ce) > traverse_path_len(info, n);
511 static int ce_in_traverse_path(const struct cache_entry *ce,
512 const struct traverse_info *info)
514 if (!info->prev)
515 return 1;
516 if (do_compare_entry(ce, info->prev, &info->name))
517 return 0;
519 * If ce (blob) is the same name as the path (which is a tree
520 * we will be descending into), it won't be inside it.
522 return (info->pathlen < ce_namelen(ce));
525 static struct cache_entry *create_ce_entry(const struct traverse_info *info, const struct name_entry *n, int stage)
527 int len = traverse_path_len(info, n);
528 struct cache_entry *ce = xcalloc(1, cache_entry_size(len));
530 ce->ce_mode = create_ce_mode(n->mode);
531 ce->ce_flags = create_ce_flags(len, stage);
532 hashcpy(ce->sha1, n->sha1);
533 make_traverse_path(ce->name, info, n);
535 return ce;
538 static int unpack_nondirectories(int n, unsigned long mask,
539 unsigned long dirmask,
540 struct cache_entry **src,
541 const struct name_entry *names,
542 const struct traverse_info *info)
544 int i;
545 struct unpack_trees_options *o = info->data;
546 unsigned long conflicts;
548 /* Do we have *only* directories? Nothing to do */
549 if (mask == dirmask && !src[0])
550 return 0;
552 conflicts = info->conflicts;
553 if (o->merge)
554 conflicts >>= 1;
555 conflicts |= dirmask;
558 * Ok, we've filled in up to any potential index entry in src[0],
559 * now do the rest.
561 for (i = 0; i < n; i++) {
562 int stage;
563 unsigned int bit = 1ul << i;
564 if (conflicts & bit) {
565 src[i + o->merge] = o->df_conflict_entry;
566 continue;
568 if (!(mask & bit))
569 continue;
570 if (!o->merge)
571 stage = 0;
572 else if (i + 1 < o->head_idx)
573 stage = 1;
574 else if (i + 1 > o->head_idx)
575 stage = 3;
576 else
577 stage = 2;
578 src[i + o->merge] = create_ce_entry(info, names + i, stage);
581 if (o->merge)
582 return call_unpack_fn(src, o);
584 for (i = 0; i < n; i++)
585 if (src[i] && src[i] != o->df_conflict_entry)
586 add_entry(o, src[i], 0, 0);
587 return 0;
590 static int unpack_failed(struct unpack_trees_options *o, const char *message)
592 discard_index(&o->result);
593 if (!o->gently) {
594 if (message)
595 return error("%s", message);
596 return -1;
598 return -1;
601 /* NEEDSWORK: give this a better name and share with tree-walk.c */
602 static int name_compare(const char *a, int a_len,
603 const char *b, int b_len)
605 int len = (a_len < b_len) ? a_len : b_len;
606 int cmp = memcmp(a, b, len);
607 if (cmp)
608 return cmp;
609 return (a_len - b_len);
613 * The tree traversal is looking at name p. If we have a matching entry,
614 * return it. If name p is a directory in the index, do not return
615 * anything, as we will want to match it when the traversal descends into
616 * the directory.
618 static int find_cache_pos(struct traverse_info *info,
619 const struct name_entry *p)
621 int pos;
622 struct unpack_trees_options *o = info->data;
623 struct index_state *index = o->src_index;
624 int pfxlen = info->pathlen;
625 int p_len = tree_entry_len(p->path, p->sha1);
627 for (pos = o->cache_bottom; pos < index->cache_nr; pos++) {
628 struct cache_entry *ce = index->cache[pos];
629 const char *ce_name, *ce_slash;
630 int cmp, ce_len;
632 if (ce->ce_flags & CE_UNPACKED) {
634 * cache_bottom entry is already unpacked, so
635 * we can never match it; don't check it
636 * again.
638 if (pos == o->cache_bottom)
639 ++o->cache_bottom;
640 continue;
642 if (!ce_in_traverse_path(ce, info))
643 continue;
644 ce_name = ce->name + pfxlen;
645 ce_slash = strchr(ce_name, '/');
646 if (ce_slash)
647 ce_len = ce_slash - ce_name;
648 else
649 ce_len = ce_namelen(ce) - pfxlen;
650 cmp = name_compare(p->path, p_len, ce_name, ce_len);
652 * Exact match; if we have a directory we need to
653 * delay returning it.
655 if (!cmp)
656 return ce_slash ? -2 - pos : pos;
657 if (0 < cmp)
658 continue; /* keep looking */
660 * ce_name sorts after p->path; could it be that we
661 * have files under p->path directory in the index?
662 * E.g. ce_name == "t-i", and p->path == "t"; we may
663 * have "t/a" in the index.
665 if (p_len < ce_len && !memcmp(ce_name, p->path, p_len) &&
666 ce_name[p_len] < '/')
667 continue; /* keep looking */
668 break;
670 return -1;
673 static struct cache_entry *find_cache_entry(struct traverse_info *info,
674 const struct name_entry *p)
676 int pos = find_cache_pos(info, p);
677 struct unpack_trees_options *o = info->data;
679 if (0 <= pos)
680 return o->src_index->cache[pos];
681 else
682 return NULL;
685 static void debug_path(struct traverse_info *info)
687 if (info->prev) {
688 debug_path(info->prev);
689 if (*info->prev->name.path)
690 putchar('/');
692 printf("%s", info->name.path);
695 static void debug_name_entry(int i, struct name_entry *n)
697 printf("ent#%d %06o %s\n", i,
698 n->path ? n->mode : 0,
699 n->path ? n->path : "(missing)");
702 static void debug_unpack_callback(int n,
703 unsigned long mask,
704 unsigned long dirmask,
705 struct name_entry *names,
706 struct traverse_info *info)
708 int i;
709 printf("* unpack mask %lu, dirmask %lu, cnt %d ",
710 mask, dirmask, n);
711 debug_path(info);
712 putchar('\n');
713 for (i = 0; i < n; i++)
714 debug_name_entry(i, names + i);
717 static int unpack_callback(int n, unsigned long mask, unsigned long dirmask, struct name_entry *names, struct traverse_info *info)
719 struct cache_entry *src[MAX_UNPACK_TREES + 1] = { NULL, };
720 struct unpack_trees_options *o = info->data;
721 const struct name_entry *p = names;
723 /* Find first entry with a real name (we could use "mask" too) */
724 while (!p->mode)
725 p++;
727 if (o->debug_unpack)
728 debug_unpack_callback(n, mask, dirmask, names, info);
730 /* Are we supposed to look at the index too? */
731 if (o->merge) {
732 while (1) {
733 int cmp;
734 struct cache_entry *ce;
736 if (o->diff_index_cached)
737 ce = next_cache_entry(o);
738 else
739 ce = find_cache_entry(info, p);
741 if (!ce)
742 break;
743 cmp = compare_entry(ce, info, p);
744 if (cmp < 0) {
745 if (unpack_index_entry(ce, o) < 0)
746 return unpack_failed(o, NULL);
747 continue;
749 if (!cmp) {
750 if (ce_stage(ce)) {
752 * If we skip unmerged index
753 * entries, we'll skip this
754 * entry *and* the tree
755 * entries associated with it!
757 if (o->skip_unmerged) {
758 add_same_unmerged(ce, o);
759 return mask;
762 src[0] = ce;
764 break;
768 if (unpack_nondirectories(n, mask, dirmask, src, names, info) < 0)
769 return -1;
771 if (src[0]) {
772 if (ce_stage(src[0]))
773 mark_ce_used_same_name(src[0], o);
774 else
775 mark_ce_used(src[0], o);
778 /* Now handle any directories.. */
779 if (dirmask) {
780 unsigned long conflicts = mask & ~dirmask;
781 if (o->merge) {
782 conflicts <<= 1;
783 if (src[0])
784 conflicts |= 1;
787 /* special case: "diff-index --cached" looking at a tree */
788 if (o->diff_index_cached &&
789 n == 1 && dirmask == 1 && S_ISDIR(names->mode)) {
790 int matches;
791 matches = cache_tree_matches_traversal(o->src_index->cache_tree,
792 names, info);
794 * Everything under the name matches; skip the
795 * entire hierarchy. diff_index_cached codepath
796 * special cases D/F conflicts in such a way that
797 * it does not do any look-ahead, so this is safe.
799 if (matches) {
800 o->cache_bottom += matches;
801 return mask;
805 if (traverse_trees_recursive(n, dirmask, conflicts,
806 names, info) < 0)
807 return -1;
808 return mask;
811 return mask;
814 /* Whole directory matching */
815 static int clear_ce_flags_dir(struct cache_entry **cache, int nr,
816 char *prefix, int prefix_len,
817 char *basename,
818 int select_mask, int clear_mask,
819 struct exclude_list *el)
821 struct cache_entry **cache_end = cache + nr;
822 int dtype = DT_DIR;
823 int ret = excluded_from_list(prefix, prefix_len, basename, &dtype, el);
825 prefix[prefix_len++] = '/';
827 /* included, no clearing for any entries under this directory */
828 if (!ret) {
829 for (; cache != cache_end; cache++) {
830 struct cache_entry *ce = *cache;
831 if (strncmp(ce->name, prefix, prefix_len))
832 break;
834 return nr - (cache_end - cache);
837 /* excluded, clear all selected entries under this directory. */
838 if (ret == 1) {
839 for (; cache != cache_end; cache++) {
840 struct cache_entry *ce = *cache;
841 if (select_mask && !(ce->ce_flags & select_mask))
842 continue;
843 if (strncmp(ce->name, prefix, prefix_len))
844 break;
845 ce->ce_flags &= ~clear_mask;
847 return nr - (cache_end - cache);
850 return 0;
854 * Traverse the index, find every entry that matches according to
855 * o->el. Do "ce_flags &= ~clear_mask" on those entries. Return the
856 * number of traversed entries.
858 * If select_mask is non-zero, only entries whose ce_flags has on of
859 * those bits enabled are traversed.
861 * cache : pointer to an index entry
862 * prefix_len : an offset to its path
864 * The current path ("prefix") including the trailing '/' is
865 * cache[0]->name[0..(prefix_len-1)]
866 * Top level path has prefix_len zero.
868 static int clear_ce_flags_1(struct cache_entry **cache, int nr,
869 char *prefix, int prefix_len,
870 int select_mask, int clear_mask,
871 struct exclude_list *el)
873 struct cache_entry **cache_end = cache + nr;
876 * Process all entries that have the given prefix and meet
877 * select_mask condition
879 while(cache != cache_end) {
880 struct cache_entry *ce = *cache;
881 const char *name, *slash;
882 int len, dtype;
884 if (select_mask && !(ce->ce_flags & select_mask)) {
885 cache++;
886 continue;
889 if (prefix_len && strncmp(ce->name, prefix, prefix_len))
890 break;
892 name = ce->name + prefix_len;
893 slash = strchr(name, '/');
895 /* If it's a directory, try whole directory match first */
896 if (slash) {
897 int processed;
899 len = slash - name;
900 memcpy(prefix + prefix_len, name, len);
903 * terminate the string (no trailing slash),
904 * clear_c_f_dir needs it
906 prefix[prefix_len + len] = '\0';
907 processed = clear_ce_flags_dir(cache, cache_end - cache,
908 prefix, prefix_len + len,
909 prefix + prefix_len,
910 select_mask, clear_mask,
911 el);
913 /* clear_c_f_dir eats a whole dir already? */
914 if (processed) {
915 cache += processed;
916 continue;
919 prefix[prefix_len + len++] = '/';
920 cache += clear_ce_flags_1(cache, cache_end - cache,
921 prefix, prefix_len + len,
922 select_mask, clear_mask, el);
923 continue;
926 /* Non-directory */
927 dtype = ce_to_dtype(ce);
928 if (excluded_from_list(ce->name, ce_namelen(ce), name, &dtype, el) > 0)
929 ce->ce_flags &= ~clear_mask;
930 cache++;
932 return nr - (cache_end - cache);
935 static int clear_ce_flags(struct cache_entry **cache, int nr,
936 int select_mask, int clear_mask,
937 struct exclude_list *el)
939 char prefix[PATH_MAX];
940 return clear_ce_flags_1(cache, nr,
941 prefix, 0,
942 select_mask, clear_mask,
943 el);
947 * Set/Clear CE_NEW_SKIP_WORKTREE according to $GIT_DIR/info/sparse-checkout
949 static void mark_new_skip_worktree(struct exclude_list *el,
950 struct index_state *the_index,
951 int select_flag, int skip_wt_flag)
953 int i;
956 * 1. Pretend the narrowest worktree: only unmerged entries
957 * are checked out
959 for (i = 0; i < the_index->cache_nr; i++) {
960 struct cache_entry *ce = the_index->cache[i];
962 if (select_flag && !(ce->ce_flags & select_flag))
963 continue;
965 if (!ce_stage(ce))
966 ce->ce_flags |= skip_wt_flag;
967 else
968 ce->ce_flags &= ~skip_wt_flag;
972 * 2. Widen worktree according to sparse-checkout file.
973 * Matched entries will have skip_wt_flag cleared (i.e. "in")
975 clear_ce_flags(the_index->cache, the_index->cache_nr,
976 select_flag, skip_wt_flag, el);
979 static int verify_absent(struct cache_entry *, enum unpack_trees_error_types, struct unpack_trees_options *);
981 * N-way merge "len" trees. Returns 0 on success, -1 on failure to manipulate the
982 * resulting index, -2 on failure to reflect the changes to the work tree.
984 * CE_ADDED, CE_UNPACKED and CE_NEW_SKIP_WORKTREE are used internally
986 int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options *o)
988 int i, ret;
989 static struct cache_entry *dfc;
990 struct exclude_list el;
992 if (len > MAX_UNPACK_TREES)
993 die("unpack_trees takes at most %d trees", MAX_UNPACK_TREES);
994 memset(&state, 0, sizeof(state));
995 state.base_dir = "";
996 state.force = 1;
997 state.quiet = 1;
998 state.refresh_cache = 1;
1000 memset(&el, 0, sizeof(el));
1001 if (!core_apply_sparse_checkout || !o->update)
1002 o->skip_sparse_checkout = 1;
1003 if (!o->skip_sparse_checkout) {
1004 if (add_excludes_from_file_to_list(git_path("info/sparse-checkout"), "", 0, NULL, &el, 0) < 0)
1005 o->skip_sparse_checkout = 1;
1006 else
1007 o->el = &el;
1010 memset(&o->result, 0, sizeof(o->result));
1011 o->result.initialized = 1;
1012 o->result.timestamp.sec = o->src_index->timestamp.sec;
1013 o->result.timestamp.nsec = o->src_index->timestamp.nsec;
1014 o->merge_size = len;
1015 mark_all_ce_unused(o->src_index);
1018 * Sparse checkout loop #1: set NEW_SKIP_WORKTREE on existing entries
1020 if (!o->skip_sparse_checkout)
1021 mark_new_skip_worktree(o->el, o->src_index, 0, CE_NEW_SKIP_WORKTREE);
1023 if (!dfc)
1024 dfc = xcalloc(1, cache_entry_size(0));
1025 o->df_conflict_entry = dfc;
1027 if (len) {
1028 const char *prefix = o->prefix ? o->prefix : "";
1029 struct traverse_info info;
1031 setup_traverse_info(&info, prefix);
1032 info.fn = unpack_callback;
1033 info.data = o;
1034 info.show_all_errors = o->show_all_errors;
1036 if (o->prefix) {
1038 * Unpack existing index entries that sort before the
1039 * prefix the tree is spliced into. Note that o->merge
1040 * is always true in this case.
1042 while (1) {
1043 struct cache_entry *ce = next_cache_entry(o);
1044 if (!ce)
1045 break;
1046 if (ce_in_traverse_path(ce, &info))
1047 break;
1048 if (unpack_index_entry(ce, o) < 0)
1049 goto return_failed;
1053 if (traverse_trees(len, t, &info) < 0)
1054 goto return_failed;
1057 /* Any left-over entries in the index? */
1058 if (o->merge) {
1059 while (1) {
1060 struct cache_entry *ce = next_cache_entry(o);
1061 if (!ce)
1062 break;
1063 if (unpack_index_entry(ce, o) < 0)
1064 goto return_failed;
1067 mark_all_ce_unused(o->src_index);
1069 if (o->trivial_merges_only && o->nontrivial_merge) {
1070 ret = unpack_failed(o, "Merge requires file-level merging");
1071 goto done;
1074 if (!o->skip_sparse_checkout) {
1075 int empty_worktree = 1;
1078 * Sparse checkout loop #2: set NEW_SKIP_WORKTREE on entries not in loop #1
1079 * If the will have NEW_SKIP_WORKTREE, also set CE_SKIP_WORKTREE
1080 * so apply_sparse_checkout() won't attempt to remove it from worktree
1082 mark_new_skip_worktree(o->el, &o->result, CE_ADDED, CE_SKIP_WORKTREE | CE_NEW_SKIP_WORKTREE);
1084 for (i = 0; i < o->result.cache_nr; i++) {
1085 struct cache_entry *ce = o->result.cache[i];
1088 * Entries marked with CE_ADDED in merged_entry() do not have
1089 * verify_absent() check (the check is effectively disabled
1090 * because CE_NEW_SKIP_WORKTREE is set unconditionally).
1092 * Do the real check now because we have had
1093 * correct CE_NEW_SKIP_WORKTREE
1095 if (ce->ce_flags & CE_ADDED &&
1096 verify_absent(ce, ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN, o))
1097 return -1;
1099 if (apply_sparse_checkout(ce, o)) {
1100 ret = -1;
1101 goto done;
1103 if (!ce_skip_worktree(ce))
1104 empty_worktree = 0;
1107 if (o->result.cache_nr && empty_worktree) {
1108 ret = unpack_failed(o, "Sparse checkout leaves no entry on working directory");
1109 goto done;
1113 o->src_index = NULL;
1114 ret = check_updates(o) ? (-2) : 0;
1115 if (o->dst_index)
1116 *o->dst_index = o->result;
1118 done:
1119 free_excludes(&el);
1120 return ret;
1122 return_failed:
1123 if (o->show_all_errors)
1124 display_error_msgs(o);
1125 mark_all_ce_unused(o->src_index);
1126 ret = unpack_failed(o, NULL);
1127 goto done;
1130 /* Here come the merge functions */
1132 static int reject_merge(struct cache_entry *ce, struct unpack_trees_options *o)
1134 return add_rejected_path(o, ERROR_WOULD_OVERWRITE, ce->name);
1137 static int same(struct cache_entry *a, struct cache_entry *b)
1139 if (!!a != !!b)
1140 return 0;
1141 if (!a && !b)
1142 return 1;
1143 if ((a->ce_flags | b->ce_flags) & CE_CONFLICTED)
1144 return 0;
1145 return a->ce_mode == b->ce_mode &&
1146 !hashcmp(a->sha1, b->sha1);
1151 * When a CE gets turned into an unmerged entry, we
1152 * want it to be up-to-date
1154 static int verify_uptodate_1(struct cache_entry *ce,
1155 struct unpack_trees_options *o,
1156 enum unpack_trees_error_types error_type)
1158 struct stat st;
1160 if (o->index_only || (!((ce->ce_flags & CE_VALID) || ce_skip_worktree(ce)) && (o->reset || ce_uptodate(ce))))
1161 return 0;
1163 if (!lstat(ce->name, &st)) {
1164 unsigned changed = ie_match_stat(o->src_index, ce, &st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE);
1165 if (!changed)
1166 return 0;
1168 * NEEDSWORK: the current default policy is to allow
1169 * submodule to be out of sync wrt the supermodule
1170 * index. This needs to be tightened later for
1171 * submodules that are marked to be automatically
1172 * checked out.
1174 if (S_ISGITLINK(ce->ce_mode))
1175 return 0;
1176 errno = 0;
1178 if (errno == ENOENT)
1179 return 0;
1180 return o->gently ? -1 :
1181 add_rejected_path(o, error_type, ce->name);
1184 static int verify_uptodate(struct cache_entry *ce,
1185 struct unpack_trees_options *o)
1187 if (!o->skip_sparse_checkout && (ce->ce_flags & CE_NEW_SKIP_WORKTREE))
1188 return 0;
1189 return verify_uptodate_1(ce, o, ERROR_NOT_UPTODATE_FILE);
1192 static int verify_uptodate_sparse(struct cache_entry *ce,
1193 struct unpack_trees_options *o)
1195 return verify_uptodate_1(ce, o, ERROR_SPARSE_NOT_UPTODATE_FILE);
1198 static void invalidate_ce_path(struct cache_entry *ce, struct unpack_trees_options *o)
1200 if (ce)
1201 cache_tree_invalidate_path(o->src_index->cache_tree, ce->name);
1205 * Check that checking out ce->sha1 in subdir ce->name is not
1206 * going to overwrite any working files.
1208 * Currently, git does not checkout subprojects during a superproject
1209 * checkout, so it is not going to overwrite anything.
1211 static int verify_clean_submodule(struct cache_entry *ce,
1212 enum unpack_trees_error_types error_type,
1213 struct unpack_trees_options *o)
1215 return 0;
1218 static int verify_clean_subdirectory(struct cache_entry *ce,
1219 enum unpack_trees_error_types error_type,
1220 struct unpack_trees_options *o)
1223 * we are about to extract "ce->name"; we would not want to lose
1224 * anything in the existing directory there.
1226 int namelen;
1227 int i;
1228 struct dir_struct d;
1229 char *pathbuf;
1230 int cnt = 0;
1231 unsigned char sha1[20];
1233 if (S_ISGITLINK(ce->ce_mode) &&
1234 resolve_gitlink_ref(ce->name, "HEAD", sha1) == 0) {
1235 /* If we are not going to update the submodule, then
1236 * we don't care.
1238 if (!hashcmp(sha1, ce->sha1))
1239 return 0;
1240 return verify_clean_submodule(ce, error_type, o);
1244 * First let's make sure we do not have a local modification
1245 * in that directory.
1247 namelen = strlen(ce->name);
1248 for (i = locate_in_src_index(ce, o);
1249 i < o->src_index->cache_nr;
1250 i++) {
1251 struct cache_entry *ce2 = o->src_index->cache[i];
1252 int len = ce_namelen(ce2);
1253 if (len < namelen ||
1254 strncmp(ce->name, ce2->name, namelen) ||
1255 ce2->name[namelen] != '/')
1256 break;
1258 * ce2->name is an entry in the subdirectory to be
1259 * removed.
1261 if (!ce_stage(ce2)) {
1262 if (verify_uptodate(ce2, o))
1263 return -1;
1264 add_entry(o, ce2, CE_REMOVE, 0);
1265 mark_ce_used(ce2, o);
1267 cnt++;
1271 * Then we need to make sure that we do not lose a locally
1272 * present file that is not ignored.
1274 pathbuf = xmalloc(namelen + 2);
1275 memcpy(pathbuf, ce->name, namelen);
1276 strcpy(pathbuf+namelen, "/");
1278 memset(&d, 0, sizeof(d));
1279 if (o->dir)
1280 d.exclude_per_dir = o->dir->exclude_per_dir;
1281 i = read_directory(&d, pathbuf, namelen+1, NULL);
1282 if (i)
1283 return o->gently ? -1 :
1284 add_rejected_path(o, ERROR_NOT_UPTODATE_DIR, ce->name);
1285 free(pathbuf);
1286 return cnt;
1290 * This gets called when there was no index entry for the tree entry 'dst',
1291 * but we found a file in the working tree that 'lstat()' said was fine,
1292 * and we're on a case-insensitive filesystem.
1294 * See if we can find a case-insensitive match in the index that also
1295 * matches the stat information, and assume it's that other file!
1297 static int icase_exists(struct unpack_trees_options *o, const char *name, int len, struct stat *st)
1299 struct cache_entry *src;
1301 src = index_name_exists(o->src_index, name, len, 1);
1302 return src && !ie_match_stat(o->src_index, src, st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE);
1305 static int check_ok_to_remove(const char *name, int len, int dtype,
1306 struct cache_entry *ce, struct stat *st,
1307 enum unpack_trees_error_types error_type,
1308 struct unpack_trees_options *o)
1310 struct cache_entry *result;
1313 * It may be that the 'lstat()' succeeded even though
1314 * target 'ce' was absent, because there is an old
1315 * entry that is different only in case..
1317 * Ignore that lstat() if it matches.
1319 if (ignore_case && icase_exists(o, name, len, st))
1320 return 0;
1322 if (o->dir && excluded(o->dir, name, &dtype))
1324 * ce->name is explicitly excluded, so it is Ok to
1325 * overwrite it.
1327 return 0;
1328 if (S_ISDIR(st->st_mode)) {
1330 * We are checking out path "foo" and
1331 * found "foo/." in the working tree.
1332 * This is tricky -- if we have modified
1333 * files that are in "foo/" we would lose
1334 * them.
1336 if (verify_clean_subdirectory(ce, error_type, o) < 0)
1337 return -1;
1338 return 0;
1342 * The previous round may already have decided to
1343 * delete this path, which is in a subdirectory that
1344 * is being replaced with a blob.
1346 result = index_name_exists(&o->result, name, len, 0);
1347 if (result) {
1348 if (result->ce_flags & CE_REMOVE)
1349 return 0;
1352 return o->gently ? -1 :
1353 add_rejected_path(o, error_type, name);
1357 * We do not want to remove or overwrite a working tree file that
1358 * is not tracked, unless it is ignored.
1360 static int verify_absent_1(struct cache_entry *ce,
1361 enum unpack_trees_error_types error_type,
1362 struct unpack_trees_options *o)
1364 int len;
1365 struct stat st;
1367 if (o->index_only || o->reset || !o->update)
1368 return 0;
1370 len = check_leading_path(ce->name, ce_namelen(ce));
1371 if (!len)
1372 return 0;
1373 else if (len > 0) {
1374 char path[PATH_MAX + 1];
1375 memcpy(path, ce->name, len);
1376 path[len] = 0;
1377 lstat(path, &st);
1379 return check_ok_to_remove(path, len, DT_UNKNOWN, NULL, &st,
1380 error_type, o);
1381 } else if (!lstat(ce->name, &st))
1382 return check_ok_to_remove(ce->name, ce_namelen(ce),
1383 ce_to_dtype(ce), ce, &st,
1384 error_type, o);
1386 return 0;
1389 static int verify_absent(struct cache_entry *ce,
1390 enum unpack_trees_error_types error_type,
1391 struct unpack_trees_options *o)
1393 if (!o->skip_sparse_checkout && (ce->ce_flags & CE_NEW_SKIP_WORKTREE))
1394 return 0;
1395 return verify_absent_1(ce, error_type, o);
1398 static int verify_absent_sparse(struct cache_entry *ce,
1399 enum unpack_trees_error_types error_type,
1400 struct unpack_trees_options *o)
1402 enum unpack_trees_error_types orphaned_error = error_type;
1403 if (orphaned_error == ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN)
1404 orphaned_error = ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN;
1406 return verify_absent_1(ce, orphaned_error, o);
1409 static int merged_entry(struct cache_entry *merge, struct cache_entry *old,
1410 struct unpack_trees_options *o)
1412 int update = CE_UPDATE;
1414 if (!old) {
1416 * New index entries. In sparse checkout, the following
1417 * verify_absent() will be delayed until after
1418 * traverse_trees() finishes in unpack_trees(), then:
1420 * - CE_NEW_SKIP_WORKTREE will be computed correctly
1421 * - verify_absent() be called again, this time with
1422 * correct CE_NEW_SKIP_WORKTREE
1424 * verify_absent() call here does nothing in sparse
1425 * checkout (i.e. o->skip_sparse_checkout == 0)
1427 update |= CE_ADDED;
1428 merge->ce_flags |= CE_NEW_SKIP_WORKTREE;
1430 if (verify_absent(merge, ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN, o))
1431 return -1;
1432 invalidate_ce_path(merge, o);
1433 } else if (!(old->ce_flags & CE_CONFLICTED)) {
1435 * See if we can re-use the old CE directly?
1436 * That way we get the uptodate stat info.
1438 * This also removes the UPDATE flag on a match; otherwise
1439 * we will end up overwriting local changes in the work tree.
1441 if (same(old, merge)) {
1442 copy_cache_entry(merge, old);
1443 update = 0;
1444 } else {
1445 if (verify_uptodate(old, o))
1446 return -1;
1447 /* Migrate old flags over */
1448 update |= old->ce_flags & (CE_SKIP_WORKTREE | CE_NEW_SKIP_WORKTREE);
1449 invalidate_ce_path(old, o);
1451 } else {
1453 * Previously unmerged entry left as an existence
1454 * marker by read_index_unmerged();
1456 invalidate_ce_path(old, o);
1459 add_entry(o, merge, update, CE_STAGEMASK);
1460 return 1;
1463 static int deleted_entry(struct cache_entry *ce, struct cache_entry *old,
1464 struct unpack_trees_options *o)
1466 /* Did it exist in the index? */
1467 if (!old) {
1468 if (verify_absent(ce, ERROR_WOULD_LOSE_UNTRACKED_REMOVED, o))
1469 return -1;
1470 return 0;
1472 if (!(old->ce_flags & CE_CONFLICTED) && verify_uptodate(old, o))
1473 return -1;
1474 add_entry(o, ce, CE_REMOVE, 0);
1475 invalidate_ce_path(ce, o);
1476 return 1;
1479 static int keep_entry(struct cache_entry *ce, struct unpack_trees_options *o)
1481 add_entry(o, ce, 0, 0);
1482 return 1;
1485 #if DBRT_DEBUG
1486 static void show_stage_entry(FILE *o,
1487 const char *label, const struct cache_entry *ce)
1489 if (!ce)
1490 fprintf(o, "%s (missing)\n", label);
1491 else
1492 fprintf(o, "%s%06o %s %d\t%s\n",
1493 label,
1494 ce->ce_mode,
1495 sha1_to_hex(ce->sha1),
1496 ce_stage(ce),
1497 ce->name);
1499 #endif
1501 int threeway_merge(struct cache_entry **stages, struct unpack_trees_options *o)
1503 struct cache_entry *index;
1504 struct cache_entry *head;
1505 struct cache_entry *remote = stages[o->head_idx + 1];
1506 int count;
1507 int head_match = 0;
1508 int remote_match = 0;
1510 int df_conflict_head = 0;
1511 int df_conflict_remote = 0;
1513 int any_anc_missing = 0;
1514 int no_anc_exists = 1;
1515 int i;
1517 for (i = 1; i < o->head_idx; i++) {
1518 if (!stages[i] || stages[i] == o->df_conflict_entry)
1519 any_anc_missing = 1;
1520 else
1521 no_anc_exists = 0;
1524 index = stages[0];
1525 head = stages[o->head_idx];
1527 if (head == o->df_conflict_entry) {
1528 df_conflict_head = 1;
1529 head = NULL;
1532 if (remote == o->df_conflict_entry) {
1533 df_conflict_remote = 1;
1534 remote = NULL;
1538 * First, if there's a #16 situation, note that to prevent #13
1539 * and #14.
1541 if (!same(remote, head)) {
1542 for (i = 1; i < o->head_idx; i++) {
1543 if (same(stages[i], head)) {
1544 head_match = i;
1546 if (same(stages[i], remote)) {
1547 remote_match = i;
1553 * We start with cases where the index is allowed to match
1554 * something other than the head: #14(ALT) and #2ALT, where it
1555 * is permitted to match the result instead.
1557 /* #14, #14ALT, #2ALT */
1558 if (remote && !df_conflict_head && head_match && !remote_match) {
1559 if (index && !same(index, remote) && !same(index, head))
1560 return o->gently ? -1 : reject_merge(index, o);
1561 return merged_entry(remote, index, o);
1564 * If we have an entry in the index cache, then we want to
1565 * make sure that it matches head.
1567 if (index && !same(index, head))
1568 return o->gently ? -1 : reject_merge(index, o);
1570 if (head) {
1571 /* #5ALT, #15 */
1572 if (same(head, remote))
1573 return merged_entry(head, index, o);
1574 /* #13, #3ALT */
1575 if (!df_conflict_remote && remote_match && !head_match)
1576 return merged_entry(head, index, o);
1579 /* #1 */
1580 if (!head && !remote && any_anc_missing)
1581 return 0;
1584 * Under the "aggressive" rule, we resolve mostly trivial
1585 * cases that we historically had git-merge-one-file resolve.
1587 if (o->aggressive) {
1588 int head_deleted = !head;
1589 int remote_deleted = !remote;
1590 struct cache_entry *ce = NULL;
1592 if (index)
1593 ce = index;
1594 else if (head)
1595 ce = head;
1596 else if (remote)
1597 ce = remote;
1598 else {
1599 for (i = 1; i < o->head_idx; i++) {
1600 if (stages[i] && stages[i] != o->df_conflict_entry) {
1601 ce = stages[i];
1602 break;
1608 * Deleted in both.
1609 * Deleted in one and unchanged in the other.
1611 if ((head_deleted && remote_deleted) ||
1612 (head_deleted && remote && remote_match) ||
1613 (remote_deleted && head && head_match)) {
1614 if (index)
1615 return deleted_entry(index, index, o);
1616 if (ce && !head_deleted) {
1617 if (verify_absent(ce, ERROR_WOULD_LOSE_UNTRACKED_REMOVED, o))
1618 return -1;
1620 return 0;
1623 * Added in both, identically.
1625 if (no_anc_exists && head && remote && same(head, remote))
1626 return merged_entry(head, index, o);
1630 /* Below are "no merge" cases, which require that the index be
1631 * up-to-date to avoid the files getting overwritten with
1632 * conflict resolution files.
1634 if (index) {
1635 if (verify_uptodate(index, o))
1636 return -1;
1639 o->nontrivial_merge = 1;
1641 /* #2, #3, #4, #6, #7, #9, #10, #11. */
1642 count = 0;
1643 if (!head_match || !remote_match) {
1644 for (i = 1; i < o->head_idx; i++) {
1645 if (stages[i] && stages[i] != o->df_conflict_entry) {
1646 keep_entry(stages[i], o);
1647 count++;
1648 break;
1652 #if DBRT_DEBUG
1653 else {
1654 fprintf(stderr, "read-tree: warning #16 detected\n");
1655 show_stage_entry(stderr, "head ", stages[head_match]);
1656 show_stage_entry(stderr, "remote ", stages[remote_match]);
1658 #endif
1659 if (head) { count += keep_entry(head, o); }
1660 if (remote) { count += keep_entry(remote, o); }
1661 return count;
1665 * Two-way merge.
1667 * The rule is to "carry forward" what is in the index without losing
1668 * information across a "fast-forward", favoring a successful merge
1669 * over a merge failure when it makes sense. For details of the
1670 * "carry forward" rule, please see <Documentation/git-read-tree.txt>.
1673 int twoway_merge(struct cache_entry **src, struct unpack_trees_options *o)
1675 struct cache_entry *current = src[0];
1676 struct cache_entry *oldtree = src[1];
1677 struct cache_entry *newtree = src[2];
1679 if (o->merge_size != 2)
1680 return error("Cannot do a twoway merge of %d trees",
1681 o->merge_size);
1683 if (oldtree == o->df_conflict_entry)
1684 oldtree = NULL;
1685 if (newtree == o->df_conflict_entry)
1686 newtree = NULL;
1688 if (current) {
1689 if ((!oldtree && !newtree) || /* 4 and 5 */
1690 (!oldtree && newtree &&
1691 same(current, newtree)) || /* 6 and 7 */
1692 (oldtree && newtree &&
1693 same(oldtree, newtree)) || /* 14 and 15 */
1694 (oldtree && newtree &&
1695 !same(oldtree, newtree) && /* 18 and 19 */
1696 same(current, newtree))) {
1697 return keep_entry(current, o);
1699 else if (oldtree && !newtree && same(current, oldtree)) {
1700 /* 10 or 11 */
1701 return deleted_entry(oldtree, current, o);
1703 else if (oldtree && newtree &&
1704 same(current, oldtree) && !same(current, newtree)) {
1705 /* 20 or 21 */
1706 return merged_entry(newtree, current, o);
1708 else {
1709 /* all other failures */
1710 if (oldtree)
1711 return o->gently ? -1 : reject_merge(oldtree, o);
1712 if (current)
1713 return o->gently ? -1 : reject_merge(current, o);
1714 if (newtree)
1715 return o->gently ? -1 : reject_merge(newtree, o);
1716 return -1;
1719 else if (newtree) {
1720 if (oldtree && !o->initial_checkout) {
1722 * deletion of the path was staged;
1724 if (same(oldtree, newtree))
1725 return 1;
1726 return reject_merge(oldtree, o);
1728 return merged_entry(newtree, current, o);
1730 return deleted_entry(oldtree, current, o);
1734 * Bind merge.
1736 * Keep the index entries at stage0, collapse stage1 but make sure
1737 * stage0 does not have anything there.
1739 int bind_merge(struct cache_entry **src,
1740 struct unpack_trees_options *o)
1742 struct cache_entry *old = src[0];
1743 struct cache_entry *a = src[1];
1745 if (o->merge_size != 1)
1746 return error("Cannot do a bind merge of %d trees\n",
1747 o->merge_size);
1748 if (a && old)
1749 return o->gently ? -1 :
1750 error(ERRORMSG(o, ERROR_BIND_OVERLAP), a->name, old->name);
1751 if (!a)
1752 return keep_entry(old, o);
1753 else
1754 return merged_entry(a, NULL, o);
1758 * One-way merge.
1760 * The rule is:
1761 * - take the stat information from stage0, take the data from stage1
1763 int oneway_merge(struct cache_entry **src, struct unpack_trees_options *o)
1765 struct cache_entry *old = src[0];
1766 struct cache_entry *a = src[1];
1768 if (o->merge_size != 1)
1769 return error("Cannot do a oneway merge of %d trees",
1770 o->merge_size);
1772 if (!a || a == o->df_conflict_entry)
1773 return deleted_entry(old, old, o);
1775 if (old && same(old, a)) {
1776 int update = 0;
1777 if (o->reset && !ce_uptodate(old) && !ce_skip_worktree(old)) {
1778 struct stat st;
1779 if (lstat(old->name, &st) ||
1780 ie_match_stat(o->src_index, old, &st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE))
1781 update |= CE_UPDATE;
1783 add_entry(o, old, update, 0);
1784 return 0;
1786 return merged_entry(a, old, o);