1 #define NO_THE_INDEX_COMPATIBILITY_MACROS
6 #include "cache-tree.h"
7 #include "unpack-trees.h"
11 #include "split-index.h"
15 * Error messages expected by scripts out of plumbing commands such as
16 * read-tree. Non-scripted Porcelain is not required to use these messages
17 * and in fact are encouraged to reword them to better suit their particular
18 * situation better. See how "git checkout" and "git merge" replaces
19 * them using setup_unpack_trees_porcelain(), for example.
21 static const char *unpack_plumbing_errors[NB_UNPACK_TREES_ERROR_TYPES] = {
22 /* ERROR_WOULD_OVERWRITE */
23 "Entry '%s' would be overwritten by merge. Cannot merge.",
25 /* ERROR_NOT_UPTODATE_FILE */
26 "Entry '%s' not uptodate. Cannot merge.",
28 /* ERROR_NOT_UPTODATE_DIR */
29 "Updating '%s' would lose untracked files in it",
31 /* ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN */
32 "Untracked working tree file '%s' would be overwritten by merge.",
34 /* ERROR_WOULD_LOSE_UNTRACKED_REMOVED */
35 "Untracked working tree file '%s' would be removed by merge.",
37 /* ERROR_BIND_OVERLAP */
38 "Entry '%s' overlaps with '%s'. Cannot bind.",
40 /* ERROR_SPARSE_NOT_UPTODATE_FILE */
41 "Entry '%s' not uptodate. Cannot update sparse checkout.",
43 /* ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN */
44 "Working tree file '%s' would be overwritten by sparse checkout update.",
46 /* ERROR_WOULD_LOSE_ORPHANED_REMOVED */
47 "Working tree file '%s' would be removed by sparse checkout update.",
50 #define ERRORMSG(o,type) \
51 ( ((o) && (o)->msgs[(type)]) \
52 ? ((o)->msgs[(type)]) \
53 : (unpack_plumbing_errors[(type)]) )
55 void setup_unpack_trees_porcelain(struct unpack_trees_options *opts,
59 const char **msgs = opts->msgs;
61 const char *cmd2 = strcmp(cmd, "checkout") ? cmd : "switch branches";
63 if (advice_commit_before_merge)
64 msg = "Your local changes to the following files would be overwritten by %s:\n%%s"
65 "Please, commit your changes or stash them before you can %s.";
67 msg = "Your local changes to the following files would be overwritten by %s:\n%%s";
68 msgs[ERROR_WOULD_OVERWRITE] = msgs[ERROR_NOT_UPTODATE_FILE] =
69 xstrfmt(msg, cmd, cmd2);
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.";
78 msg = "The following untracked working tree files would be %s by %s:\n%%s";
80 msgs[ERROR_WOULD_LOSE_UNTRACKED_REMOVED] = xstrfmt(msg, "removed", cmd, cmd2);
81 msgs[ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN] = xstrfmt(msg, "overwritten", cmd, cmd2);
84 * Special case: ERROR_BIND_OVERLAP refers to a pair of paths, we
85 * cannot easily display it as a list.
87 msgs[ERROR_BIND_OVERLAP] = "Entry '%s' overlaps with '%s'. Cannot bind.";
89 msgs[ERROR_SPARSE_NOT_UPTODATE_FILE] =
90 "Cannot update sparse checkout: the following entries are not up-to-date:\n%s";
91 msgs[ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN] =
92 "The following Working tree files would be overwritten by sparse checkout update:\n%s";
93 msgs[ERROR_WOULD_LOSE_ORPHANED_REMOVED] =
94 "The following Working tree files would be removed by sparse checkout update:\n%s";
96 opts->show_all_errors = 1;
97 /* rejected paths may not have a static buffer */
98 for (i = 0; i < ARRAY_SIZE(opts->unpack_rejects); i++)
99 opts->unpack_rejects[i].strdup_strings = 1;
102 static int do_add_entry(struct unpack_trees_options *o, struct cache_entry *ce,
103 unsigned int set, unsigned int clear)
110 ce->ce_flags = (ce->ce_flags & ~clear) | set;
111 return add_index_entry(&o->result, ce,
112 ADD_CACHE_OK_TO_ADD | ADD_CACHE_OK_TO_REPLACE);
115 static struct cache_entry *dup_entry(const struct cache_entry *ce)
117 unsigned int size = ce_size(ce);
118 struct cache_entry *new = xmalloc(size);
120 memcpy(new, ce, size);
124 static void add_entry(struct unpack_trees_options *o,
125 const struct cache_entry *ce,
126 unsigned int set, unsigned int clear)
128 do_add_entry(o, dup_entry(ce), set, clear);
132 * add error messages on path <path>
133 * corresponding to the type <e> with the message <msg>
134 * indicating if it should be display in porcelain or not
136 static int add_rejected_path(struct unpack_trees_options *o,
137 enum unpack_trees_error_types e,
140 if (!o->show_all_errors)
141 return error(ERRORMSG(o, e), path);
144 * Otherwise, insert in a list for future display by
145 * display_error_msgs()
147 string_list_append(&o->unpack_rejects[e], path);
152 * display all the error messages stored in a nice way
154 static void display_error_msgs(struct unpack_trees_options *o)
157 int something_displayed = 0;
158 for (e = 0; e < NB_UNPACK_TREES_ERROR_TYPES; e++) {
159 struct string_list *rejects = &o->unpack_rejects[e];
160 if (rejects->nr > 0) {
161 struct strbuf path = STRBUF_INIT;
162 something_displayed = 1;
163 for (i = 0; i < rejects->nr; i++)
164 strbuf_addf(&path, "\t%s\n", rejects->items[i].string);
165 error(ERRORMSG(o, e), path.buf);
166 strbuf_release(&path);
168 string_list_clear(rejects, 0);
170 if (something_displayed)
171 fprintf(stderr, "Aborting\n");
175 * Unlink the last component and schedule the leading directories for
176 * removal, such that empty directories get removed.
178 static void unlink_entry(const struct cache_entry *ce)
180 if (!check_leading_path(ce->name, ce_namelen(ce)))
182 if (remove_or_warn(ce->ce_mode, ce->name))
184 schedule_dir_for_removal(ce->name, ce_namelen(ce));
187 static struct checkout state;
188 static int check_updates(struct unpack_trees_options *o)
190 unsigned cnt = 0, total = 0;
191 struct progress *progress = NULL;
192 struct index_state *index = &o->result;
196 if (o->update && o->verbose_update) {
197 for (total = cnt = 0; cnt < index->cache_nr; cnt++) {
198 const struct cache_entry *ce = index->cache[cnt];
199 if (ce->ce_flags & (CE_UPDATE | CE_WT_REMOVE))
203 progress = start_progress_delay(_("Checking out files"),
209 git_attr_set_direction(GIT_ATTR_CHECKOUT, &o->result);
210 for (i = 0; i < index->cache_nr; i++) {
211 const struct cache_entry *ce = index->cache[i];
213 if (ce->ce_flags & CE_WT_REMOVE) {
214 display_progress(progress, ++cnt);
215 if (o->update && !o->dry_run)
220 remove_marked_cache_entries(&o->result);
221 remove_scheduled_dirs();
223 for (i = 0; i < index->cache_nr; i++) {
224 struct cache_entry *ce = index->cache[i];
226 if (ce->ce_flags & CE_UPDATE) {
227 if (ce->ce_flags & CE_WT_REMOVE)
228 die("BUG: both update and delete flags are set on %s",
230 display_progress(progress, ++cnt);
231 ce->ce_flags &= ~CE_UPDATE;
232 if (o->update && !o->dry_run) {
233 errs |= checkout_entry(ce, &state, NULL);
237 stop_progress(&progress);
239 git_attr_set_direction(GIT_ATTR_CHECKIN, NULL);
243 static int verify_uptodate_sparse(const struct cache_entry *ce,
244 struct unpack_trees_options *o);
245 static int verify_absent_sparse(const struct cache_entry *ce,
246 enum unpack_trees_error_types,
247 struct unpack_trees_options *o);
249 static int apply_sparse_checkout(struct index_state *istate,
250 struct cache_entry *ce,
251 struct unpack_trees_options *o)
253 int was_skip_worktree = ce_skip_worktree(ce);
255 if (ce->ce_flags & CE_NEW_SKIP_WORKTREE)
256 ce->ce_flags |= CE_SKIP_WORKTREE;
258 ce->ce_flags &= ~CE_SKIP_WORKTREE;
259 if (was_skip_worktree != ce_skip_worktree(ce)) {
260 ce->ce_flags |= CE_UPDATE_IN_BASE;
261 istate->cache_changed |= CE_ENTRY_CHANGED;
265 * if (!was_skip_worktree && !ce_skip_worktree()) {
266 * This is perfectly normal. Move on;
271 * Merge strategies may set CE_UPDATE|CE_REMOVE outside checkout
272 * area as a result of ce_skip_worktree() shortcuts in
273 * verify_absent() and verify_uptodate().
274 * Make sure they don't modify worktree if they are already
275 * outside checkout area
277 if (was_skip_worktree && ce_skip_worktree(ce)) {
278 ce->ce_flags &= ~CE_UPDATE;
281 * By default, when CE_REMOVE is on, CE_WT_REMOVE is also
282 * on to get that file removed from both index and worktree.
283 * If that file is already outside worktree area, don't
286 if (ce->ce_flags & CE_REMOVE)
287 ce->ce_flags &= ~CE_WT_REMOVE;
290 if (!was_skip_worktree && ce_skip_worktree(ce)) {
292 * If CE_UPDATE is set, verify_uptodate() must be called already
293 * also stat info may have lost after merged_entry() so calling
294 * verify_uptodate() again may fail
296 if (!(ce->ce_flags & CE_UPDATE) && verify_uptodate_sparse(ce, o))
298 ce->ce_flags |= CE_WT_REMOVE;
299 ce->ce_flags &= ~CE_UPDATE;
301 if (was_skip_worktree && !ce_skip_worktree(ce)) {
302 if (verify_absent_sparse(ce, ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN, o))
304 ce->ce_flags |= CE_UPDATE;
309 static inline int call_unpack_fn(const struct cache_entry * const *src,
310 struct unpack_trees_options *o)
312 int ret = o->fn(src, o);
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)
328 o->cache_bottom = bottom;
332 static void mark_all_ce_unused(struct index_state *index)
335 for (i = 0; i < index->cache_nr; i++)
336 index->cache[i]->ce_flags &= ~(CE_UNPACKED | CE_ADDED | CE_NEW_SKIP_WORKTREE);
339 static int locate_in_src_index(const 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);
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);
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))
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))
385 static void add_same_unmerged(const 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);
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))
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 const struct cache_entry *src[MAX_UNPACK_TREES + 1] = { NULL, };
414 if (o->skip_unmerged) {
415 add_entry(o, ce, 0, 0);
419 ret = call_unpack_fn(src, o);
421 mark_ce_used_same_name(ce, o);
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)
433 o->cache_bottom = bottom;
436 static int switch_cache_bottom(struct traverse_info *info)
438 struct unpack_trees_options *o = info->data;
441 if (o->diff_index_cached)
443 ret = o->cache_bottom;
444 pos = find_cache_pos(info->prev, &info->name);
447 o->cache_bottom = -2 - pos;
449 o->cache_bottom = o->src_index->cache_nr;
453 static int traverse_trees_recursive(int n, unsigned long dirmask,
454 unsigned long df_conflicts,
455 struct name_entry *names,
456 struct traverse_info *info)
459 struct tree_desc t[MAX_UNPACK_TREES];
460 void *buf[MAX_UNPACK_TREES];
461 struct traverse_info newinfo;
462 struct name_entry *p;
470 newinfo.pathspec = info->pathspec;
472 newinfo.pathlen += tree_entry_len(p) + 1;
473 newinfo.df_conflicts |= df_conflicts;
475 for (i = 0; i < n; i++, dirmask >>= 1) {
476 const unsigned char *sha1 = NULL;
478 sha1 = names[i].sha1;
479 buf[i] = fill_tree_descriptor(t+i, sha1);
482 bottom = switch_cache_bottom(&newinfo);
483 ret = traverse_trees(n, t, &newinfo);
484 restore_cache_bottom(&newinfo, bottom);
486 for (i = 0; i < n; i++)
493 * Compare the traverse-path to the cache entry without actually
494 * having to generate the textual representation of the traverse
497 * NOTE! This *only* compares up to the size of the traverse path
498 * itself - the caller needs to do the final check for the cache
499 * entry having more data at the end!
501 static int do_compare_entry_piecewise(const struct cache_entry *ce, const struct traverse_info *info, const struct name_entry *n)
503 int len, pathlen, ce_len;
507 int cmp = do_compare_entry_piecewise(ce, info->prev,
512 pathlen = info->pathlen;
513 ce_len = ce_namelen(ce);
515 /* If ce_len < pathlen then we must have previously hit "name == directory" entry */
516 if (ce_len < pathlen)
520 ce_name = ce->name + pathlen;
522 len = tree_entry_len(n);
523 return df_name_compare(ce_name, ce_len, S_IFREG, n->path, len, n->mode);
526 static int do_compare_entry(const struct cache_entry *ce,
527 const struct traverse_info *info,
528 const struct name_entry *n)
530 int len, pathlen, ce_len;
535 * If we have not precomputed the traverse path, it is quicker
536 * to avoid doing so. But if we have precomputed it,
537 * it is quicker to use the precomputed version.
539 if (!info->traverse_path)
540 return do_compare_entry_piecewise(ce, info, n);
542 cmp = strncmp(ce->name, info->traverse_path, info->pathlen);
546 pathlen = info->pathlen;
547 ce_len = ce_namelen(ce);
549 if (ce_len < pathlen)
553 ce_name = ce->name + pathlen;
555 len = tree_entry_len(n);
556 return df_name_compare(ce_name, ce_len, S_IFREG, n->path, len, n->mode);
559 static int compare_entry(const struct cache_entry *ce, const struct traverse_info *info, const struct name_entry *n)
561 int cmp = do_compare_entry(ce, info, n);
566 * Even if the beginning compared identically, the ce should
567 * compare as bigger than a directory leading up to it!
569 return ce_namelen(ce) > traverse_path_len(info, n);
572 static int ce_in_traverse_path(const struct cache_entry *ce,
573 const struct traverse_info *info)
577 if (do_compare_entry(ce, info->prev, &info->name))
580 * If ce (blob) is the same name as the path (which is a tree
581 * we will be descending into), it won't be inside it.
583 return (info->pathlen < ce_namelen(ce));
586 static struct cache_entry *create_ce_entry(const struct traverse_info *info, const struct name_entry *n, int stage)
588 int len = traverse_path_len(info, n);
589 struct cache_entry *ce = xcalloc(1, cache_entry_size(len));
591 ce->ce_mode = create_ce_mode(n->mode);
592 ce->ce_flags = create_ce_flags(stage);
593 ce->ce_namelen = len;
594 hashcpy(ce->sha1, n->sha1);
595 make_traverse_path(ce->name, info, n);
600 static int unpack_nondirectories(int n, unsigned long mask,
601 unsigned long dirmask,
602 struct cache_entry **src,
603 const struct name_entry *names,
604 const struct traverse_info *info)
607 struct unpack_trees_options *o = info->data;
608 unsigned long conflicts = info->df_conflicts | dirmask;
610 /* Do we have *only* directories? Nothing to do */
611 if (mask == dirmask && !src[0])
615 * Ok, we've filled in up to any potential index entry in src[0],
618 for (i = 0; i < n; i++) {
620 unsigned int bit = 1ul << i;
621 if (conflicts & bit) {
622 src[i + o->merge] = o->df_conflict_entry;
629 else if (i + 1 < o->head_idx)
631 else if (i + 1 > o->head_idx)
635 src[i + o->merge] = create_ce_entry(info, names + i, stage);
639 int rc = call_unpack_fn((const struct cache_entry * const *)src,
641 for (i = 0; i < n; i++) {
642 struct cache_entry *ce = src[i + o->merge];
643 if (ce != o->df_conflict_entry)
649 for (i = 0; i < n; i++)
650 if (src[i] && src[i] != o->df_conflict_entry)
651 if (do_add_entry(o, src[i], 0, 0))
657 static int unpack_failed(struct unpack_trees_options *o, const char *message)
659 discard_index(&o->result);
660 if (!o->gently && !o->exiting_early) {
662 return error("%s", message);
669 * The tree traversal is looking at name p. If we have a matching entry,
670 * return it. If name p is a directory in the index, do not return
671 * anything, as we will want to match it when the traversal descends into
674 static int find_cache_pos(struct traverse_info *info,
675 const struct name_entry *p)
678 struct unpack_trees_options *o = info->data;
679 struct index_state *index = o->src_index;
680 int pfxlen = info->pathlen;
681 int p_len = tree_entry_len(p);
683 for (pos = o->cache_bottom; pos < index->cache_nr; pos++) {
684 const struct cache_entry *ce = index->cache[pos];
685 const char *ce_name, *ce_slash;
688 if (ce->ce_flags & CE_UNPACKED) {
690 * cache_bottom entry is already unpacked, so
691 * we can never match it; don't check it
694 if (pos == o->cache_bottom)
698 if (!ce_in_traverse_path(ce, info))
700 ce_name = ce->name + pfxlen;
701 ce_slash = strchr(ce_name, '/');
703 ce_len = ce_slash - ce_name;
705 ce_len = ce_namelen(ce) - pfxlen;
706 cmp = name_compare(p->path, p_len, ce_name, ce_len);
708 * Exact match; if we have a directory we need to
709 * delay returning it.
712 return ce_slash ? -2 - pos : pos;
714 continue; /* keep looking */
716 * ce_name sorts after p->path; could it be that we
717 * have files under p->path directory in the index?
718 * E.g. ce_name == "t-i", and p->path == "t"; we may
719 * have "t/a" in the index.
721 if (p_len < ce_len && !memcmp(ce_name, p->path, p_len) &&
722 ce_name[p_len] < '/')
723 continue; /* keep looking */
729 static struct cache_entry *find_cache_entry(struct traverse_info *info,
730 const struct name_entry *p)
732 int pos = find_cache_pos(info, p);
733 struct unpack_trees_options *o = info->data;
736 return o->src_index->cache[pos];
741 static void debug_path(struct traverse_info *info)
744 debug_path(info->prev);
745 if (*info->prev->name.path)
748 printf("%s", info->name.path);
751 static void debug_name_entry(int i, struct name_entry *n)
753 printf("ent#%d %06o %s\n", i,
754 n->path ? n->mode : 0,
755 n->path ? n->path : "(missing)");
758 static void debug_unpack_callback(int n,
760 unsigned long dirmask,
761 struct name_entry *names,
762 struct traverse_info *info)
765 printf("* unpack mask %lu, dirmask %lu, cnt %d ",
769 for (i = 0; i < n; i++)
770 debug_name_entry(i, names + i);
773 static int unpack_callback(int n, unsigned long mask, unsigned long dirmask, struct name_entry *names, struct traverse_info *info)
775 struct cache_entry *src[MAX_UNPACK_TREES + 1] = { NULL, };
776 struct unpack_trees_options *o = info->data;
777 const struct name_entry *p = names;
779 /* Find first entry with a real name (we could use "mask" too) */
784 debug_unpack_callback(n, mask, dirmask, names, info);
786 /* Are we supposed to look at the index too? */
790 struct cache_entry *ce;
792 if (o->diff_index_cached)
793 ce = next_cache_entry(o);
795 ce = find_cache_entry(info, p);
799 cmp = compare_entry(ce, info, p);
801 if (unpack_index_entry(ce, o) < 0)
802 return unpack_failed(o, NULL);
808 * If we skip unmerged index
809 * entries, we'll skip this
810 * entry *and* the tree
811 * entries associated with it!
813 if (o->skip_unmerged) {
814 add_same_unmerged(ce, o);
824 if (unpack_nondirectories(n, mask, dirmask, src, names, info) < 0)
827 if (o->merge && src[0]) {
828 if (ce_stage(src[0]))
829 mark_ce_used_same_name(src[0], o);
831 mark_ce_used(src[0], o);
834 /* Now handle any directories.. */
836 /* special case: "diff-index --cached" looking at a tree */
837 if (o->diff_index_cached &&
838 n == 1 && dirmask == 1 && S_ISDIR(names->mode)) {
840 matches = cache_tree_matches_traversal(o->src_index->cache_tree,
843 * Everything under the name matches; skip the
844 * entire hierarchy. diff_index_cached codepath
845 * special cases D/F conflicts in such a way that
846 * it does not do any look-ahead, so this is safe.
849 o->cache_bottom += matches;
854 if (traverse_trees_recursive(n, dirmask, mask & ~dirmask,
863 static int clear_ce_flags_1(struct cache_entry **cache, int nr,
864 struct strbuf *prefix,
865 int select_mask, int clear_mask,
866 struct exclude_list *el, int defval);
868 /* Whole directory matching */
869 static int clear_ce_flags_dir(struct cache_entry **cache, int nr,
870 struct strbuf *prefix,
872 int select_mask, int clear_mask,
873 struct exclude_list *el, int defval)
875 struct cache_entry **cache_end;
877 int ret = is_excluded_from_list(prefix->buf, prefix->len,
878 basename, &dtype, el);
881 strbuf_addch(prefix, '/');
883 /* If undecided, use matching result of parent dir in defval */
887 for (cache_end = cache; cache_end != cache + nr; cache_end++) {
888 struct cache_entry *ce = *cache_end;
889 if (strncmp(ce->name, prefix->buf, prefix->len))
894 * TODO: check el, if there are no patterns that may conflict
895 * with ret (iow, we know in advance the incl/excl
896 * decision for the entire directory), clear flag here without
897 * calling clear_ce_flags_1(). That function will call
898 * the expensive is_excluded_from_list() on every entry.
900 rc = clear_ce_flags_1(cache, cache_end - cache,
902 select_mask, clear_mask,
904 strbuf_setlen(prefix, prefix->len - 1);
909 * Traverse the index, find every entry that matches according to
910 * o->el. Do "ce_flags &= ~clear_mask" on those entries. Return the
911 * number of traversed entries.
913 * If select_mask is non-zero, only entries whose ce_flags has on of
914 * those bits enabled are traversed.
916 * cache : pointer to an index entry
917 * prefix_len : an offset to its path
919 * The current path ("prefix") including the trailing '/' is
920 * cache[0]->name[0..(prefix_len-1)]
921 * Top level path has prefix_len zero.
923 static int clear_ce_flags_1(struct cache_entry **cache, int nr,
924 struct strbuf *prefix,
925 int select_mask, int clear_mask,
926 struct exclude_list *el, int defval)
928 struct cache_entry **cache_end = cache + nr;
931 * Process all entries that have the given prefix and meet
932 * select_mask condition
934 while(cache != cache_end) {
935 struct cache_entry *ce = *cache;
936 const char *name, *slash;
939 if (select_mask && !(ce->ce_flags & select_mask)) {
944 if (prefix->len && strncmp(ce->name, prefix->buf, prefix->len))
947 name = ce->name + prefix->len;
948 slash = strchr(name, '/');
950 /* If it's a directory, try whole directory match first */
955 strbuf_add(prefix, name, len);
957 processed = clear_ce_flags_dir(cache, cache_end - cache,
959 prefix->buf + prefix->len - len,
960 select_mask, clear_mask,
963 /* clear_c_f_dir eats a whole dir already? */
966 strbuf_setlen(prefix, prefix->len - len);
970 strbuf_addch(prefix, '/');
971 cache += clear_ce_flags_1(cache, cache_end - cache,
973 select_mask, clear_mask, el, defval);
974 strbuf_setlen(prefix, prefix->len - len - 1);
979 dtype = ce_to_dtype(ce);
980 ret = is_excluded_from_list(ce->name, ce_namelen(ce),
985 ce->ce_flags &= ~clear_mask;
988 return nr - (cache_end - cache);
991 static int clear_ce_flags(struct cache_entry **cache, int nr,
992 int select_mask, int clear_mask,
993 struct exclude_list *el)
995 static struct strbuf prefix = STRBUF_INIT;
997 strbuf_reset(&prefix);
999 return clear_ce_flags_1(cache, nr,
1001 select_mask, clear_mask,
1006 * Set/Clear CE_NEW_SKIP_WORKTREE according to $GIT_DIR/info/sparse-checkout
1008 static void mark_new_skip_worktree(struct exclude_list *el,
1009 struct index_state *the_index,
1010 int select_flag, int skip_wt_flag)
1015 * 1. Pretend the narrowest worktree: only unmerged entries
1018 for (i = 0; i < the_index->cache_nr; i++) {
1019 struct cache_entry *ce = the_index->cache[i];
1021 if (select_flag && !(ce->ce_flags & select_flag))
1025 ce->ce_flags |= skip_wt_flag;
1027 ce->ce_flags &= ~skip_wt_flag;
1031 * 2. Widen worktree according to sparse-checkout file.
1032 * Matched entries will have skip_wt_flag cleared (i.e. "in")
1034 clear_ce_flags(the_index->cache, the_index->cache_nr,
1035 select_flag, skip_wt_flag, el);
1038 static int verify_absent(const struct cache_entry *,
1039 enum unpack_trees_error_types,
1040 struct unpack_trees_options *);
1042 * N-way merge "len" trees. Returns 0 on success, -1 on failure to manipulate the
1043 * resulting index, -2 on failure to reflect the changes to the work tree.
1045 * CE_ADDED, CE_UNPACKED and CE_NEW_SKIP_WORKTREE are used internally
1047 int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options *o)
1050 static struct cache_entry *dfc;
1051 struct exclude_list el;
1053 if (len > MAX_UNPACK_TREES)
1054 die("unpack_trees takes at most %d trees", MAX_UNPACK_TREES);
1055 memset(&state, 0, sizeof(state));
1056 state.base_dir = "";
1059 state.refresh_cache = 1;
1060 state.istate = &o->result;
1062 memset(&el, 0, sizeof(el));
1063 if (!core_apply_sparse_checkout || !o->update)
1064 o->skip_sparse_checkout = 1;
1065 if (!o->skip_sparse_checkout) {
1066 char *sparse = git_pathdup("info/sparse-checkout");
1067 if (add_excludes_from_file_to_list(sparse, "", 0, &el, 0) < 0)
1068 o->skip_sparse_checkout = 1;
1074 memset(&o->result, 0, sizeof(o->result));
1075 o->result.initialized = 1;
1076 o->result.timestamp.sec = o->src_index->timestamp.sec;
1077 o->result.timestamp.nsec = o->src_index->timestamp.nsec;
1078 o->result.version = o->src_index->version;
1079 o->result.split_index = o->src_index->split_index;
1080 if (o->result.split_index)
1081 o->result.split_index->refcount++;
1082 hashcpy(o->result.sha1, o->src_index->sha1);
1083 o->merge_size = len;
1084 mark_all_ce_unused(o->src_index);
1087 * Sparse checkout loop #1: set NEW_SKIP_WORKTREE on existing entries
1089 if (!o->skip_sparse_checkout)
1090 mark_new_skip_worktree(o->el, o->src_index, 0, CE_NEW_SKIP_WORKTREE);
1093 dfc = xcalloc(1, cache_entry_size(0));
1094 o->df_conflict_entry = dfc;
1097 const char *prefix = o->prefix ? o->prefix : "";
1098 struct traverse_info info;
1100 setup_traverse_info(&info, prefix);
1101 info.fn = unpack_callback;
1103 info.show_all_errors = o->show_all_errors;
1104 info.pathspec = o->pathspec;
1108 * Unpack existing index entries that sort before the
1109 * prefix the tree is spliced into. Note that o->merge
1110 * is always true in this case.
1113 struct cache_entry *ce = next_cache_entry(o);
1116 if (ce_in_traverse_path(ce, &info))
1118 if (unpack_index_entry(ce, o) < 0)
1123 if (traverse_trees(len, t, &info) < 0)
1127 /* Any left-over entries in the index? */
1130 struct cache_entry *ce = next_cache_entry(o);
1133 if (unpack_index_entry(ce, o) < 0)
1137 mark_all_ce_unused(o->src_index);
1139 if (o->trivial_merges_only && o->nontrivial_merge) {
1140 ret = unpack_failed(o, "Merge requires file-level merging");
1144 if (!o->skip_sparse_checkout) {
1145 int empty_worktree = 1;
1148 * Sparse checkout loop #2: set NEW_SKIP_WORKTREE on entries not in loop #1
1149 * If the will have NEW_SKIP_WORKTREE, also set CE_SKIP_WORKTREE
1150 * so apply_sparse_checkout() won't attempt to remove it from worktree
1152 mark_new_skip_worktree(o->el, &o->result, CE_ADDED, CE_SKIP_WORKTREE | CE_NEW_SKIP_WORKTREE);
1155 for (i = 0; i < o->result.cache_nr; i++) {
1156 struct cache_entry *ce = o->result.cache[i];
1159 * Entries marked with CE_ADDED in merged_entry() do not have
1160 * verify_absent() check (the check is effectively disabled
1161 * because CE_NEW_SKIP_WORKTREE is set unconditionally).
1163 * Do the real check now because we have had
1164 * correct CE_NEW_SKIP_WORKTREE
1166 if (ce->ce_flags & CE_ADDED &&
1167 verify_absent(ce, ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN, o)) {
1168 if (!o->show_all_errors)
1173 if (apply_sparse_checkout(&o->result, ce, o)) {
1174 if (!o->show_all_errors)
1178 if (!ce_skip_worktree(ce))
1185 * Sparse checkout is meant to narrow down checkout area
1186 * but it does not make sense to narrow down to empty working
1187 * tree. This is usually a mistake in sparse checkout rules.
1188 * Do not allow users to do that.
1190 if (o->result.cache_nr && empty_worktree) {
1191 ret = unpack_failed(o, "Sparse checkout leaves no entry on working directory");
1196 o->src_index = NULL;
1197 ret = check_updates(o) ? (-2) : 0;
1200 if (!o->result.cache_tree)
1201 o->result.cache_tree = cache_tree();
1202 if (!cache_tree_fully_valid(o->result.cache_tree))
1203 cache_tree_update(&o->result,
1207 discard_index(o->dst_index);
1208 *o->dst_index = o->result;
1210 discard_index(&o->result);
1214 clear_exclude_list(&el);
1218 if (o->show_all_errors)
1219 display_error_msgs(o);
1220 mark_all_ce_unused(o->src_index);
1221 ret = unpack_failed(o, NULL);
1222 if (o->exiting_early)
1227 /* Here come the merge functions */
1229 static int reject_merge(const struct cache_entry *ce,
1230 struct unpack_trees_options *o)
1232 return o->gently ? -1 :
1233 add_rejected_path(o, ERROR_WOULD_OVERWRITE, ce->name);
1236 static int same(const struct cache_entry *a, const struct cache_entry *b)
1242 if ((a->ce_flags | b->ce_flags) & CE_CONFLICTED)
1244 return a->ce_mode == b->ce_mode &&
1245 !hashcmp(a->sha1, b->sha1);
1250 * When a CE gets turned into an unmerged entry, we
1251 * want it to be up-to-date
1253 static int verify_uptodate_1(const struct cache_entry *ce,
1254 struct unpack_trees_options *o,
1255 enum unpack_trees_error_types error_type)
1263 * CE_VALID and CE_SKIP_WORKTREE cheat, we better check again
1264 * if this entry is truly up-to-date because this file may be
1267 if ((ce->ce_flags & CE_VALID) || ce_skip_worktree(ce))
1268 ; /* keep checking */
1269 else if (o->reset || ce_uptodate(ce))
1272 if (!lstat(ce->name, &st)) {
1273 int flags = CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE;
1274 unsigned changed = ie_match_stat(o->src_index, ce, &st, flags);
1278 * NEEDSWORK: the current default policy is to allow
1279 * submodule to be out of sync wrt the superproject
1280 * index. This needs to be tightened later for
1281 * submodules that are marked to be automatically
1284 if (S_ISGITLINK(ce->ce_mode))
1288 if (errno == ENOENT)
1290 return o->gently ? -1 :
1291 add_rejected_path(o, error_type, ce->name);
1294 static int verify_uptodate(const struct cache_entry *ce,
1295 struct unpack_trees_options *o)
1297 if (!o->skip_sparse_checkout && (ce->ce_flags & CE_NEW_SKIP_WORKTREE))
1299 return verify_uptodate_1(ce, o, ERROR_NOT_UPTODATE_FILE);
1302 static int verify_uptodate_sparse(const struct cache_entry *ce,
1303 struct unpack_trees_options *o)
1305 return verify_uptodate_1(ce, o, ERROR_SPARSE_NOT_UPTODATE_FILE);
1308 static void invalidate_ce_path(const struct cache_entry *ce,
1309 struct unpack_trees_options *o)
1313 cache_tree_invalidate_path(o->src_index, ce->name);
1314 untracked_cache_invalidate_path(o->src_index, ce->name);
1318 * Check that checking out ce->sha1 in subdir ce->name is not
1319 * going to overwrite any working files.
1321 * Currently, git does not checkout subprojects during a superproject
1322 * checkout, so it is not going to overwrite anything.
1324 static int verify_clean_submodule(const struct cache_entry *ce,
1325 enum unpack_trees_error_types error_type,
1326 struct unpack_trees_options *o)
1331 static int verify_clean_subdirectory(const struct cache_entry *ce,
1332 enum unpack_trees_error_types error_type,
1333 struct unpack_trees_options *o)
1336 * we are about to extract "ce->name"; we would not want to lose
1337 * anything in the existing directory there.
1341 struct dir_struct d;
1344 unsigned char sha1[20];
1346 if (S_ISGITLINK(ce->ce_mode) &&
1347 resolve_gitlink_ref(ce->name, "HEAD", sha1) == 0) {
1348 /* If we are not going to update the submodule, then
1351 if (!hashcmp(sha1, ce->sha1))
1353 return verify_clean_submodule(ce, error_type, o);
1357 * First let's make sure we do not have a local modification
1358 * in that directory.
1360 namelen = ce_namelen(ce);
1361 for (i = locate_in_src_index(ce, o);
1362 i < o->src_index->cache_nr;
1364 struct cache_entry *ce2 = o->src_index->cache[i];
1365 int len = ce_namelen(ce2);
1366 if (len < namelen ||
1367 strncmp(ce->name, ce2->name, namelen) ||
1368 ce2->name[namelen] != '/')
1371 * ce2->name is an entry in the subdirectory to be
1374 if (!ce_stage(ce2)) {
1375 if (verify_uptodate(ce2, o))
1377 add_entry(o, ce2, CE_REMOVE, 0);
1378 mark_ce_used(ce2, o);
1384 * Then we need to make sure that we do not lose a locally
1385 * present file that is not ignored.
1387 pathbuf = xstrfmt("%.*s/", namelen, ce->name);
1389 memset(&d, 0, sizeof(d));
1391 d.exclude_per_dir = o->dir->exclude_per_dir;
1392 i = read_directory(&d, pathbuf, namelen+1, NULL);
1394 return o->gently ? -1 :
1395 add_rejected_path(o, ERROR_NOT_UPTODATE_DIR, ce->name);
1401 * This gets called when there was no index entry for the tree entry 'dst',
1402 * but we found a file in the working tree that 'lstat()' said was fine,
1403 * and we're on a case-insensitive filesystem.
1405 * See if we can find a case-insensitive match in the index that also
1406 * matches the stat information, and assume it's that other file!
1408 static int icase_exists(struct unpack_trees_options *o, const char *name, int len, struct stat *st)
1410 const struct cache_entry *src;
1412 src = index_file_exists(o->src_index, name, len, 1);
1413 return src && !ie_match_stat(o->src_index, src, st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE);
1416 static int check_ok_to_remove(const char *name, int len, int dtype,
1417 const struct cache_entry *ce, struct stat *st,
1418 enum unpack_trees_error_types error_type,
1419 struct unpack_trees_options *o)
1421 const struct cache_entry *result;
1424 * It may be that the 'lstat()' succeeded even though
1425 * target 'ce' was absent, because there is an old
1426 * entry that is different only in case..
1428 * Ignore that lstat() if it matches.
1430 if (ignore_case && icase_exists(o, name, len, st))
1434 is_excluded(o->dir, name, &dtype))
1436 * ce->name is explicitly excluded, so it is Ok to
1440 if (S_ISDIR(st->st_mode)) {
1442 * We are checking out path "foo" and
1443 * found "foo/." in the working tree.
1444 * This is tricky -- if we have modified
1445 * files that are in "foo/" we would lose
1448 if (verify_clean_subdirectory(ce, error_type, o) < 0)
1454 * The previous round may already have decided to
1455 * delete this path, which is in a subdirectory that
1456 * is being replaced with a blob.
1458 result = index_file_exists(&o->result, name, len, 0);
1460 if (result->ce_flags & CE_REMOVE)
1464 return o->gently ? -1 :
1465 add_rejected_path(o, error_type, name);
1469 * We do not want to remove or overwrite a working tree file that
1470 * is not tracked, unless it is ignored.
1472 static int verify_absent_1(const struct cache_entry *ce,
1473 enum unpack_trees_error_types error_type,
1474 struct unpack_trees_options *o)
1479 if (o->index_only || o->reset || !o->update)
1482 len = check_leading_path(ce->name, ce_namelen(ce));
1489 path = xmemdupz(ce->name, len);
1490 if (lstat(path, &st))
1491 ret = error("cannot stat '%s': %s", path,
1494 ret = check_ok_to_remove(path, len, DT_UNKNOWN, NULL,
1495 &st, error_type, o);
1498 } else if (lstat(ce->name, &st)) {
1499 if (errno != ENOENT)
1500 return error("cannot stat '%s': %s", ce->name,
1504 return check_ok_to_remove(ce->name, ce_namelen(ce),
1505 ce_to_dtype(ce), ce, &st,
1510 static int verify_absent(const struct cache_entry *ce,
1511 enum unpack_trees_error_types error_type,
1512 struct unpack_trees_options *o)
1514 if (!o->skip_sparse_checkout && (ce->ce_flags & CE_NEW_SKIP_WORKTREE))
1516 return verify_absent_1(ce, error_type, o);
1519 static int verify_absent_sparse(const struct cache_entry *ce,
1520 enum unpack_trees_error_types error_type,
1521 struct unpack_trees_options *o)
1523 enum unpack_trees_error_types orphaned_error = error_type;
1524 if (orphaned_error == ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN)
1525 orphaned_error = ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN;
1527 return verify_absent_1(ce, orphaned_error, o);
1530 static int merged_entry(const struct cache_entry *ce,
1531 const struct cache_entry *old,
1532 struct unpack_trees_options *o)
1534 int update = CE_UPDATE;
1535 struct cache_entry *merge = dup_entry(ce);
1539 * New index entries. In sparse checkout, the following
1540 * verify_absent() will be delayed until after
1541 * traverse_trees() finishes in unpack_trees(), then:
1543 * - CE_NEW_SKIP_WORKTREE will be computed correctly
1544 * - verify_absent() be called again, this time with
1545 * correct CE_NEW_SKIP_WORKTREE
1547 * verify_absent() call here does nothing in sparse
1548 * checkout (i.e. o->skip_sparse_checkout == 0)
1551 merge->ce_flags |= CE_NEW_SKIP_WORKTREE;
1553 if (verify_absent(merge,
1554 ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN, o)) {
1558 invalidate_ce_path(merge, o);
1559 } else if (!(old->ce_flags & CE_CONFLICTED)) {
1561 * See if we can re-use the old CE directly?
1562 * That way we get the uptodate stat info.
1564 * This also removes the UPDATE flag on a match; otherwise
1565 * we will end up overwriting local changes in the work tree.
1567 if (same(old, merge)) {
1568 copy_cache_entry(merge, old);
1571 if (verify_uptodate(old, o)) {
1575 /* Migrate old flags over */
1576 update |= old->ce_flags & (CE_SKIP_WORKTREE | CE_NEW_SKIP_WORKTREE);
1577 invalidate_ce_path(old, o);
1581 * Previously unmerged entry left as an existence
1582 * marker by read_index_unmerged();
1584 invalidate_ce_path(old, o);
1587 do_add_entry(o, merge, update, CE_STAGEMASK);
1591 static int deleted_entry(const struct cache_entry *ce,
1592 const struct cache_entry *old,
1593 struct unpack_trees_options *o)
1595 /* Did it exist in the index? */
1597 if (verify_absent(ce, ERROR_WOULD_LOSE_UNTRACKED_REMOVED, o))
1601 if (!(old->ce_flags & CE_CONFLICTED) && verify_uptodate(old, o))
1603 add_entry(o, ce, CE_REMOVE, 0);
1604 invalidate_ce_path(ce, o);
1608 static int keep_entry(const struct cache_entry *ce,
1609 struct unpack_trees_options *o)
1611 add_entry(o, ce, 0, 0);
1616 static void show_stage_entry(FILE *o,
1617 const char *label, const struct cache_entry *ce)
1620 fprintf(o, "%s (missing)\n", label);
1622 fprintf(o, "%s%06o %s %d\t%s\n",
1625 sha1_to_hex(ce->sha1),
1631 int threeway_merge(const struct cache_entry * const *stages,
1632 struct unpack_trees_options *o)
1634 const struct cache_entry *index;
1635 const struct cache_entry *head;
1636 const struct cache_entry *remote = stages[o->head_idx + 1];
1639 int remote_match = 0;
1641 int df_conflict_head = 0;
1642 int df_conflict_remote = 0;
1644 int any_anc_missing = 0;
1645 int no_anc_exists = 1;
1648 for (i = 1; i < o->head_idx; i++) {
1649 if (!stages[i] || stages[i] == o->df_conflict_entry)
1650 any_anc_missing = 1;
1656 head = stages[o->head_idx];
1658 if (head == o->df_conflict_entry) {
1659 df_conflict_head = 1;
1663 if (remote == o->df_conflict_entry) {
1664 df_conflict_remote = 1;
1669 * First, if there's a #16 situation, note that to prevent #13
1672 if (!same(remote, head)) {
1673 for (i = 1; i < o->head_idx; i++) {
1674 if (same(stages[i], head)) {
1677 if (same(stages[i], remote)) {
1684 * We start with cases where the index is allowed to match
1685 * something other than the head: #14(ALT) and #2ALT, where it
1686 * is permitted to match the result instead.
1688 /* #14, #14ALT, #2ALT */
1689 if (remote && !df_conflict_head && head_match && !remote_match) {
1690 if (index && !same(index, remote) && !same(index, head))
1691 return reject_merge(index, o);
1692 return merged_entry(remote, index, o);
1695 * If we have an entry in the index cache, then we want to
1696 * make sure that it matches head.
1698 if (index && !same(index, head))
1699 return reject_merge(index, o);
1703 if (same(head, remote))
1704 return merged_entry(head, index, o);
1706 if (!df_conflict_remote && remote_match && !head_match)
1707 return merged_entry(head, index, o);
1711 if (!head && !remote && any_anc_missing)
1715 * Under the "aggressive" rule, we resolve mostly trivial
1716 * cases that we historically had git-merge-one-file resolve.
1718 if (o->aggressive) {
1719 int head_deleted = !head;
1720 int remote_deleted = !remote;
1721 const struct cache_entry *ce = NULL;
1730 for (i = 1; i < o->head_idx; i++) {
1731 if (stages[i] && stages[i] != o->df_conflict_entry) {
1740 * Deleted in one and unchanged in the other.
1742 if ((head_deleted && remote_deleted) ||
1743 (head_deleted && remote && remote_match) ||
1744 (remote_deleted && head && head_match)) {
1746 return deleted_entry(index, index, o);
1747 if (ce && !head_deleted) {
1748 if (verify_absent(ce, ERROR_WOULD_LOSE_UNTRACKED_REMOVED, o))
1754 * Added in both, identically.
1756 if (no_anc_exists && head && remote && same(head, remote))
1757 return merged_entry(head, index, o);
1761 /* Below are "no merge" cases, which require that the index be
1762 * up-to-date to avoid the files getting overwritten with
1763 * conflict resolution files.
1766 if (verify_uptodate(index, o))
1770 o->nontrivial_merge = 1;
1772 /* #2, #3, #4, #6, #7, #9, #10, #11. */
1774 if (!head_match || !remote_match) {
1775 for (i = 1; i < o->head_idx; i++) {
1776 if (stages[i] && stages[i] != o->df_conflict_entry) {
1777 keep_entry(stages[i], o);
1785 fprintf(stderr, "read-tree: warning #16 detected\n");
1786 show_stage_entry(stderr, "head ", stages[head_match]);
1787 show_stage_entry(stderr, "remote ", stages[remote_match]);
1790 if (head) { count += keep_entry(head, o); }
1791 if (remote) { count += keep_entry(remote, o); }
1798 * The rule is to "carry forward" what is in the index without losing
1799 * information across a "fast-forward", favoring a successful merge
1800 * over a merge failure when it makes sense. For details of the
1801 * "carry forward" rule, please see <Documentation/git-read-tree.txt>.
1804 int twoway_merge(const struct cache_entry * const *src,
1805 struct unpack_trees_options *o)
1807 const struct cache_entry *current = src[0];
1808 const struct cache_entry *oldtree = src[1];
1809 const struct cache_entry *newtree = src[2];
1811 if (o->merge_size != 2)
1812 return error("Cannot do a twoway merge of %d trees",
1815 if (oldtree == o->df_conflict_entry)
1817 if (newtree == o->df_conflict_entry)
1821 if (current->ce_flags & CE_CONFLICTED) {
1822 if (same(oldtree, newtree) || o->reset) {
1824 return deleted_entry(current, current, o);
1826 return merged_entry(newtree, current, o);
1828 return reject_merge(current, o);
1829 } else if ((!oldtree && !newtree) || /* 4 and 5 */
1830 (!oldtree && newtree &&
1831 same(current, newtree)) || /* 6 and 7 */
1832 (oldtree && newtree &&
1833 same(oldtree, newtree)) || /* 14 and 15 */
1834 (oldtree && newtree &&
1835 !same(oldtree, newtree) && /* 18 and 19 */
1836 same(current, newtree))) {
1837 return keep_entry(current, o);
1838 } else if (oldtree && !newtree && same(current, oldtree)) {
1840 return deleted_entry(oldtree, current, o);
1841 } else if (oldtree && newtree &&
1842 same(current, oldtree) && !same(current, newtree)) {
1844 return merged_entry(newtree, current, o);
1846 return reject_merge(current, o);
1849 if (oldtree && !o->initial_checkout) {
1851 * deletion of the path was staged;
1853 if (same(oldtree, newtree))
1855 return reject_merge(oldtree, o);
1857 return merged_entry(newtree, current, o);
1859 return deleted_entry(oldtree, current, o);
1865 * Keep the index entries at stage0, collapse stage1 but make sure
1866 * stage0 does not have anything there.
1868 int bind_merge(const struct cache_entry * const *src,
1869 struct unpack_trees_options *o)
1871 const struct cache_entry *old = src[0];
1872 const struct cache_entry *a = src[1];
1874 if (o->merge_size != 1)
1875 return error("Cannot do a bind merge of %d trees",
1878 return o->gently ? -1 :
1879 error(ERRORMSG(o, ERROR_BIND_OVERLAP), a->name, old->name);
1881 return keep_entry(old, o);
1883 return merged_entry(a, NULL, o);
1890 * - take the stat information from stage0, take the data from stage1
1892 int oneway_merge(const struct cache_entry * const *src,
1893 struct unpack_trees_options *o)
1895 const struct cache_entry *old = src[0];
1896 const struct cache_entry *a = src[1];
1898 if (o->merge_size != 1)
1899 return error("Cannot do a oneway merge of %d trees",
1902 if (!a || a == o->df_conflict_entry)
1903 return deleted_entry(old, old, o);
1905 if (old && same(old, a)) {
1907 if (o->reset && o->update && !ce_uptodate(old) && !ce_skip_worktree(old)) {
1909 if (lstat(old->name, &st) ||
1910 ie_match_stat(o->src_index, old, &st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE))
1911 update |= CE_UPDATE;
1913 add_entry(o, old, update, 0);
1916 return merged_entry(a, old, o);