1 #define NO_THE_INDEX_COMPATIBILITY_MACROS
6 #include "cache-tree.h"
7 #include "unpack-trees.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 set_porcelain_error_msgs(), 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 static void add_entry(struct unpack_trees_options *o, struct cache_entry *ce,
54 unsigned int set, unsigned int clear)
56 unsigned int size = ce_size(ce);
57 struct cache_entry *new = xmalloc(size);
59 clear |= CE_HASHED | CE_UNHASHED;
61 memcpy(new, ce, size);
63 new->ce_flags = (new->ce_flags & ~clear) | set;
64 add_index_entry(&o->result, new, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE);
68 * add error messages on path <path>
69 * corresponding to the type <e> with the message <msg>
70 * indicating if it should be display in porcelain or not
72 static int add_rejected_path(struct unpack_trees_options *o,
73 enum unpack_trees_error_types e,
76 struct rejected_paths_list *newentry;
77 int porcelain = o && (o)->msgs[e];
79 * simply display the given error message if in plumbing mode
82 o->show_all_errors = 0;
83 if (!o->show_all_errors)
84 return error(ERRORMSG(o, e), path);
87 * Otherwise, insert in a list for future display by
88 * display_error_msgs()
90 newentry = xmalloc(sizeof(struct rejected_paths_list));
91 newentry->path = (char *)path;
92 newentry->next = o->unpack_rejects[e];
93 o->unpack_rejects[e] = newentry;
98 * free all the structures allocated for the error <e>
100 static void free_rejected_paths(struct unpack_trees_options *o,
101 enum unpack_trees_error_types e)
103 while (o->unpack_rejects[e]) {
104 struct rejected_paths_list *del = o->unpack_rejects[e];
105 o->unpack_rejects[e] = o->unpack_rejects[e]->next;
108 free(o->unpack_rejects[e]);
112 * display all the error messages stored in a nice way
114 static void display_error_msgs(struct unpack_trees_options *o)
117 int something_displayed = 0;
118 for (e = 0; e < NB_UNPACK_TREES_ERROR_TYPES; e++) {
119 if (o->unpack_rejects[e]) {
120 struct rejected_paths_list *rp;
121 struct strbuf path = STRBUF_INIT;
122 something_displayed = 1;
123 for (rp = o->unpack_rejects[e]; rp; rp = rp->next)
124 strbuf_addf(&path, "\t%s\n", rp->path);
125 error(ERRORMSG(o, e), path.buf);
126 strbuf_release(&path);
127 free_rejected_paths(o, e);
130 if (something_displayed)
131 printf("Aborting\n");
135 * Unlink the last component and schedule the leading directories for
136 * removal, such that empty directories get removed.
138 static void unlink_entry(struct cache_entry *ce)
140 if (has_symlink_or_noent_leading_path(ce->name, ce_namelen(ce)))
142 if (remove_or_warn(ce->ce_mode, ce->name))
144 schedule_dir_for_removal(ce->name, ce_namelen(ce));
147 static struct checkout state;
148 static int check_updates(struct unpack_trees_options *o)
150 unsigned cnt = 0, total = 0;
151 struct progress *progress = NULL;
152 struct index_state *index = &o->result;
156 if (o->update && o->verbose_update) {
157 for (total = cnt = 0; cnt < index->cache_nr; cnt++) {
158 struct cache_entry *ce = index->cache[cnt];
159 if (ce->ce_flags & (CE_UPDATE | CE_REMOVE | CE_WT_REMOVE))
163 progress = start_progress_delay("Checking out files",
169 git_attr_set_direction(GIT_ATTR_CHECKOUT, &o->result);
170 for (i = 0; i < index->cache_nr; i++) {
171 struct cache_entry *ce = index->cache[i];
173 if (ce->ce_flags & CE_WT_REMOVE) {
174 display_progress(progress, ++cnt);
180 if (ce->ce_flags & CE_REMOVE) {
181 display_progress(progress, ++cnt);
186 remove_marked_cache_entries(&o->result);
187 remove_scheduled_dirs();
189 for (i = 0; i < index->cache_nr; i++) {
190 struct cache_entry *ce = index->cache[i];
192 if (ce->ce_flags & CE_UPDATE) {
193 display_progress(progress, ++cnt);
194 ce->ce_flags &= ~CE_UPDATE;
196 errs |= checkout_entry(ce, &state, NULL);
200 stop_progress(&progress);
202 git_attr_set_direction(GIT_ATTR_CHECKIN, NULL);
206 static int verify_uptodate_sparse(struct cache_entry *ce, struct unpack_trees_options *o);
207 static int verify_absent_sparse(struct cache_entry *ce, enum unpack_trees_error_types, struct unpack_trees_options *o);
209 static int will_have_skip_worktree(const struct cache_entry *ce, struct unpack_trees_options *o)
211 const char *basename;
216 basename = strrchr(ce->name, '/');
217 basename = basename ? basename+1 : ce->name;
218 return excluded_from_list(ce->name, ce_namelen(ce), basename, NULL, o->el) <= 0;
221 static int apply_sparse_checkout(struct cache_entry *ce, struct unpack_trees_options *o)
223 int was_skip_worktree = ce_skip_worktree(ce);
225 if (will_have_skip_worktree(ce, o))
226 ce->ce_flags |= CE_SKIP_WORKTREE;
228 ce->ce_flags &= ~CE_SKIP_WORKTREE;
231 * We only care about files getting into the checkout area
232 * If merge strategies want to remove some, go ahead, this
233 * flag will be removed eventually in unpack_trees() if it's
234 * outside checkout area.
236 if (ce->ce_flags & CE_REMOVE)
239 if (!was_skip_worktree && ce_skip_worktree(ce)) {
241 * If CE_UPDATE is set, verify_uptodate() must be called already
242 * also stat info may have lost after merged_entry() so calling
243 * verify_uptodate() again may fail
245 if (!(ce->ce_flags & CE_UPDATE) && verify_uptodate_sparse(ce, o))
247 ce->ce_flags |= CE_WT_REMOVE;
249 if (was_skip_worktree && !ce_skip_worktree(ce)) {
250 if (verify_absent_sparse(ce, ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN, o))
252 ce->ce_flags |= CE_UPDATE;
257 static inline int call_unpack_fn(struct cache_entry **src, struct unpack_trees_options *o)
259 int ret = o->fn(src, o);
265 static void mark_ce_used(struct cache_entry *ce, struct unpack_trees_options *o)
267 ce->ce_flags |= CE_UNPACKED;
269 if (o->cache_bottom < o->src_index->cache_nr &&
270 o->src_index->cache[o->cache_bottom] == ce) {
271 int bottom = o->cache_bottom;
272 while (bottom < o->src_index->cache_nr &&
273 o->src_index->cache[bottom]->ce_flags & CE_UNPACKED)
275 o->cache_bottom = bottom;
279 static void mark_all_ce_unused(struct index_state *index)
282 for (i = 0; i < index->cache_nr; i++)
283 index->cache[i]->ce_flags &= ~CE_UNPACKED;
286 static int locate_in_src_index(struct cache_entry *ce,
287 struct unpack_trees_options *o)
289 struct index_state *index = o->src_index;
290 int len = ce_namelen(ce);
291 int pos = index_name_pos(index, ce->name, len);
298 * We call unpack_index_entry() with an unmerged cache entry
299 * only in diff-index, and it wants a single callback. Skip
300 * the other unmerged entry with the same name.
302 static void mark_ce_used_same_name(struct cache_entry *ce,
303 struct unpack_trees_options *o)
305 struct index_state *index = o->src_index;
306 int len = ce_namelen(ce);
309 for (pos = locate_in_src_index(ce, o); pos < index->cache_nr; pos++) {
310 struct cache_entry *next = index->cache[pos];
311 if (len != ce_namelen(next) ||
312 memcmp(ce->name, next->name, len))
314 mark_ce_used(next, o);
318 static struct cache_entry *next_cache_entry(struct unpack_trees_options *o)
320 const struct index_state *index = o->src_index;
321 int pos = o->cache_bottom;
323 while (pos < index->cache_nr) {
324 struct cache_entry *ce = index->cache[pos];
325 if (!(ce->ce_flags & CE_UNPACKED))
332 static void add_same_unmerged(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 = index_name_pos(index, ce->name, len);
340 die("programming error in a caller of mark_ce_used_same_name");
341 for (pos = -pos - 1; pos < index->cache_nr; pos++) {
342 struct cache_entry *next = index->cache[pos];
343 if (len != ce_namelen(next) ||
344 memcmp(ce->name, next->name, len))
346 add_entry(o, next, 0, 0);
347 mark_ce_used(next, o);
351 static int unpack_index_entry(struct cache_entry *ce,
352 struct unpack_trees_options *o)
354 struct cache_entry *src[5] = { NULL };
361 if (o->skip_unmerged) {
362 add_entry(o, ce, 0, 0);
366 ret = call_unpack_fn(src, o);
368 mark_ce_used_same_name(ce, o);
372 static int find_cache_pos(struct traverse_info *, const struct name_entry *);
374 static void restore_cache_bottom(struct traverse_info *info, int bottom)
376 struct unpack_trees_options *o = info->data;
378 if (o->diff_index_cached)
380 o->cache_bottom = bottom;
383 static int switch_cache_bottom(struct traverse_info *info)
385 struct unpack_trees_options *o = info->data;
388 if (o->diff_index_cached)
390 ret = o->cache_bottom;
391 pos = find_cache_pos(info->prev, &info->name);
394 o->cache_bottom = -2 - pos;
396 o->cache_bottom = o->src_index->cache_nr;
400 static int traverse_trees_recursive(int n, unsigned long dirmask, unsigned long df_conflicts, struct name_entry *names, struct traverse_info *info)
403 struct tree_desc t[MAX_UNPACK_TREES];
404 struct traverse_info newinfo;
405 struct name_entry *p;
414 newinfo.pathlen += tree_entry_len(p->path, p->sha1) + 1;
415 newinfo.conflicts |= df_conflicts;
417 for (i = 0; i < n; i++, dirmask >>= 1) {
418 const unsigned char *sha1 = NULL;
420 sha1 = names[i].sha1;
421 fill_tree_descriptor(t+i, sha1);
424 bottom = switch_cache_bottom(&newinfo);
425 ret = traverse_trees(n, t, &newinfo);
426 restore_cache_bottom(&newinfo, bottom);
431 * Compare the traverse-path to the cache entry without actually
432 * having to generate the textual representation of the traverse
435 * NOTE! This *only* compares up to the size of the traverse path
436 * itself - the caller needs to do the final check for the cache
437 * entry having more data at the end!
439 static int do_compare_entry(const struct cache_entry *ce, const struct traverse_info *info, const struct name_entry *n)
441 int len, pathlen, ce_len;
445 int cmp = do_compare_entry(ce, info->prev, &info->name);
449 pathlen = info->pathlen;
450 ce_len = ce_namelen(ce);
452 /* If ce_len < pathlen then we must have previously hit "name == directory" entry */
453 if (ce_len < pathlen)
457 ce_name = ce->name + pathlen;
459 len = tree_entry_len(n->path, n->sha1);
460 return df_name_compare(ce_name, ce_len, S_IFREG, n->path, len, n->mode);
463 static int compare_entry(const struct cache_entry *ce, const struct traverse_info *info, const struct name_entry *n)
465 int cmp = do_compare_entry(ce, info, n);
470 * Even if the beginning compared identically, the ce should
471 * compare as bigger than a directory leading up to it!
473 return ce_namelen(ce) > traverse_path_len(info, n);
476 static int ce_in_traverse_path(const struct cache_entry *ce,
477 const struct traverse_info *info)
481 if (do_compare_entry(ce, info->prev, &info->name))
484 * If ce (blob) is the same name as the path (which is a tree
485 * we will be descending into), it won't be inside it.
487 return (info->pathlen < ce_namelen(ce));
490 static struct cache_entry *create_ce_entry(const struct traverse_info *info, const struct name_entry *n, int stage)
492 int len = traverse_path_len(info, n);
493 struct cache_entry *ce = xcalloc(1, cache_entry_size(len));
495 ce->ce_mode = create_ce_mode(n->mode);
496 ce->ce_flags = create_ce_flags(len, stage);
497 hashcpy(ce->sha1, n->sha1);
498 make_traverse_path(ce->name, info, n);
503 static int unpack_nondirectories(int n, unsigned long mask,
504 unsigned long dirmask,
505 struct cache_entry **src,
506 const struct name_entry *names,
507 const struct traverse_info *info)
510 struct unpack_trees_options *o = info->data;
511 unsigned long conflicts;
513 /* Do we have *only* directories? Nothing to do */
514 if (mask == dirmask && !src[0])
517 conflicts = info->conflicts;
520 conflicts |= dirmask;
523 * Ok, we've filled in up to any potential index entry in src[0],
526 for (i = 0; i < n; i++) {
528 unsigned int bit = 1ul << i;
529 if (conflicts & bit) {
530 src[i + o->merge] = o->df_conflict_entry;
537 else if (i + 1 < o->head_idx)
539 else if (i + 1 > o->head_idx)
543 src[i + o->merge] = create_ce_entry(info, names + i, stage);
547 return call_unpack_fn(src, o);
549 for (i = 0; i < n; i++)
550 if (src[i] && src[i] != o->df_conflict_entry)
551 add_entry(o, src[i], 0, 0);
555 static int unpack_failed(struct unpack_trees_options *o, const char *message)
557 discard_index(&o->result);
560 return error("%s", message);
566 /* NEEDSWORK: give this a better name and share with tree-walk.c */
567 static int name_compare(const char *a, int a_len,
568 const char *b, int b_len)
570 int len = (a_len < b_len) ? a_len : b_len;
571 int cmp = memcmp(a, b, len);
574 return (a_len - b_len);
578 * The tree traversal is looking at name p. If we have a matching entry,
579 * return it. If name p is a directory in the index, do not return
580 * anything, as we will want to match it when the traversal descends into
583 static int find_cache_pos(struct traverse_info *info,
584 const struct name_entry *p)
587 struct unpack_trees_options *o = info->data;
588 struct index_state *index = o->src_index;
589 int pfxlen = info->pathlen;
590 int p_len = tree_entry_len(p->path, p->sha1);
592 for (pos = o->cache_bottom; pos < index->cache_nr; pos++) {
593 struct cache_entry *ce = index->cache[pos];
594 const char *ce_name, *ce_slash;
597 if (ce->ce_flags & CE_UNPACKED) {
599 * cache_bottom entry is already unpacked, so
600 * we can never match it; don't check it
603 if (pos == o->cache_bottom)
607 if (!ce_in_traverse_path(ce, info))
609 ce_name = ce->name + pfxlen;
610 ce_slash = strchr(ce_name, '/');
612 ce_len = ce_slash - ce_name;
614 ce_len = ce_namelen(ce) - pfxlen;
615 cmp = name_compare(p->path, p_len, ce_name, ce_len);
617 * Exact match; if we have a directory we need to
618 * delay returning it.
621 return ce_slash ? -2 - pos : pos;
623 continue; /* keep looking */
625 * ce_name sorts after p->path; could it be that we
626 * have files under p->path directory in the index?
627 * E.g. ce_name == "t-i", and p->path == "t"; we may
628 * have "t/a" in the index.
630 if (p_len < ce_len && !memcmp(ce_name, p->path, p_len) &&
631 ce_name[p_len] < '/')
632 continue; /* keep looking */
638 static struct cache_entry *find_cache_entry(struct traverse_info *info,
639 const struct name_entry *p)
641 int pos = find_cache_pos(info, p);
642 struct unpack_trees_options *o = info->data;
645 return o->src_index->cache[pos];
650 static void debug_path(struct traverse_info *info)
653 debug_path(info->prev);
654 if (*info->prev->name.path)
657 printf("%s", info->name.path);
660 static void debug_name_entry(int i, struct name_entry *n)
662 printf("ent#%d %06o %s\n", i,
663 n->path ? n->mode : 0,
664 n->path ? n->path : "(missing)");
667 static void debug_unpack_callback(int n,
669 unsigned long dirmask,
670 struct name_entry *names,
671 struct traverse_info *info)
674 printf("* unpack mask %lu, dirmask %lu, cnt %d ",
678 for (i = 0; i < n; i++)
679 debug_name_entry(i, names + i);
682 static int unpack_callback(int n, unsigned long mask, unsigned long dirmask, struct name_entry *names, struct traverse_info *info)
684 struct cache_entry *src[MAX_UNPACK_TREES + 1] = { NULL, };
685 struct unpack_trees_options *o = info->data;
686 const struct name_entry *p = names;
688 /* Find first entry with a real name (we could use "mask" too) */
693 debug_unpack_callback(n, mask, dirmask, names, info);
695 /* Are we supposed to look at the index too? */
699 struct cache_entry *ce;
701 if (o->diff_index_cached)
702 ce = next_cache_entry(o);
704 ce = find_cache_entry(info, p);
708 cmp = compare_entry(ce, info, p);
710 if (unpack_index_entry(ce, o) < 0)
711 return unpack_failed(o, NULL);
717 * If we skip unmerged index
718 * entries, we'll skip this
719 * entry *and* the tree
720 * entries associated with it!
722 if (o->skip_unmerged) {
723 add_same_unmerged(ce, o);
733 if (unpack_nondirectories(n, mask, dirmask, src, names, info) < 0)
737 if (ce_stage(src[0]))
738 mark_ce_used_same_name(src[0], o);
740 mark_ce_used(src[0], o);
743 /* Now handle any directories.. */
745 unsigned long conflicts = mask & ~dirmask;
752 /* special case: "diff-index --cached" looking at a tree */
753 if (o->diff_index_cached &&
754 n == 1 && dirmask == 1 && S_ISDIR(names->mode)) {
756 matches = cache_tree_matches_traversal(o->src_index->cache_tree,
759 * Everything under the name matches; skip the
760 * entire hierarchy. diff_index_cached codepath
761 * special cases D/F conflicts in such a way that
762 * it does not do any look-ahead, so this is safe.
765 o->cache_bottom += matches;
770 if (traverse_trees_recursive(n, dirmask, conflicts,
780 * N-way merge "len" trees. Returns 0 on success, -1 on failure to manipulate the
781 * resulting index, -2 on failure to reflect the changes to the work tree.
783 int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options *o)
786 static struct cache_entry *dfc;
787 struct exclude_list el;
789 if (len > MAX_UNPACK_TREES)
790 die("unpack_trees takes at most %d trees", MAX_UNPACK_TREES);
791 memset(&state, 0, sizeof(state));
795 state.refresh_cache = 1;
797 memset(&el, 0, sizeof(el));
798 if (!core_apply_sparse_checkout || !o->update)
799 o->skip_sparse_checkout = 1;
800 if (!o->skip_sparse_checkout) {
801 if (add_excludes_from_file_to_list(git_path("info/sparse-checkout"), "", 0, NULL, &el, 0) < 0)
802 o->skip_sparse_checkout = 1;
807 memset(&o->result, 0, sizeof(o->result));
808 o->result.initialized = 1;
809 o->result.timestamp.sec = o->src_index->timestamp.sec;
810 o->result.timestamp.nsec = o->src_index->timestamp.nsec;
812 mark_all_ce_unused(o->src_index);
815 dfc = xcalloc(1, cache_entry_size(0));
816 o->df_conflict_entry = dfc;
819 const char *prefix = o->prefix ? o->prefix : "";
820 struct traverse_info info;
822 setup_traverse_info(&info, prefix);
823 info.fn = unpack_callback;
825 info.show_all_errors = o->show_all_errors;
829 * Unpack existing index entries that sort before the
830 * prefix the tree is spliced into. Note that o->merge
831 * is always true in this case.
834 struct cache_entry *ce = next_cache_entry(o);
837 if (ce_in_traverse_path(ce, &info))
839 if (unpack_index_entry(ce, o) < 0)
844 if (traverse_trees(len, t, &info) < 0)
848 /* Any left-over entries in the index? */
851 struct cache_entry *ce = next_cache_entry(o);
854 if (unpack_index_entry(ce, o) < 0)
858 mark_all_ce_unused(o->src_index);
860 if (o->trivial_merges_only && o->nontrivial_merge) {
861 ret = unpack_failed(o, "Merge requires file-level merging");
865 if (!o->skip_sparse_checkout) {
866 int empty_worktree = 1;
867 for (i = 0;i < o->result.cache_nr;i++) {
868 struct cache_entry *ce = o->result.cache[i];
870 if (apply_sparse_checkout(ce, o)) {
875 * Merge strategies may set CE_UPDATE|CE_REMOVE outside checkout
876 * area as a result of ce_skip_worktree() shortcuts in
877 * verify_absent() and verify_uptodate(). Clear them.
879 if (ce_skip_worktree(ce))
880 ce->ce_flags &= ~(CE_UPDATE | CE_REMOVE);
885 if (o->result.cache_nr && empty_worktree) {
886 ret = unpack_failed(o, "Sparse checkout leaves no entry on working directory");
892 ret = check_updates(o) ? (-2) : 0;
894 *o->dst_index = o->result;
897 for (i = 0;i < el.nr;i++)
898 free(el.excludes[i]);
905 if (o->show_all_errors)
906 display_error_msgs(o);
907 mark_all_ce_unused(o->src_index);
908 ret = unpack_failed(o, NULL);
912 /* Here come the merge functions */
914 static int reject_merge(struct cache_entry *ce, struct unpack_trees_options *o)
916 return add_rejected_path(o, ERROR_WOULD_OVERWRITE, ce->name);
919 static int same(struct cache_entry *a, struct cache_entry *b)
925 if ((a->ce_flags | b->ce_flags) & CE_CONFLICTED)
927 return a->ce_mode == b->ce_mode &&
928 !hashcmp(a->sha1, b->sha1);
933 * When a CE gets turned into an unmerged entry, we
934 * want it to be up-to-date
936 static int verify_uptodate_1(struct cache_entry *ce,
937 struct unpack_trees_options *o,
938 enum unpack_trees_error_types error_type)
942 if (o->index_only || (!((ce->ce_flags & CE_VALID) || ce_skip_worktree(ce)) && (o->reset || ce_uptodate(ce))))
945 if (!lstat(ce->name, &st)) {
946 unsigned changed = ie_match_stat(o->src_index, ce, &st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE);
950 * NEEDSWORK: the current default policy is to allow
951 * submodule to be out of sync wrt the supermodule
952 * index. This needs to be tightened later for
953 * submodules that are marked to be automatically
956 if (S_ISGITLINK(ce->ce_mode))
962 return o->gently ? -1 :
963 add_rejected_path(o, error_type, ce->name);
966 static int verify_uptodate(struct cache_entry *ce,
967 struct unpack_trees_options *o)
969 if (!o->skip_sparse_checkout && will_have_skip_worktree(ce, o))
971 return verify_uptodate_1(ce, o, ERROR_NOT_UPTODATE_FILE);
974 static int verify_uptodate_sparse(struct cache_entry *ce,
975 struct unpack_trees_options *o)
977 return verify_uptodate_1(ce, o, ERROR_SPARSE_NOT_UPTODATE_FILE);
980 static void invalidate_ce_path(struct cache_entry *ce, struct unpack_trees_options *o)
983 cache_tree_invalidate_path(o->src_index->cache_tree, ce->name);
987 * Check that checking out ce->sha1 in subdir ce->name is not
988 * going to overwrite any working files.
990 * Currently, git does not checkout subprojects during a superproject
991 * checkout, so it is not going to overwrite anything.
993 static int verify_clean_submodule(struct cache_entry *ce,
994 enum unpack_trees_error_types error_type,
995 struct unpack_trees_options *o)
1000 static int verify_clean_subdirectory(struct cache_entry *ce,
1001 enum unpack_trees_error_types error_type,
1002 struct unpack_trees_options *o)
1005 * we are about to extract "ce->name"; we would not want to lose
1006 * anything in the existing directory there.
1010 struct dir_struct d;
1013 unsigned char sha1[20];
1015 if (S_ISGITLINK(ce->ce_mode) &&
1016 resolve_gitlink_ref(ce->name, "HEAD", sha1) == 0) {
1017 /* If we are not going to update the submodule, then
1020 if (!hashcmp(sha1, ce->sha1))
1022 return verify_clean_submodule(ce, error_type, o);
1026 * First let's make sure we do not have a local modification
1027 * in that directory.
1029 namelen = strlen(ce->name);
1030 for (i = locate_in_src_index(ce, o);
1031 i < o->src_index->cache_nr;
1033 struct cache_entry *ce2 = o->src_index->cache[i];
1034 int len = ce_namelen(ce2);
1035 if (len < namelen ||
1036 strncmp(ce->name, ce2->name, namelen) ||
1037 ce2->name[namelen] != '/')
1040 * ce2->name is an entry in the subdirectory to be
1043 if (!ce_stage(ce2)) {
1044 if (verify_uptodate(ce2, o))
1046 add_entry(o, ce2, CE_REMOVE, 0);
1047 mark_ce_used(ce2, o);
1053 * Then we need to make sure that we do not lose a locally
1054 * present file that is not ignored.
1056 pathbuf = xmalloc(namelen + 2);
1057 memcpy(pathbuf, ce->name, namelen);
1058 strcpy(pathbuf+namelen, "/");
1060 memset(&d, 0, sizeof(d));
1062 d.exclude_per_dir = o->dir->exclude_per_dir;
1063 i = read_directory(&d, pathbuf, namelen+1, NULL);
1065 return o->gently ? -1 :
1066 add_rejected_path(o, ERROR_NOT_UPTODATE_DIR, ce->name);
1072 * This gets called when there was no index entry for the tree entry 'dst',
1073 * but we found a file in the working tree that 'lstat()' said was fine,
1074 * and we're on a case-insensitive filesystem.
1076 * See if we can find a case-insensitive match in the index that also
1077 * matches the stat information, and assume it's that other file!
1079 static int icase_exists(struct unpack_trees_options *o, struct cache_entry *dst, struct stat *st)
1081 struct cache_entry *src;
1083 src = index_name_exists(o->src_index, dst->name, ce_namelen(dst), 1);
1084 return src && !ie_match_stat(o->src_index, src, st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE);
1088 * We do not want to remove or overwrite a working tree file that
1089 * is not tracked, unless it is ignored.
1091 static int verify_absent_1(struct cache_entry *ce,
1092 enum unpack_trees_error_types error_type,
1093 struct unpack_trees_options *o)
1097 if (o->index_only || o->reset || !o->update)
1100 if (has_symlink_or_noent_leading_path(ce->name, ce_namelen(ce)))
1103 if (!lstat(ce->name, &st)) {
1104 int dtype = ce_to_dtype(ce);
1105 struct cache_entry *result;
1108 * It may be that the 'lstat()' succeeded even though
1109 * target 'ce' was absent, because there is an old
1110 * entry that is different only in case..
1112 * Ignore that lstat() if it matches.
1114 if (ignore_case && icase_exists(o, ce, &st))
1117 if (o->dir && excluded(o->dir, ce->name, &dtype))
1119 * ce->name is explicitly excluded, so it is Ok to
1123 if (S_ISDIR(st.st_mode)) {
1125 * We are checking out path "foo" and
1126 * found "foo/." in the working tree.
1127 * This is tricky -- if we have modified
1128 * files that are in "foo/" we would lose
1131 if (verify_clean_subdirectory(ce, error_type, o) < 0)
1137 * The previous round may already have decided to
1138 * delete this path, which is in a subdirectory that
1139 * is being replaced with a blob.
1141 result = index_name_exists(&o->result, ce->name, ce_namelen(ce), 0);
1143 if (result->ce_flags & CE_REMOVE)
1147 return o->gently ? -1 :
1148 add_rejected_path(o, error_type, ce->name);
1152 static int verify_absent(struct cache_entry *ce,
1153 enum unpack_trees_error_types error_type,
1154 struct unpack_trees_options *o)
1156 if (!o->skip_sparse_checkout && will_have_skip_worktree(ce, o))
1158 return verify_absent_1(ce, error_type, o);
1161 static int verify_absent_sparse(struct cache_entry *ce,
1162 enum unpack_trees_error_types error_type,
1163 struct unpack_trees_options *o)
1165 enum unpack_trees_error_types orphaned_error = error_type;
1166 if (orphaned_error == ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN)
1167 orphaned_error = ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN;
1169 return verify_absent_1(ce, orphaned_error, o);
1172 static int merged_entry(struct cache_entry *merge, struct cache_entry *old,
1173 struct unpack_trees_options *o)
1175 int update = CE_UPDATE;
1178 if (verify_absent(merge, ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN, o))
1180 invalidate_ce_path(merge, o);
1181 } else if (!(old->ce_flags & CE_CONFLICTED)) {
1183 * See if we can re-use the old CE directly?
1184 * That way we get the uptodate stat info.
1186 * This also removes the UPDATE flag on a match; otherwise
1187 * we will end up overwriting local changes in the work tree.
1189 if (same(old, merge)) {
1190 copy_cache_entry(merge, old);
1193 if (verify_uptodate(old, o))
1195 if (ce_skip_worktree(old))
1196 update |= CE_SKIP_WORKTREE;
1197 invalidate_ce_path(old, o);
1201 * Previously unmerged entry left as an existence
1202 * marker by read_index_unmerged();
1204 invalidate_ce_path(old, o);
1207 add_entry(o, merge, update, CE_STAGEMASK);
1211 static int deleted_entry(struct cache_entry *ce, struct cache_entry *old,
1212 struct unpack_trees_options *o)
1214 /* Did it exist in the index? */
1216 if (verify_absent(ce, ERROR_WOULD_LOSE_UNTRACKED_REMOVED, o))
1220 if (!(old->ce_flags & CE_CONFLICTED) && verify_uptodate(old, o))
1222 add_entry(o, ce, CE_REMOVE, 0);
1223 invalidate_ce_path(ce, o);
1227 static int keep_entry(struct cache_entry *ce, struct unpack_trees_options *o)
1229 add_entry(o, ce, 0, 0);
1234 static void show_stage_entry(FILE *o,
1235 const char *label, const struct cache_entry *ce)
1238 fprintf(o, "%s (missing)\n", label);
1240 fprintf(o, "%s%06o %s %d\t%s\n",
1243 sha1_to_hex(ce->sha1),
1249 int threeway_merge(struct cache_entry **stages, struct unpack_trees_options *o)
1251 struct cache_entry *index;
1252 struct cache_entry *head;
1253 struct cache_entry *remote = stages[o->head_idx + 1];
1256 int remote_match = 0;
1258 int df_conflict_head = 0;
1259 int df_conflict_remote = 0;
1261 int any_anc_missing = 0;
1262 int no_anc_exists = 1;
1265 for (i = 1; i < o->head_idx; i++) {
1266 if (!stages[i] || stages[i] == o->df_conflict_entry)
1267 any_anc_missing = 1;
1273 head = stages[o->head_idx];
1275 if (head == o->df_conflict_entry) {
1276 df_conflict_head = 1;
1280 if (remote == o->df_conflict_entry) {
1281 df_conflict_remote = 1;
1286 * First, if there's a #16 situation, note that to prevent #13
1289 if (!same(remote, head)) {
1290 for (i = 1; i < o->head_idx; i++) {
1291 if (same(stages[i], head)) {
1294 if (same(stages[i], remote)) {
1301 * We start with cases where the index is allowed to match
1302 * something other than the head: #14(ALT) and #2ALT, where it
1303 * is permitted to match the result instead.
1305 /* #14, #14ALT, #2ALT */
1306 if (remote && !df_conflict_head && head_match && !remote_match) {
1307 if (index && !same(index, remote) && !same(index, head))
1308 return o->gently ? -1 : reject_merge(index, o);
1309 return merged_entry(remote, index, o);
1312 * If we have an entry in the index cache, then we want to
1313 * make sure that it matches head.
1315 if (index && !same(index, head))
1316 return o->gently ? -1 : reject_merge(index, o);
1320 if (same(head, remote))
1321 return merged_entry(head, index, o);
1323 if (!df_conflict_remote && remote_match && !head_match)
1324 return merged_entry(head, index, o);
1328 if (!head && !remote && any_anc_missing)
1332 * Under the "aggressive" rule, we resolve mostly trivial
1333 * cases that we historically had git-merge-one-file resolve.
1335 if (o->aggressive) {
1336 int head_deleted = !head;
1337 int remote_deleted = !remote;
1338 struct cache_entry *ce = NULL;
1347 for (i = 1; i < o->head_idx; i++) {
1348 if (stages[i] && stages[i] != o->df_conflict_entry) {
1357 * Deleted in one and unchanged in the other.
1359 if ((head_deleted && remote_deleted) ||
1360 (head_deleted && remote && remote_match) ||
1361 (remote_deleted && head && head_match)) {
1363 return deleted_entry(index, index, o);
1364 if (ce && !head_deleted) {
1365 if (verify_absent(ce, ERROR_WOULD_LOSE_UNTRACKED_REMOVED, o))
1371 * Added in both, identically.
1373 if (no_anc_exists && head && remote && same(head, remote))
1374 return merged_entry(head, index, o);
1378 /* Below are "no merge" cases, which require that the index be
1379 * up-to-date to avoid the files getting overwritten with
1380 * conflict resolution files.
1383 if (verify_uptodate(index, o))
1387 o->nontrivial_merge = 1;
1389 /* #2, #3, #4, #6, #7, #9, #10, #11. */
1391 if (!head_match || !remote_match) {
1392 for (i = 1; i < o->head_idx; i++) {
1393 if (stages[i] && stages[i] != o->df_conflict_entry) {
1394 keep_entry(stages[i], o);
1402 fprintf(stderr, "read-tree: warning #16 detected\n");
1403 show_stage_entry(stderr, "head ", stages[head_match]);
1404 show_stage_entry(stderr, "remote ", stages[remote_match]);
1407 if (head) { count += keep_entry(head, o); }
1408 if (remote) { count += keep_entry(remote, o); }
1415 * The rule is to "carry forward" what is in the index without losing
1416 * information across a "fast-forward", favoring a successful merge
1417 * over a merge failure when it makes sense. For details of the
1418 * "carry forward" rule, please see <Documentation/git-read-tree.txt>.
1421 int twoway_merge(struct cache_entry **src, struct unpack_trees_options *o)
1423 struct cache_entry *current = src[0];
1424 struct cache_entry *oldtree = src[1];
1425 struct cache_entry *newtree = src[2];
1427 if (o->merge_size != 2)
1428 return error("Cannot do a twoway merge of %d trees",
1431 if (oldtree == o->df_conflict_entry)
1433 if (newtree == o->df_conflict_entry)
1437 if ((!oldtree && !newtree) || /* 4 and 5 */
1438 (!oldtree && newtree &&
1439 same(current, newtree)) || /* 6 and 7 */
1440 (oldtree && newtree &&
1441 same(oldtree, newtree)) || /* 14 and 15 */
1442 (oldtree && newtree &&
1443 !same(oldtree, newtree) && /* 18 and 19 */
1444 same(current, newtree))) {
1445 return keep_entry(current, o);
1447 else if (oldtree && !newtree && same(current, oldtree)) {
1449 return deleted_entry(oldtree, current, o);
1451 else if (oldtree && newtree &&
1452 same(current, oldtree) && !same(current, newtree)) {
1454 return merged_entry(newtree, current, o);
1457 /* all other failures */
1459 return o->gently ? -1 : reject_merge(oldtree, o);
1461 return o->gently ? -1 : reject_merge(current, o);
1463 return o->gently ? -1 : reject_merge(newtree, o);
1468 if (oldtree && !o->initial_checkout) {
1470 * deletion of the path was staged;
1472 if (same(oldtree, newtree))
1474 return reject_merge(oldtree, o);
1476 return merged_entry(newtree, current, o);
1478 return deleted_entry(oldtree, current, o);
1484 * Keep the index entries at stage0, collapse stage1 but make sure
1485 * stage0 does not have anything there.
1487 int bind_merge(struct cache_entry **src,
1488 struct unpack_trees_options *o)
1490 struct cache_entry *old = src[0];
1491 struct cache_entry *a = src[1];
1493 if (o->merge_size != 1)
1494 return error("Cannot do a bind merge of %d trees\n",
1497 return o->gently ? -1 :
1498 error(ERRORMSG(o, ERROR_BIND_OVERLAP), a->name, old->name);
1500 return keep_entry(old, o);
1502 return merged_entry(a, NULL, o);
1509 * - take the stat information from stage0, take the data from stage1
1511 int oneway_merge(struct cache_entry **src, struct unpack_trees_options *o)
1513 struct cache_entry *old = src[0];
1514 struct cache_entry *a = src[1];
1516 if (o->merge_size != 1)
1517 return error("Cannot do a oneway merge of %d trees",
1520 if (!a || a == o->df_conflict_entry)
1521 return deleted_entry(old, old, o);
1523 if (old && same(old, a)) {
1525 if (o->reset && !ce_uptodate(old) && !ce_skip_worktree(old)) {
1527 if (lstat(old->name, &st) ||
1528 ie_match_stat(o->src_index, old, &st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE))
1529 update |= CE_UPDATE;
1531 add_entry(o, old, update, 0);
1534 return merged_entry(a, old, o);