Merge branch 'cb/maint-orphan-merge-noclobber'
[git/kirr.git] / unpack-trees.c
blob803445aa7be140c3707bcebc72aaf6fc6af45e4b
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 const char **msgs = opts->msgs;
57 const char *msg;
58 char *tmp;
59 const char *cmd2 = strcmp(cmd, "checkout") ? cmd : "switch branches";
60 if (advice_commit_before_merge)
61 msg = "Your local changes to the following files would be overwritten by %s:\n%%s"
62 "Please, commit your changes or stash them before you can %s.";
63 else
64 msg = "Your local changes to the following files would be overwritten by %s:\n%%s";
65 tmp = xmalloc(strlen(msg) + strlen(cmd) + strlen(cmd2) - 2);
66 sprintf(tmp, msg, cmd, cmd2);
67 msgs[ERROR_WOULD_OVERWRITE] = tmp;
68 msgs[ERROR_NOT_UPTODATE_FILE] = tmp;
70 msgs[ERROR_NOT_UPTODATE_DIR] =
71 "Updating the following directories would lose untracked files in it:\n%s";
73 if (advice_commit_before_merge)
74 msg = "The following untracked working tree files would be %s by %s:\n%%s"
75 "Please move or remove them before you can %s.";
76 else
77 msg = "The following untracked working tree files would be %s by %s:\n%%s";
78 tmp = xmalloc(strlen(msg) + strlen(cmd) + strlen("removed") + strlen(cmd2) - 4);
79 sprintf(tmp, msg, "removed", cmd, cmd2);
80 msgs[ERROR_WOULD_LOSE_UNTRACKED_REMOVED] = tmp;
81 tmp = xmalloc(strlen(msg) + strlen(cmd) + strlen("overwritten") + strlen(cmd2) - 4);
82 sprintf(tmp, msg, "overwritten", cmd, cmd2);
83 msgs[ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN] = tmp;
86 * Special case: ERROR_BIND_OVERLAP refers to a pair of paths, we
87 * cannot easily display it as a list.
89 msgs[ERROR_BIND_OVERLAP] = "Entry '%s' overlaps with '%s'. Cannot bind.";
91 msgs[ERROR_SPARSE_NOT_UPTODATE_FILE] =
92 "Cannot update sparse checkout: the following entries are not up-to-date:\n%s";
93 msgs[ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN] =
94 "The following Working tree files would be overwritten by sparse checkout update:\n%s";
95 msgs[ERROR_WOULD_LOSE_ORPHANED_REMOVED] =
96 "The following Working tree files would be removed by sparse checkout update:\n%s";
98 opts->show_all_errors = 1;
101 static void add_entry(struct unpack_trees_options *o, struct cache_entry *ce,
102 unsigned int set, unsigned int clear)
104 unsigned int size = ce_size(ce);
105 struct cache_entry *new = xmalloc(size);
107 clear |= CE_HASHED | CE_UNHASHED;
109 if (set & CE_REMOVE)
110 set |= CE_WT_REMOVE;
112 memcpy(new, ce, size);
113 new->next = NULL;
114 new->ce_flags = (new->ce_flags & ~clear) | set;
115 add_index_entry(&o->result, new, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE);
119 * add error messages on path <path>
120 * corresponding to the type <e> with the message <msg>
121 * indicating if it should be display in porcelain or not
123 static int add_rejected_path(struct unpack_trees_options *o,
124 enum unpack_trees_error_types e,
125 const char *path)
127 struct rejected_paths_list *newentry;
128 if (!o->show_all_errors)
129 return error(ERRORMSG(o, e), path);
132 * Otherwise, insert in a list for future display by
133 * display_error_msgs()
135 newentry = xmalloc(sizeof(struct rejected_paths_list));
136 newentry->path = (char *)path;
137 newentry->next = o->unpack_rejects[e];
138 o->unpack_rejects[e] = newentry;
139 return -1;
143 * free all the structures allocated for the error <e>
145 static void free_rejected_paths(struct unpack_trees_options *o,
146 enum unpack_trees_error_types e)
148 while (o->unpack_rejects[e]) {
149 struct rejected_paths_list *del = o->unpack_rejects[e];
150 o->unpack_rejects[e] = o->unpack_rejects[e]->next;
151 free(del);
153 free(o->unpack_rejects[e]);
157 * display all the error messages stored in a nice way
159 static void display_error_msgs(struct unpack_trees_options *o)
161 int e;
162 int something_displayed = 0;
163 for (e = 0; e < NB_UNPACK_TREES_ERROR_TYPES; e++) {
164 if (o->unpack_rejects[e]) {
165 struct rejected_paths_list *rp;
166 struct strbuf path = STRBUF_INIT;
167 something_displayed = 1;
168 for (rp = o->unpack_rejects[e]; rp; rp = rp->next)
169 strbuf_addf(&path, "\t%s\n", rp->path);
170 error(ERRORMSG(o, e), path.buf);
171 strbuf_release(&path);
172 free_rejected_paths(o, e);
175 if (something_displayed)
176 printf("Aborting\n");
180 * Unlink the last component and schedule the leading directories for
181 * removal, such that empty directories get removed.
183 static void unlink_entry(struct cache_entry *ce)
185 if (has_symlink_or_noent_leading_path(ce->name, ce_namelen(ce)))
186 return;
187 if (remove_or_warn(ce->ce_mode, ce->name))
188 return;
189 schedule_dir_for_removal(ce->name, ce_namelen(ce));
192 static struct checkout state;
193 static int check_updates(struct unpack_trees_options *o)
195 unsigned cnt = 0, total = 0;
196 struct progress *progress = NULL;
197 struct index_state *index = &o->result;
198 int i;
199 int errs = 0;
201 if (o->update && o->verbose_update) {
202 for (total = cnt = 0; cnt < index->cache_nr; cnt++) {
203 struct cache_entry *ce = index->cache[cnt];
204 if (ce->ce_flags & (CE_UPDATE | CE_WT_REMOVE))
205 total++;
208 progress = start_progress_delay("Checking out files",
209 total, 50, 1);
210 cnt = 0;
213 if (o->update)
214 git_attr_set_direction(GIT_ATTR_CHECKOUT, &o->result);
215 for (i = 0; i < index->cache_nr; i++) {
216 struct cache_entry *ce = index->cache[i];
218 if (ce->ce_flags & CE_WT_REMOVE) {
219 display_progress(progress, ++cnt);
220 if (o->update)
221 unlink_entry(ce);
222 continue;
225 remove_marked_cache_entries(&o->result);
226 remove_scheduled_dirs();
228 for (i = 0; i < index->cache_nr; i++) {
229 struct cache_entry *ce = index->cache[i];
231 if (ce->ce_flags & CE_UPDATE) {
232 display_progress(progress, ++cnt);
233 ce->ce_flags &= ~CE_UPDATE;
234 if (o->update) {
235 errs |= checkout_entry(ce, &state, NULL);
239 stop_progress(&progress);
240 if (o->update)
241 git_attr_set_direction(GIT_ATTR_CHECKIN, NULL);
242 return errs != 0;
245 static int verify_uptodate_sparse(struct cache_entry *ce, struct unpack_trees_options *o);
246 static int verify_absent_sparse(struct cache_entry *ce, enum unpack_trees_error_types, struct unpack_trees_options *o);
248 static int will_have_skip_worktree(const struct cache_entry *ce, struct unpack_trees_options *o)
250 const char *basename;
252 basename = strrchr(ce->name, '/');
253 basename = basename ? basename+1 : ce->name;
254 return excluded_from_list(ce->name, ce_namelen(ce), basename, NULL, o->el) <= 0;
257 static int apply_sparse_checkout(struct cache_entry *ce, struct unpack_trees_options *o)
259 int was_skip_worktree = ce_skip_worktree(ce);
261 if (!ce_stage(ce) && will_have_skip_worktree(ce, o))
262 ce->ce_flags |= CE_SKIP_WORKTREE;
263 else
264 ce->ce_flags &= ~CE_SKIP_WORKTREE;
267 * if (!was_skip_worktree && !ce_skip_worktree()) {
268 * This is perfectly normal. Move on;
273 * Merge strategies may set CE_UPDATE|CE_REMOVE outside checkout
274 * area as a result of ce_skip_worktree() shortcuts in
275 * verify_absent() and verify_uptodate().
276 * Make sure they don't modify worktree if they are already
277 * outside checkout area
279 if (was_skip_worktree && ce_skip_worktree(ce)) {
280 ce->ce_flags &= ~CE_UPDATE;
283 * By default, when CE_REMOVE is on, CE_WT_REMOVE is also
284 * on to get that file removed from both index and worktree.
285 * If that file is already outside worktree area, don't
286 * bother remove it.
288 if (ce->ce_flags & CE_REMOVE)
289 ce->ce_flags &= ~CE_WT_REMOVE;
292 if (!was_skip_worktree && ce_skip_worktree(ce)) {
294 * If CE_UPDATE is set, verify_uptodate() must be called already
295 * also stat info may have lost after merged_entry() so calling
296 * verify_uptodate() again may fail
298 if (!(ce->ce_flags & CE_UPDATE) && verify_uptodate_sparse(ce, o))
299 return -1;
300 ce->ce_flags |= CE_WT_REMOVE;
302 if (was_skip_worktree && !ce_skip_worktree(ce)) {
303 if (verify_absent_sparse(ce, ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN, o))
304 return -1;
305 ce->ce_flags |= CE_UPDATE;
307 return 0;
310 static inline int call_unpack_fn(struct cache_entry **src, struct unpack_trees_options *o)
312 int ret = o->fn(src, o);
313 if (ret > 0)
314 ret = 0;
315 return ret;
318 static void mark_ce_used(struct cache_entry *ce, struct unpack_trees_options *o)
320 ce->ce_flags |= CE_UNPACKED;
322 if (o->cache_bottom < o->src_index->cache_nr &&
323 o->src_index->cache[o->cache_bottom] == ce) {
324 int bottom = o->cache_bottom;
325 while (bottom < o->src_index->cache_nr &&
326 o->src_index->cache[bottom]->ce_flags & CE_UNPACKED)
327 bottom++;
328 o->cache_bottom = bottom;
332 static void mark_all_ce_unused(struct index_state *index)
334 int i;
335 for (i = 0; i < index->cache_nr; i++)
336 index->cache[i]->ce_flags &= ~CE_UNPACKED;
339 static int locate_in_src_index(struct cache_entry *ce,
340 struct unpack_trees_options *o)
342 struct index_state *index = o->src_index;
343 int len = ce_namelen(ce);
344 int pos = index_name_pos(index, ce->name, len);
345 if (pos < 0)
346 pos = -1 - pos;
347 return pos;
351 * We call unpack_index_entry() with an unmerged cache entry
352 * only in diff-index, and it wants a single callback. Skip
353 * the other unmerged entry with the same name.
355 static void mark_ce_used_same_name(struct cache_entry *ce,
356 struct unpack_trees_options *o)
358 struct index_state *index = o->src_index;
359 int len = ce_namelen(ce);
360 int pos;
362 for (pos = locate_in_src_index(ce, o); pos < index->cache_nr; pos++) {
363 struct cache_entry *next = index->cache[pos];
364 if (len != ce_namelen(next) ||
365 memcmp(ce->name, next->name, len))
366 break;
367 mark_ce_used(next, o);
371 static struct cache_entry *next_cache_entry(struct unpack_trees_options *o)
373 const struct index_state *index = o->src_index;
374 int pos = o->cache_bottom;
376 while (pos < index->cache_nr) {
377 struct cache_entry *ce = index->cache[pos];
378 if (!(ce->ce_flags & CE_UNPACKED))
379 return ce;
380 pos++;
382 return NULL;
385 static void add_same_unmerged(struct cache_entry *ce,
386 struct unpack_trees_options *o)
388 struct index_state *index = o->src_index;
389 int len = ce_namelen(ce);
390 int pos = index_name_pos(index, ce->name, len);
392 if (0 <= pos)
393 die("programming error in a caller of mark_ce_used_same_name");
394 for (pos = -pos - 1; pos < index->cache_nr; pos++) {
395 struct cache_entry *next = index->cache[pos];
396 if (len != ce_namelen(next) ||
397 memcmp(ce->name, next->name, len))
398 break;
399 add_entry(o, next, 0, 0);
400 mark_ce_used(next, o);
404 static int unpack_index_entry(struct cache_entry *ce,
405 struct unpack_trees_options *o)
407 struct cache_entry *src[5] = { NULL };
408 int ret;
410 src[0] = ce;
412 mark_ce_used(ce, o);
413 if (ce_stage(ce)) {
414 if (o->skip_unmerged) {
415 add_entry(o, ce, 0, 0);
416 return 0;
419 ret = call_unpack_fn(src, o);
420 if (ce_stage(ce))
421 mark_ce_used_same_name(ce, o);
422 return ret;
425 static int find_cache_pos(struct traverse_info *, const struct name_entry *);
427 static void restore_cache_bottom(struct traverse_info *info, int bottom)
429 struct unpack_trees_options *o = info->data;
431 if (o->diff_index_cached)
432 return;
433 o->cache_bottom = bottom;
436 static int switch_cache_bottom(struct traverse_info *info)
438 struct unpack_trees_options *o = info->data;
439 int ret, pos;
441 if (o->diff_index_cached)
442 return 0;
443 ret = o->cache_bottom;
444 pos = find_cache_pos(info->prev, &info->name);
446 if (pos < -1)
447 o->cache_bottom = -2 - pos;
448 else if (pos < 0)
449 o->cache_bottom = o->src_index->cache_nr;
450 return ret;
453 static int traverse_trees_recursive(int n, unsigned long dirmask, unsigned long df_conflicts, struct name_entry *names, struct traverse_info *info)
455 int i, ret, bottom;
456 struct tree_desc t[MAX_UNPACK_TREES];
457 void *buf[MAX_UNPACK_TREES];
458 struct traverse_info newinfo;
459 struct name_entry *p;
461 p = names;
462 while (!p->mode)
463 p++;
465 newinfo = *info;
466 newinfo.prev = info;
467 newinfo.name = *p;
468 newinfo.pathlen += tree_entry_len(p->path, p->sha1) + 1;
469 newinfo.conflicts |= df_conflicts;
471 for (i = 0; i < n; i++, dirmask >>= 1) {
472 const unsigned char *sha1 = NULL;
473 if (dirmask & 1)
474 sha1 = names[i].sha1;
475 buf[i] = fill_tree_descriptor(t+i, sha1);
478 bottom = switch_cache_bottom(&newinfo);
479 ret = traverse_trees(n, t, &newinfo);
480 restore_cache_bottom(&newinfo, bottom);
482 for (i = 0; i < n; i++)
483 free(buf[i]);
485 return ret;
489 * Compare the traverse-path to the cache entry without actually
490 * having to generate the textual representation of the traverse
491 * path.
493 * NOTE! This *only* compares up to the size of the traverse path
494 * itself - the caller needs to do the final check for the cache
495 * entry having more data at the end!
497 static int do_compare_entry(const struct cache_entry *ce, const struct traverse_info *info, const struct name_entry *n)
499 int len, pathlen, ce_len;
500 const char *ce_name;
502 if (info->prev) {
503 int cmp = do_compare_entry(ce, info->prev, &info->name);
504 if (cmp)
505 return cmp;
507 pathlen = info->pathlen;
508 ce_len = ce_namelen(ce);
510 /* If ce_len < pathlen then we must have previously hit "name == directory" entry */
511 if (ce_len < pathlen)
512 return -1;
514 ce_len -= pathlen;
515 ce_name = ce->name + pathlen;
517 len = tree_entry_len(n->path, n->sha1);
518 return df_name_compare(ce_name, ce_len, S_IFREG, n->path, len, n->mode);
521 static int compare_entry(const struct cache_entry *ce, const struct traverse_info *info, const struct name_entry *n)
523 int cmp = do_compare_entry(ce, info, n);
524 if (cmp)
525 return cmp;
528 * Even if the beginning compared identically, the ce should
529 * compare as bigger than a directory leading up to it!
531 return ce_namelen(ce) > traverse_path_len(info, n);
534 static int ce_in_traverse_path(const struct cache_entry *ce,
535 const struct traverse_info *info)
537 if (!info->prev)
538 return 1;
539 if (do_compare_entry(ce, info->prev, &info->name))
540 return 0;
542 * If ce (blob) is the same name as the path (which is a tree
543 * we will be descending into), it won't be inside it.
545 return (info->pathlen < ce_namelen(ce));
548 static struct cache_entry *create_ce_entry(const struct traverse_info *info, const struct name_entry *n, int stage)
550 int len = traverse_path_len(info, n);
551 struct cache_entry *ce = xcalloc(1, cache_entry_size(len));
553 ce->ce_mode = create_ce_mode(n->mode);
554 ce->ce_flags = create_ce_flags(len, stage);
555 hashcpy(ce->sha1, n->sha1);
556 make_traverse_path(ce->name, info, n);
558 return ce;
561 static int unpack_nondirectories(int n, unsigned long mask,
562 unsigned long dirmask,
563 struct cache_entry **src,
564 const struct name_entry *names,
565 const struct traverse_info *info)
567 int i;
568 struct unpack_trees_options *o = info->data;
569 unsigned long conflicts;
571 /* Do we have *only* directories? Nothing to do */
572 if (mask == dirmask && !src[0])
573 return 0;
575 conflicts = info->conflicts;
576 if (o->merge)
577 conflicts >>= 1;
578 conflicts |= dirmask;
581 * Ok, we've filled in up to any potential index entry in src[0],
582 * now do the rest.
584 for (i = 0; i < n; i++) {
585 int stage;
586 unsigned int bit = 1ul << i;
587 if (conflicts & bit) {
588 src[i + o->merge] = o->df_conflict_entry;
589 continue;
591 if (!(mask & bit))
592 continue;
593 if (!o->merge)
594 stage = 0;
595 else if (i + 1 < o->head_idx)
596 stage = 1;
597 else if (i + 1 > o->head_idx)
598 stage = 3;
599 else
600 stage = 2;
601 src[i + o->merge] = create_ce_entry(info, names + i, stage);
604 if (o->merge)
605 return call_unpack_fn(src, o);
607 for (i = 0; i < n; i++)
608 if (src[i] && src[i] != o->df_conflict_entry)
609 add_entry(o, src[i], 0, 0);
610 return 0;
613 static int unpack_failed(struct unpack_trees_options *o, const char *message)
615 discard_index(&o->result);
616 if (!o->gently) {
617 if (message)
618 return error("%s", message);
619 return -1;
621 return -1;
624 /* NEEDSWORK: give this a better name and share with tree-walk.c */
625 static int name_compare(const char *a, int a_len,
626 const char *b, int b_len)
628 int len = (a_len < b_len) ? a_len : b_len;
629 int cmp = memcmp(a, b, len);
630 if (cmp)
631 return cmp;
632 return (a_len - b_len);
636 * The tree traversal is looking at name p. If we have a matching entry,
637 * return it. If name p is a directory in the index, do not return
638 * anything, as we will want to match it when the traversal descends into
639 * the directory.
641 static int find_cache_pos(struct traverse_info *info,
642 const struct name_entry *p)
644 int pos;
645 struct unpack_trees_options *o = info->data;
646 struct index_state *index = o->src_index;
647 int pfxlen = info->pathlen;
648 int p_len = tree_entry_len(p->path, p->sha1);
650 for (pos = o->cache_bottom; pos < index->cache_nr; pos++) {
651 struct cache_entry *ce = index->cache[pos];
652 const char *ce_name, *ce_slash;
653 int cmp, ce_len;
655 if (ce->ce_flags & CE_UNPACKED) {
657 * cache_bottom entry is already unpacked, so
658 * we can never match it; don't check it
659 * again.
661 if (pos == o->cache_bottom)
662 ++o->cache_bottom;
663 continue;
665 if (!ce_in_traverse_path(ce, info))
666 continue;
667 ce_name = ce->name + pfxlen;
668 ce_slash = strchr(ce_name, '/');
669 if (ce_slash)
670 ce_len = ce_slash - ce_name;
671 else
672 ce_len = ce_namelen(ce) - pfxlen;
673 cmp = name_compare(p->path, p_len, ce_name, ce_len);
675 * Exact match; if we have a directory we need to
676 * delay returning it.
678 if (!cmp)
679 return ce_slash ? -2 - pos : pos;
680 if (0 < cmp)
681 continue; /* keep looking */
683 * ce_name sorts after p->path; could it be that we
684 * have files under p->path directory in the index?
685 * E.g. ce_name == "t-i", and p->path == "t"; we may
686 * have "t/a" in the index.
688 if (p_len < ce_len && !memcmp(ce_name, p->path, p_len) &&
689 ce_name[p_len] < '/')
690 continue; /* keep looking */
691 break;
693 return -1;
696 static struct cache_entry *find_cache_entry(struct traverse_info *info,
697 const struct name_entry *p)
699 int pos = find_cache_pos(info, p);
700 struct unpack_trees_options *o = info->data;
702 if (0 <= pos)
703 return o->src_index->cache[pos];
704 else
705 return NULL;
708 static void debug_path(struct traverse_info *info)
710 if (info->prev) {
711 debug_path(info->prev);
712 if (*info->prev->name.path)
713 putchar('/');
715 printf("%s", info->name.path);
718 static void debug_name_entry(int i, struct name_entry *n)
720 printf("ent#%d %06o %s\n", i,
721 n->path ? n->mode : 0,
722 n->path ? n->path : "(missing)");
725 static void debug_unpack_callback(int n,
726 unsigned long mask,
727 unsigned long dirmask,
728 struct name_entry *names,
729 struct traverse_info *info)
731 int i;
732 printf("* unpack mask %lu, dirmask %lu, cnt %d ",
733 mask, dirmask, n);
734 debug_path(info);
735 putchar('\n');
736 for (i = 0; i < n; i++)
737 debug_name_entry(i, names + i);
740 static int unpack_callback(int n, unsigned long mask, unsigned long dirmask, struct name_entry *names, struct traverse_info *info)
742 struct cache_entry *src[MAX_UNPACK_TREES + 1] = { NULL, };
743 struct unpack_trees_options *o = info->data;
744 const struct name_entry *p = names;
746 /* Find first entry with a real name (we could use "mask" too) */
747 while (!p->mode)
748 p++;
750 if (o->debug_unpack)
751 debug_unpack_callback(n, mask, dirmask, names, info);
753 /* Are we supposed to look at the index too? */
754 if (o->merge) {
755 while (1) {
756 int cmp;
757 struct cache_entry *ce;
759 if (o->diff_index_cached)
760 ce = next_cache_entry(o);
761 else
762 ce = find_cache_entry(info, p);
764 if (!ce)
765 break;
766 cmp = compare_entry(ce, info, p);
767 if (cmp < 0) {
768 if (unpack_index_entry(ce, o) < 0)
769 return unpack_failed(o, NULL);
770 continue;
772 if (!cmp) {
773 if (ce_stage(ce)) {
775 * If we skip unmerged index
776 * entries, we'll skip this
777 * entry *and* the tree
778 * entries associated with it!
780 if (o->skip_unmerged) {
781 add_same_unmerged(ce, o);
782 return mask;
785 src[0] = ce;
787 break;
791 if (unpack_nondirectories(n, mask, dirmask, src, names, info) < 0)
792 return -1;
794 if (src[0]) {
795 if (ce_stage(src[0]))
796 mark_ce_used_same_name(src[0], o);
797 else
798 mark_ce_used(src[0], o);
801 /* Now handle any directories.. */
802 if (dirmask) {
803 unsigned long conflicts = mask & ~dirmask;
804 if (o->merge) {
805 conflicts <<= 1;
806 if (src[0])
807 conflicts |= 1;
810 /* special case: "diff-index --cached" looking at a tree */
811 if (o->diff_index_cached &&
812 n == 1 && dirmask == 1 && S_ISDIR(names->mode)) {
813 int matches;
814 matches = cache_tree_matches_traversal(o->src_index->cache_tree,
815 names, info);
817 * Everything under the name matches; skip the
818 * entire hierarchy. diff_index_cached codepath
819 * special cases D/F conflicts in such a way that
820 * it does not do any look-ahead, so this is safe.
822 if (matches) {
823 o->cache_bottom += matches;
824 return mask;
828 if (traverse_trees_recursive(n, dirmask, conflicts,
829 names, info) < 0)
830 return -1;
831 return mask;
834 return mask;
838 * N-way merge "len" trees. Returns 0 on success, -1 on failure to manipulate the
839 * resulting index, -2 on failure to reflect the changes to the work tree.
841 int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options *o)
843 int i, ret;
844 static struct cache_entry *dfc;
845 struct exclude_list el;
847 if (len > MAX_UNPACK_TREES)
848 die("unpack_trees takes at most %d trees", MAX_UNPACK_TREES);
849 memset(&state, 0, sizeof(state));
850 state.base_dir = "";
851 state.force = 1;
852 state.quiet = 1;
853 state.refresh_cache = 1;
855 memset(&el, 0, sizeof(el));
856 if (!core_apply_sparse_checkout || !o->update)
857 o->skip_sparse_checkout = 1;
858 if (!o->skip_sparse_checkout) {
859 if (add_excludes_from_file_to_list(git_path("info/sparse-checkout"), "", 0, NULL, &el, 0) < 0)
860 o->skip_sparse_checkout = 1;
861 else
862 o->el = &el;
865 memset(&o->result, 0, sizeof(o->result));
866 o->result.initialized = 1;
867 o->result.timestamp.sec = o->src_index->timestamp.sec;
868 o->result.timestamp.nsec = o->src_index->timestamp.nsec;
869 o->merge_size = len;
870 mark_all_ce_unused(o->src_index);
872 if (!dfc)
873 dfc = xcalloc(1, cache_entry_size(0));
874 o->df_conflict_entry = dfc;
876 if (len) {
877 const char *prefix = o->prefix ? o->prefix : "";
878 struct traverse_info info;
880 setup_traverse_info(&info, prefix);
881 info.fn = unpack_callback;
882 info.data = o;
883 info.show_all_errors = o->show_all_errors;
885 if (o->prefix) {
887 * Unpack existing index entries that sort before the
888 * prefix the tree is spliced into. Note that o->merge
889 * is always true in this case.
891 while (1) {
892 struct cache_entry *ce = next_cache_entry(o);
893 if (!ce)
894 break;
895 if (ce_in_traverse_path(ce, &info))
896 break;
897 if (unpack_index_entry(ce, o) < 0)
898 goto return_failed;
902 if (traverse_trees(len, t, &info) < 0)
903 goto return_failed;
906 /* Any left-over entries in the index? */
907 if (o->merge) {
908 while (1) {
909 struct cache_entry *ce = next_cache_entry(o);
910 if (!ce)
911 break;
912 if (unpack_index_entry(ce, o) < 0)
913 goto return_failed;
916 mark_all_ce_unused(o->src_index);
918 if (o->trivial_merges_only && o->nontrivial_merge) {
919 ret = unpack_failed(o, "Merge requires file-level merging");
920 goto done;
923 if (!o->skip_sparse_checkout) {
924 int empty_worktree = 1;
925 for (i = 0;i < o->result.cache_nr;i++) {
926 struct cache_entry *ce = o->result.cache[i];
928 if (apply_sparse_checkout(ce, o)) {
929 ret = -1;
930 goto done;
932 if (!ce_skip_worktree(ce))
933 empty_worktree = 0;
936 if (o->result.cache_nr && empty_worktree) {
937 ret = unpack_failed(o, "Sparse checkout leaves no entry on working directory");
938 goto done;
942 o->src_index = NULL;
943 ret = check_updates(o) ? (-2) : 0;
944 if (o->dst_index)
945 *o->dst_index = o->result;
947 done:
948 for (i = 0;i < el.nr;i++)
949 free(el.excludes[i]);
950 if (el.excludes)
951 free(el.excludes);
953 return ret;
955 return_failed:
956 if (o->show_all_errors)
957 display_error_msgs(o);
958 mark_all_ce_unused(o->src_index);
959 ret = unpack_failed(o, NULL);
960 goto done;
963 /* Here come the merge functions */
965 static int reject_merge(struct cache_entry *ce, struct unpack_trees_options *o)
967 return add_rejected_path(o, ERROR_WOULD_OVERWRITE, ce->name);
970 static int same(struct cache_entry *a, struct cache_entry *b)
972 if (!!a != !!b)
973 return 0;
974 if (!a && !b)
975 return 1;
976 if ((a->ce_flags | b->ce_flags) & CE_CONFLICTED)
977 return 0;
978 return a->ce_mode == b->ce_mode &&
979 !hashcmp(a->sha1, b->sha1);
984 * When a CE gets turned into an unmerged entry, we
985 * want it to be up-to-date
987 static int verify_uptodate_1(struct cache_entry *ce,
988 struct unpack_trees_options *o,
989 enum unpack_trees_error_types error_type)
991 struct stat st;
993 if (o->index_only || (!((ce->ce_flags & CE_VALID) || ce_skip_worktree(ce)) && (o->reset || ce_uptodate(ce))))
994 return 0;
996 if (!lstat(ce->name, &st)) {
997 unsigned changed = ie_match_stat(o->src_index, ce, &st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE);
998 if (!changed)
999 return 0;
1001 * NEEDSWORK: the current default policy is to allow
1002 * submodule to be out of sync wrt the supermodule
1003 * index. This needs to be tightened later for
1004 * submodules that are marked to be automatically
1005 * checked out.
1007 if (S_ISGITLINK(ce->ce_mode))
1008 return 0;
1009 errno = 0;
1011 if (errno == ENOENT)
1012 return 0;
1013 return o->gently ? -1 :
1014 add_rejected_path(o, error_type, ce->name);
1017 static int verify_uptodate(struct cache_entry *ce,
1018 struct unpack_trees_options *o)
1020 if (!o->skip_sparse_checkout && will_have_skip_worktree(ce, o))
1021 return 0;
1022 return verify_uptodate_1(ce, o, ERROR_NOT_UPTODATE_FILE);
1025 static int verify_uptodate_sparse(struct cache_entry *ce,
1026 struct unpack_trees_options *o)
1028 return verify_uptodate_1(ce, o, ERROR_SPARSE_NOT_UPTODATE_FILE);
1031 static void invalidate_ce_path(struct cache_entry *ce, struct unpack_trees_options *o)
1033 if (ce)
1034 cache_tree_invalidate_path(o->src_index->cache_tree, ce->name);
1038 * Check that checking out ce->sha1 in subdir ce->name is not
1039 * going to overwrite any working files.
1041 * Currently, git does not checkout subprojects during a superproject
1042 * checkout, so it is not going to overwrite anything.
1044 static int verify_clean_submodule(struct cache_entry *ce,
1045 enum unpack_trees_error_types error_type,
1046 struct unpack_trees_options *o)
1048 return 0;
1051 static int verify_clean_subdirectory(struct cache_entry *ce,
1052 enum unpack_trees_error_types error_type,
1053 struct unpack_trees_options *o)
1056 * we are about to extract "ce->name"; we would not want to lose
1057 * anything in the existing directory there.
1059 int namelen;
1060 int i;
1061 struct dir_struct d;
1062 char *pathbuf;
1063 int cnt = 0;
1064 unsigned char sha1[20];
1066 if (S_ISGITLINK(ce->ce_mode) &&
1067 resolve_gitlink_ref(ce->name, "HEAD", sha1) == 0) {
1068 /* If we are not going to update the submodule, then
1069 * we don't care.
1071 if (!hashcmp(sha1, ce->sha1))
1072 return 0;
1073 return verify_clean_submodule(ce, error_type, o);
1077 * First let's make sure we do not have a local modification
1078 * in that directory.
1080 namelen = strlen(ce->name);
1081 for (i = locate_in_src_index(ce, o);
1082 i < o->src_index->cache_nr;
1083 i++) {
1084 struct cache_entry *ce2 = o->src_index->cache[i];
1085 int len = ce_namelen(ce2);
1086 if (len < namelen ||
1087 strncmp(ce->name, ce2->name, namelen) ||
1088 ce2->name[namelen] != '/')
1089 break;
1091 * ce2->name is an entry in the subdirectory to be
1092 * removed.
1094 if (!ce_stage(ce2)) {
1095 if (verify_uptodate(ce2, o))
1096 return -1;
1097 add_entry(o, ce2, CE_REMOVE, 0);
1098 mark_ce_used(ce2, o);
1100 cnt++;
1104 * Then we need to make sure that we do not lose a locally
1105 * present file that is not ignored.
1107 pathbuf = xmalloc(namelen + 2);
1108 memcpy(pathbuf, ce->name, namelen);
1109 strcpy(pathbuf+namelen, "/");
1111 memset(&d, 0, sizeof(d));
1112 if (o->dir)
1113 d.exclude_per_dir = o->dir->exclude_per_dir;
1114 i = read_directory(&d, pathbuf, namelen+1, NULL);
1115 if (i)
1116 return o->gently ? -1 :
1117 add_rejected_path(o, ERROR_NOT_UPTODATE_DIR, ce->name);
1118 free(pathbuf);
1119 return cnt;
1123 * This gets called when there was no index entry for the tree entry 'dst',
1124 * but we found a file in the working tree that 'lstat()' said was fine,
1125 * and we're on a case-insensitive filesystem.
1127 * See if we can find a case-insensitive match in the index that also
1128 * matches the stat information, and assume it's that other file!
1130 static int icase_exists(struct unpack_trees_options *o, struct cache_entry *dst, struct stat *st)
1132 struct cache_entry *src;
1134 src = index_name_exists(o->src_index, dst->name, ce_namelen(dst), 1);
1135 return src && !ie_match_stat(o->src_index, src, st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE);
1139 * We do not want to remove or overwrite a working tree file that
1140 * is not tracked, unless it is ignored.
1142 static int verify_absent_1(struct cache_entry *ce,
1143 enum unpack_trees_error_types error_type,
1144 struct unpack_trees_options *o)
1146 struct stat st;
1148 if (o->index_only || o->reset || !o->update)
1149 return 0;
1151 if (has_symlink_or_noent_leading_path(ce->name, ce_namelen(ce)))
1152 return 0;
1154 if (!lstat(ce->name, &st)) {
1155 int dtype = ce_to_dtype(ce);
1156 struct cache_entry *result;
1159 * It may be that the 'lstat()' succeeded even though
1160 * target 'ce' was absent, because there is an old
1161 * entry that is different only in case..
1163 * Ignore that lstat() if it matches.
1165 if (ignore_case && icase_exists(o, ce, &st))
1166 return 0;
1168 if (o->dir && excluded(o->dir, ce->name, &dtype))
1170 * ce->name is explicitly excluded, so it is Ok to
1171 * overwrite it.
1173 return 0;
1174 if (S_ISDIR(st.st_mode)) {
1176 * We are checking out path "foo" and
1177 * found "foo/." in the working tree.
1178 * This is tricky -- if we have modified
1179 * files that are in "foo/" we would lose
1180 * them.
1182 if (verify_clean_subdirectory(ce, error_type, o) < 0)
1183 return -1;
1184 return 0;
1188 * The previous round may already have decided to
1189 * delete this path, which is in a subdirectory that
1190 * is being replaced with a blob.
1192 result = index_name_exists(&o->result, ce->name, ce_namelen(ce), 0);
1193 if (result) {
1194 if (result->ce_flags & CE_REMOVE)
1195 return 0;
1198 return o->gently ? -1 :
1199 add_rejected_path(o, error_type, ce->name);
1201 return 0;
1203 static int verify_absent(struct cache_entry *ce,
1204 enum unpack_trees_error_types error_type,
1205 struct unpack_trees_options *o)
1207 if (!o->skip_sparse_checkout && will_have_skip_worktree(ce, o))
1208 return 0;
1209 return verify_absent_1(ce, error_type, o);
1212 static int verify_absent_sparse(struct cache_entry *ce,
1213 enum unpack_trees_error_types error_type,
1214 struct unpack_trees_options *o)
1216 enum unpack_trees_error_types orphaned_error = error_type;
1217 if (orphaned_error == ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN)
1218 orphaned_error = ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN;
1220 return verify_absent_1(ce, orphaned_error, o);
1223 static int merged_entry(struct cache_entry *merge, struct cache_entry *old,
1224 struct unpack_trees_options *o)
1226 int update = CE_UPDATE;
1228 if (!old) {
1229 if (verify_absent(merge, ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN, o))
1230 return -1;
1231 if (!o->skip_sparse_checkout && will_have_skip_worktree(merge, o))
1232 update |= CE_SKIP_WORKTREE;
1233 invalidate_ce_path(merge, o);
1234 } else if (!(old->ce_flags & CE_CONFLICTED)) {
1236 * See if we can re-use the old CE directly?
1237 * That way we get the uptodate stat info.
1239 * This also removes the UPDATE flag on a match; otherwise
1240 * we will end up overwriting local changes in the work tree.
1242 if (same(old, merge)) {
1243 copy_cache_entry(merge, old);
1244 update = 0;
1245 } else {
1246 if (verify_uptodate(old, o))
1247 return -1;
1248 if (ce_skip_worktree(old))
1249 update |= CE_SKIP_WORKTREE;
1250 invalidate_ce_path(old, o);
1252 } else {
1254 * Previously unmerged entry left as an existence
1255 * marker by read_index_unmerged();
1257 invalidate_ce_path(old, o);
1260 add_entry(o, merge, update, CE_STAGEMASK);
1261 return 1;
1264 static int deleted_entry(struct cache_entry *ce, struct cache_entry *old,
1265 struct unpack_trees_options *o)
1267 /* Did it exist in the index? */
1268 if (!old) {
1269 if (verify_absent(ce, ERROR_WOULD_LOSE_UNTRACKED_REMOVED, o))
1270 return -1;
1271 return 0;
1273 if (!(old->ce_flags & CE_CONFLICTED) && verify_uptodate(old, o))
1274 return -1;
1275 add_entry(o, ce, CE_REMOVE, 0);
1276 invalidate_ce_path(ce, o);
1277 return 1;
1280 static int keep_entry(struct cache_entry *ce, struct unpack_trees_options *o)
1282 add_entry(o, ce, 0, 0);
1283 return 1;
1286 #if DBRT_DEBUG
1287 static void show_stage_entry(FILE *o,
1288 const char *label, const struct cache_entry *ce)
1290 if (!ce)
1291 fprintf(o, "%s (missing)\n", label);
1292 else
1293 fprintf(o, "%s%06o %s %d\t%s\n",
1294 label,
1295 ce->ce_mode,
1296 sha1_to_hex(ce->sha1),
1297 ce_stage(ce),
1298 ce->name);
1300 #endif
1302 int threeway_merge(struct cache_entry **stages, struct unpack_trees_options *o)
1304 struct cache_entry *index;
1305 struct cache_entry *head;
1306 struct cache_entry *remote = stages[o->head_idx + 1];
1307 int count;
1308 int head_match = 0;
1309 int remote_match = 0;
1311 int df_conflict_head = 0;
1312 int df_conflict_remote = 0;
1314 int any_anc_missing = 0;
1315 int no_anc_exists = 1;
1316 int i;
1318 for (i = 1; i < o->head_idx; i++) {
1319 if (!stages[i] || stages[i] == o->df_conflict_entry)
1320 any_anc_missing = 1;
1321 else
1322 no_anc_exists = 0;
1325 index = stages[0];
1326 head = stages[o->head_idx];
1328 if (head == o->df_conflict_entry) {
1329 df_conflict_head = 1;
1330 head = NULL;
1333 if (remote == o->df_conflict_entry) {
1334 df_conflict_remote = 1;
1335 remote = NULL;
1339 * First, if there's a #16 situation, note that to prevent #13
1340 * and #14.
1342 if (!same(remote, head)) {
1343 for (i = 1; i < o->head_idx; i++) {
1344 if (same(stages[i], head)) {
1345 head_match = i;
1347 if (same(stages[i], remote)) {
1348 remote_match = i;
1354 * We start with cases where the index is allowed to match
1355 * something other than the head: #14(ALT) and #2ALT, where it
1356 * is permitted to match the result instead.
1358 /* #14, #14ALT, #2ALT */
1359 if (remote && !df_conflict_head && head_match && !remote_match) {
1360 if (index && !same(index, remote) && !same(index, head))
1361 return o->gently ? -1 : reject_merge(index, o);
1362 return merged_entry(remote, index, o);
1365 * If we have an entry in the index cache, then we want to
1366 * make sure that it matches head.
1368 if (index && !same(index, head))
1369 return o->gently ? -1 : reject_merge(index, o);
1371 if (head) {
1372 /* #5ALT, #15 */
1373 if (same(head, remote))
1374 return merged_entry(head, index, o);
1375 /* #13, #3ALT */
1376 if (!df_conflict_remote && remote_match && !head_match)
1377 return merged_entry(head, index, o);
1380 /* #1 */
1381 if (!head && !remote && any_anc_missing)
1382 return 0;
1385 * Under the "aggressive" rule, we resolve mostly trivial
1386 * cases that we historically had git-merge-one-file resolve.
1388 if (o->aggressive) {
1389 int head_deleted = !head;
1390 int remote_deleted = !remote;
1391 struct cache_entry *ce = NULL;
1393 if (index)
1394 ce = index;
1395 else if (head)
1396 ce = head;
1397 else if (remote)
1398 ce = remote;
1399 else {
1400 for (i = 1; i < o->head_idx; i++) {
1401 if (stages[i] && stages[i] != o->df_conflict_entry) {
1402 ce = stages[i];
1403 break;
1409 * Deleted in both.
1410 * Deleted in one and unchanged in the other.
1412 if ((head_deleted && remote_deleted) ||
1413 (head_deleted && remote && remote_match) ||
1414 (remote_deleted && head && head_match)) {
1415 if (index)
1416 return deleted_entry(index, index, o);
1417 if (ce && !head_deleted) {
1418 if (verify_absent(ce, ERROR_WOULD_LOSE_UNTRACKED_REMOVED, o))
1419 return -1;
1421 return 0;
1424 * Added in both, identically.
1426 if (no_anc_exists && head && remote && same(head, remote))
1427 return merged_entry(head, index, o);
1431 /* Below are "no merge" cases, which require that the index be
1432 * up-to-date to avoid the files getting overwritten with
1433 * conflict resolution files.
1435 if (index) {
1436 if (verify_uptodate(index, o))
1437 return -1;
1440 o->nontrivial_merge = 1;
1442 /* #2, #3, #4, #6, #7, #9, #10, #11. */
1443 count = 0;
1444 if (!head_match || !remote_match) {
1445 for (i = 1; i < o->head_idx; i++) {
1446 if (stages[i] && stages[i] != o->df_conflict_entry) {
1447 keep_entry(stages[i], o);
1448 count++;
1449 break;
1453 #if DBRT_DEBUG
1454 else {
1455 fprintf(stderr, "read-tree: warning #16 detected\n");
1456 show_stage_entry(stderr, "head ", stages[head_match]);
1457 show_stage_entry(stderr, "remote ", stages[remote_match]);
1459 #endif
1460 if (head) { count += keep_entry(head, o); }
1461 if (remote) { count += keep_entry(remote, o); }
1462 return count;
1466 * Two-way merge.
1468 * The rule is to "carry forward" what is in the index without losing
1469 * information across a "fast-forward", favoring a successful merge
1470 * over a merge failure when it makes sense. For details of the
1471 * "carry forward" rule, please see <Documentation/git-read-tree.txt>.
1474 int twoway_merge(struct cache_entry **src, struct unpack_trees_options *o)
1476 struct cache_entry *current = src[0];
1477 struct cache_entry *oldtree = src[1];
1478 struct cache_entry *newtree = src[2];
1480 if (o->merge_size != 2)
1481 return error("Cannot do a twoway merge of %d trees",
1482 o->merge_size);
1484 if (oldtree == o->df_conflict_entry)
1485 oldtree = NULL;
1486 if (newtree == o->df_conflict_entry)
1487 newtree = NULL;
1489 if (current) {
1490 if ((!oldtree && !newtree) || /* 4 and 5 */
1491 (!oldtree && newtree &&
1492 same(current, newtree)) || /* 6 and 7 */
1493 (oldtree && newtree &&
1494 same(oldtree, newtree)) || /* 14 and 15 */
1495 (oldtree && newtree &&
1496 !same(oldtree, newtree) && /* 18 and 19 */
1497 same(current, newtree))) {
1498 return keep_entry(current, o);
1500 else if (oldtree && !newtree && same(current, oldtree)) {
1501 /* 10 or 11 */
1502 return deleted_entry(oldtree, current, o);
1504 else if (oldtree && newtree &&
1505 same(current, oldtree) && !same(current, newtree)) {
1506 /* 20 or 21 */
1507 return merged_entry(newtree, current, o);
1509 else {
1510 /* all other failures */
1511 if (oldtree)
1512 return o->gently ? -1 : reject_merge(oldtree, o);
1513 if (current)
1514 return o->gently ? -1 : reject_merge(current, o);
1515 if (newtree)
1516 return o->gently ? -1 : reject_merge(newtree, o);
1517 return -1;
1520 else if (newtree) {
1521 if (oldtree && !o->initial_checkout) {
1523 * deletion of the path was staged;
1525 if (same(oldtree, newtree))
1526 return 1;
1527 return reject_merge(oldtree, o);
1529 return merged_entry(newtree, current, o);
1531 return deleted_entry(oldtree, current, o);
1535 * Bind merge.
1537 * Keep the index entries at stage0, collapse stage1 but make sure
1538 * stage0 does not have anything there.
1540 int bind_merge(struct cache_entry **src,
1541 struct unpack_trees_options *o)
1543 struct cache_entry *old = src[0];
1544 struct cache_entry *a = src[1];
1546 if (o->merge_size != 1)
1547 return error("Cannot do a bind merge of %d trees\n",
1548 o->merge_size);
1549 if (a && old)
1550 return o->gently ? -1 :
1551 error(ERRORMSG(o, ERROR_BIND_OVERLAP), a->name, old->name);
1552 if (!a)
1553 return keep_entry(old, o);
1554 else
1555 return merged_entry(a, NULL, o);
1559 * One-way merge.
1561 * The rule is:
1562 * - take the stat information from stage0, take the data from stage1
1564 int oneway_merge(struct cache_entry **src, struct unpack_trees_options *o)
1566 struct cache_entry *old = src[0];
1567 struct cache_entry *a = src[1];
1569 if (o->merge_size != 1)
1570 return error("Cannot do a oneway merge of %d trees",
1571 o->merge_size);
1573 if (!a || a == o->df_conflict_entry)
1574 return deleted_entry(old, old, o);
1576 if (old && same(old, a)) {
1577 int update = 0;
1578 if (o->reset && !ce_uptodate(old) && !ce_skip_worktree(old)) {
1579 struct stat st;
1580 if (lstat(old->name, &st) ||
1581 ie_match_stat(o->src_index, old, &st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE))
1582 update |= CE_UPDATE;
1584 add_entry(o, old, update, 0);
1585 return 0;
1587 return merged_entry(a, old, o);