Merge branch 'pw/worktree-list-with-z'
[alt-git.git] / unpack-trees.c
blob7f528d35cc263ad2d87444d2b9c0081ba6e1da74
1 #include "cache.h"
2 #include "strvec.h"
3 #include "repository.h"
4 #include "config.h"
5 #include "dir.h"
6 #include "tree.h"
7 #include "tree-walk.h"
8 #include "cache-tree.h"
9 #include "unpack-trees.h"
10 #include "progress.h"
11 #include "refs.h"
12 #include "attr.h"
13 #include "split-index.h"
14 #include "submodule.h"
15 #include "submodule-config.h"
16 #include "fsmonitor.h"
17 #include "object-store.h"
18 #include "promisor-remote.h"
19 #include "entry.h"
20 #include "parallel-checkout.h"
23 * Error messages expected by scripts out of plumbing commands such as
24 * read-tree. Non-scripted Porcelain is not required to use these messages
25 * and in fact are encouraged to reword them to better suit their particular
26 * situation better. See how "git checkout" and "git merge" replaces
27 * them using setup_unpack_trees_porcelain(), for example.
29 static const char *unpack_plumbing_errors[NB_UNPACK_TREES_WARNING_TYPES] = {
30 /* ERROR_WOULD_OVERWRITE */
31 "Entry '%s' would be overwritten by merge. Cannot merge.",
33 /* ERROR_NOT_UPTODATE_FILE */
34 "Entry '%s' not uptodate. Cannot merge.",
36 /* ERROR_NOT_UPTODATE_DIR */
37 "Updating '%s' would lose untracked files in it",
39 /* ERROR_CWD_IN_THE_WAY */
40 "Refusing to remove '%s' since it is the current working directory.",
42 /* ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN */
43 "Untracked working tree file '%s' would be overwritten by merge.",
45 /* ERROR_WOULD_LOSE_UNTRACKED_REMOVED */
46 "Untracked working tree file '%s' would be removed by merge.",
48 /* ERROR_BIND_OVERLAP */
49 "Entry '%s' overlaps with '%s'. Cannot bind.",
51 /* ERROR_WOULD_LOSE_SUBMODULE */
52 "Submodule '%s' cannot checkout new HEAD.",
54 /* NB_UNPACK_TREES_ERROR_TYPES; just a meta value */
55 "",
57 /* WARNING_SPARSE_NOT_UPTODATE_FILE */
58 "Path '%s' not uptodate; will not remove from working tree.",
60 /* WARNING_SPARSE_UNMERGED_FILE */
61 "Path '%s' unmerged; will not remove from working tree.",
63 /* WARNING_SPARSE_ORPHANED_NOT_OVERWRITTEN */
64 "Path '%s' already present; will not overwrite with sparse update.",
67 #define ERRORMSG(o,type) \
68 ( ((o) && (o)->msgs[(type)]) \
69 ? ((o)->msgs[(type)]) \
70 : (unpack_plumbing_errors[(type)]) )
72 static const char *super_prefixed(const char *path)
75 * It is necessary and sufficient to have two static buffers
76 * here, as the return value of this function is fed to
77 * error() using the unpack_*_errors[] templates we see above.
79 static struct strbuf buf[2] = {STRBUF_INIT, STRBUF_INIT};
80 static int super_prefix_len = -1;
81 static unsigned idx = ARRAY_SIZE(buf) - 1;
83 if (super_prefix_len < 0) {
84 const char *super_prefix = get_super_prefix();
85 if (!super_prefix) {
86 super_prefix_len = 0;
87 } else {
88 int i;
89 for (i = 0; i < ARRAY_SIZE(buf); i++)
90 strbuf_addstr(&buf[i], super_prefix);
91 super_prefix_len = buf[0].len;
95 if (!super_prefix_len)
96 return path;
98 if (++idx >= ARRAY_SIZE(buf))
99 idx = 0;
101 strbuf_setlen(&buf[idx], super_prefix_len);
102 strbuf_addstr(&buf[idx], path);
104 return buf[idx].buf;
107 void setup_unpack_trees_porcelain(struct unpack_trees_options *opts,
108 const char *cmd)
110 int i;
111 const char **msgs = opts->msgs;
112 const char *msg;
114 strvec_init(&opts->msgs_to_free);
116 if (!strcmp(cmd, "checkout"))
117 msg = advice_enabled(ADVICE_COMMIT_BEFORE_MERGE)
118 ? _("Your local changes to the following files would be overwritten by checkout:\n%%s"
119 "Please commit your changes or stash them before you switch branches.")
120 : _("Your local changes to the following files would be overwritten by checkout:\n%%s");
121 else if (!strcmp(cmd, "merge"))
122 msg = advice_enabled(ADVICE_COMMIT_BEFORE_MERGE)
123 ? _("Your local changes to the following files would be overwritten by merge:\n%%s"
124 "Please commit your changes or stash them before you merge.")
125 : _("Your local changes to the following files would be overwritten by merge:\n%%s");
126 else
127 msg = advice_enabled(ADVICE_COMMIT_BEFORE_MERGE)
128 ? _("Your local changes to the following files would be overwritten by %s:\n%%s"
129 "Please commit your changes or stash them before you %s.")
130 : _("Your local changes to the following files would be overwritten by %s:\n%%s");
131 msgs[ERROR_WOULD_OVERWRITE] = msgs[ERROR_NOT_UPTODATE_FILE] =
132 strvec_pushf(&opts->msgs_to_free, msg, cmd, cmd);
134 msgs[ERROR_NOT_UPTODATE_DIR] =
135 _("Updating the following directories would lose untracked files in them:\n%s");
137 msgs[ERROR_CWD_IN_THE_WAY] =
138 _("Refusing to remove the current working directory:\n%s");
140 if (!strcmp(cmd, "checkout"))
141 msg = advice_enabled(ADVICE_COMMIT_BEFORE_MERGE)
142 ? _("The following untracked working tree files would be removed by checkout:\n%%s"
143 "Please move or remove them before you switch branches.")
144 : _("The following untracked working tree files would be removed by checkout:\n%%s");
145 else if (!strcmp(cmd, "merge"))
146 msg = advice_enabled(ADVICE_COMMIT_BEFORE_MERGE)
147 ? _("The following untracked working tree files would be removed by merge:\n%%s"
148 "Please move or remove them before you merge.")
149 : _("The following untracked working tree files would be removed by merge:\n%%s");
150 else
151 msg = advice_enabled(ADVICE_COMMIT_BEFORE_MERGE)
152 ? _("The following untracked working tree files would be removed by %s:\n%%s"
153 "Please move or remove them before you %s.")
154 : _("The following untracked working tree files would be removed by %s:\n%%s");
155 msgs[ERROR_WOULD_LOSE_UNTRACKED_REMOVED] =
156 strvec_pushf(&opts->msgs_to_free, msg, cmd, cmd);
158 if (!strcmp(cmd, "checkout"))
159 msg = advice_enabled(ADVICE_COMMIT_BEFORE_MERGE)
160 ? _("The following untracked working tree files would be overwritten by checkout:\n%%s"
161 "Please move or remove them before you switch branches.")
162 : _("The following untracked working tree files would be overwritten by checkout:\n%%s");
163 else if (!strcmp(cmd, "merge"))
164 msg = advice_enabled(ADVICE_COMMIT_BEFORE_MERGE)
165 ? _("The following untracked working tree files would be overwritten by merge:\n%%s"
166 "Please move or remove them before you merge.")
167 : _("The following untracked working tree files would be overwritten by merge:\n%%s");
168 else
169 msg = advice_enabled(ADVICE_COMMIT_BEFORE_MERGE)
170 ? _("The following untracked working tree files would be overwritten by %s:\n%%s"
171 "Please move or remove them before you %s.")
172 : _("The following untracked working tree files would be overwritten by %s:\n%%s");
173 msgs[ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN] =
174 strvec_pushf(&opts->msgs_to_free, msg, cmd, cmd);
177 * Special case: ERROR_BIND_OVERLAP refers to a pair of paths, we
178 * cannot easily display it as a list.
180 msgs[ERROR_BIND_OVERLAP] = _("Entry '%s' overlaps with '%s'. Cannot bind.");
182 msgs[ERROR_WOULD_LOSE_SUBMODULE] =
183 _("Cannot update submodule:\n%s");
185 msgs[WARNING_SPARSE_NOT_UPTODATE_FILE] =
186 _("The following paths are not up to date and were left despite sparse patterns:\n%s");
187 msgs[WARNING_SPARSE_UNMERGED_FILE] =
188 _("The following paths are unmerged and were left despite sparse patterns:\n%s");
189 msgs[WARNING_SPARSE_ORPHANED_NOT_OVERWRITTEN] =
190 _("The following paths were already present and thus not updated despite sparse patterns:\n%s");
192 opts->show_all_errors = 1;
193 /* rejected paths may not have a static buffer */
194 for (i = 0; i < ARRAY_SIZE(opts->unpack_rejects); i++)
195 opts->unpack_rejects[i].strdup_strings = 1;
198 void clear_unpack_trees_porcelain(struct unpack_trees_options *opts)
200 strvec_clear(&opts->msgs_to_free);
201 memset(opts->msgs, 0, sizeof(opts->msgs));
204 static int do_add_entry(struct unpack_trees_options *o, struct cache_entry *ce,
205 unsigned int set, unsigned int clear)
207 clear |= CE_HASHED;
209 if (set & CE_REMOVE)
210 set |= CE_WT_REMOVE;
212 ce->ce_flags = (ce->ce_flags & ~clear) | set;
213 return add_index_entry(&o->result, ce,
214 ADD_CACHE_OK_TO_ADD | ADD_CACHE_OK_TO_REPLACE);
217 static void add_entry(struct unpack_trees_options *o,
218 const struct cache_entry *ce,
219 unsigned int set, unsigned int clear)
221 do_add_entry(o, dup_cache_entry(ce, &o->result), set, clear);
225 * add error messages on path <path>
226 * corresponding to the type <e> with the message <msg>
227 * indicating if it should be display in porcelain or not
229 static int add_rejected_path(struct unpack_trees_options *o,
230 enum unpack_trees_error_types e,
231 const char *path)
233 if (o->quiet)
234 return -1;
236 if (!o->show_all_errors)
237 return error(ERRORMSG(o, e), super_prefixed(path));
240 * Otherwise, insert in a list for future display by
241 * display_(error|warning)_msgs()
243 string_list_append(&o->unpack_rejects[e], path);
244 return -1;
248 * display all the error messages stored in a nice way
250 static void display_error_msgs(struct unpack_trees_options *o)
252 int e;
253 unsigned error_displayed = 0;
254 for (e = 0; e < NB_UNPACK_TREES_ERROR_TYPES; e++) {
255 struct string_list *rejects = &o->unpack_rejects[e];
257 if (rejects->nr > 0) {
258 int i;
259 struct strbuf path = STRBUF_INIT;
261 error_displayed = 1;
262 for (i = 0; i < rejects->nr; i++)
263 strbuf_addf(&path, "\t%s\n", rejects->items[i].string);
264 error(ERRORMSG(o, e), super_prefixed(path.buf));
265 strbuf_release(&path);
267 string_list_clear(rejects, 0);
269 if (error_displayed)
270 fprintf(stderr, _("Aborting\n"));
274 * display all the warning messages stored in a nice way
276 static void display_warning_msgs(struct unpack_trees_options *o)
278 int e;
279 unsigned warning_displayed = 0;
280 for (e = NB_UNPACK_TREES_ERROR_TYPES + 1;
281 e < NB_UNPACK_TREES_WARNING_TYPES; e++) {
282 struct string_list *rejects = &o->unpack_rejects[e];
284 if (rejects->nr > 0) {
285 int i;
286 struct strbuf path = STRBUF_INIT;
288 warning_displayed = 1;
289 for (i = 0; i < rejects->nr; i++)
290 strbuf_addf(&path, "\t%s\n", rejects->items[i].string);
291 warning(ERRORMSG(o, e), super_prefixed(path.buf));
292 strbuf_release(&path);
294 string_list_clear(rejects, 0);
296 if (warning_displayed)
297 fprintf(stderr, _("After fixing the above paths, you may want to run `git sparse-checkout reapply`.\n"));
299 static int check_submodule_move_head(const struct cache_entry *ce,
300 const char *old_id,
301 const char *new_id,
302 struct unpack_trees_options *o)
304 unsigned flags = SUBMODULE_MOVE_HEAD_DRY_RUN;
305 const struct submodule *sub = submodule_from_ce(ce);
307 if (!sub)
308 return 0;
310 if (o->reset)
311 flags |= SUBMODULE_MOVE_HEAD_FORCE;
313 if (submodule_move_head(ce->name, old_id, new_id, flags))
314 return add_rejected_path(o, ERROR_WOULD_LOSE_SUBMODULE, ce->name);
315 return 0;
319 * Perform the loading of the repository's gitmodules file. This function is
320 * used by 'check_update()' to perform loading of the gitmodules file in two
321 * different situations:
322 * (1) before removing entries from the working tree if the gitmodules file has
323 * been marked for removal. This situation is specified by 'state' == NULL.
324 * (2) before checking out entries to the working tree if the gitmodules file
325 * has been marked for update. This situation is specified by 'state' != NULL.
327 static void load_gitmodules_file(struct index_state *index,
328 struct checkout *state)
330 int pos = index_name_pos(index, GITMODULES_FILE, strlen(GITMODULES_FILE));
332 if (pos >= 0) {
333 struct cache_entry *ce = index->cache[pos];
334 if (!state && ce->ce_flags & CE_WT_REMOVE) {
335 repo_read_gitmodules(the_repository, 0);
336 } else if (state && (ce->ce_flags & CE_UPDATE)) {
337 submodule_free(the_repository);
338 checkout_entry(ce, state, NULL, NULL);
339 repo_read_gitmodules(the_repository, 0);
344 static struct progress *get_progress(struct unpack_trees_options *o,
345 struct index_state *index)
347 unsigned cnt = 0, total = 0;
349 if (!o->update || !o->verbose_update)
350 return NULL;
352 for (; cnt < index->cache_nr; cnt++) {
353 const struct cache_entry *ce = index->cache[cnt];
354 if (ce->ce_flags & (CE_UPDATE | CE_WT_REMOVE))
355 total++;
358 return start_delayed_progress(_("Updating files"), total);
361 static void setup_collided_checkout_detection(struct checkout *state,
362 struct index_state *index)
364 int i;
366 state->clone = 1;
367 for (i = 0; i < index->cache_nr; i++)
368 index->cache[i]->ce_flags &= ~CE_MATCHED;
371 static void report_collided_checkout(struct index_state *index)
373 struct string_list list = STRING_LIST_INIT_NODUP;
374 int i;
376 for (i = 0; i < index->cache_nr; i++) {
377 struct cache_entry *ce = index->cache[i];
379 if (!(ce->ce_flags & CE_MATCHED))
380 continue;
382 string_list_append(&list, ce->name);
383 ce->ce_flags &= ~CE_MATCHED;
386 list.cmp = fspathcmp;
387 string_list_sort(&list);
389 if (list.nr) {
390 warning(_("the following paths have collided (e.g. case-sensitive paths\n"
391 "on a case-insensitive filesystem) and only one from the same\n"
392 "colliding group is in the working tree:\n"));
394 for (i = 0; i < list.nr; i++)
395 fprintf(stderr, " '%s'\n", list.items[i].string);
398 string_list_clear(&list, 0);
401 static int must_checkout(const struct cache_entry *ce)
403 return ce->ce_flags & CE_UPDATE;
406 static int check_updates(struct unpack_trees_options *o,
407 struct index_state *index)
409 unsigned cnt = 0;
410 int errs = 0;
411 struct progress *progress;
412 struct checkout state = CHECKOUT_INIT;
413 int i, pc_workers, pc_threshold;
415 trace_performance_enter();
416 state.force = 1;
417 state.quiet = 1;
418 state.refresh_cache = 1;
419 state.istate = index;
420 clone_checkout_metadata(&state.meta, &o->meta, NULL);
422 if (!o->update || o->dry_run) {
423 remove_marked_cache_entries(index, 0);
424 trace_performance_leave("check_updates");
425 return 0;
428 if (o->clone)
429 setup_collided_checkout_detection(&state, index);
431 progress = get_progress(o, index);
433 /* Start with clean cache to avoid using any possibly outdated info. */
434 invalidate_lstat_cache();
436 git_attr_set_direction(GIT_ATTR_CHECKOUT);
438 if (should_update_submodules())
439 load_gitmodules_file(index, NULL);
441 for (i = 0; i < index->cache_nr; i++) {
442 const struct cache_entry *ce = index->cache[i];
444 if (ce->ce_flags & CE_WT_REMOVE) {
445 display_progress(progress, ++cnt);
446 unlink_entry(ce);
450 remove_marked_cache_entries(index, 0);
451 remove_scheduled_dirs();
453 if (should_update_submodules())
454 load_gitmodules_file(index, &state);
456 if (has_promisor_remote())
458 * Prefetch the objects that are to be checked out in the loop
459 * below.
461 prefetch_cache_entries(index, must_checkout);
463 get_parallel_checkout_configs(&pc_workers, &pc_threshold);
465 enable_delayed_checkout(&state);
466 if (pc_workers > 1)
467 init_parallel_checkout();
468 for (i = 0; i < index->cache_nr; i++) {
469 struct cache_entry *ce = index->cache[i];
471 if (must_checkout(ce)) {
472 size_t last_pc_queue_size = pc_queue_size();
474 if (ce->ce_flags & CE_WT_REMOVE)
475 BUG("both update and delete flags are set on %s",
476 ce->name);
477 ce->ce_flags &= ~CE_UPDATE;
478 errs |= checkout_entry(ce, &state, NULL, NULL);
480 if (last_pc_queue_size == pc_queue_size())
481 display_progress(progress, ++cnt);
484 if (pc_workers > 1)
485 errs |= run_parallel_checkout(&state, pc_workers, pc_threshold,
486 progress, &cnt);
487 stop_progress(&progress);
488 errs |= finish_delayed_checkout(&state, NULL, o->verbose_update);
489 git_attr_set_direction(GIT_ATTR_CHECKIN);
491 if (o->clone)
492 report_collided_checkout(index);
494 trace_performance_leave("check_updates");
495 return errs != 0;
498 static int verify_uptodate_sparse(const struct cache_entry *ce,
499 struct unpack_trees_options *o);
500 static int verify_absent_sparse(const struct cache_entry *ce,
501 enum unpack_trees_error_types,
502 struct unpack_trees_options *o);
504 static int apply_sparse_checkout(struct index_state *istate,
505 struct cache_entry *ce,
506 struct unpack_trees_options *o)
508 int was_skip_worktree = ce_skip_worktree(ce);
510 if (ce->ce_flags & CE_NEW_SKIP_WORKTREE)
511 ce->ce_flags |= CE_SKIP_WORKTREE;
512 else
513 ce->ce_flags &= ~CE_SKIP_WORKTREE;
514 if (was_skip_worktree != ce_skip_worktree(ce)) {
515 ce->ce_flags |= CE_UPDATE_IN_BASE;
516 mark_fsmonitor_invalid(istate, ce);
517 istate->cache_changed |= CE_ENTRY_CHANGED;
521 * if (!was_skip_worktree && !ce_skip_worktree()) {
522 * This is perfectly normal. Move on;
527 * Merge strategies may set CE_UPDATE|CE_REMOVE outside checkout
528 * area as a result of ce_skip_worktree() shortcuts in
529 * verify_absent() and verify_uptodate().
530 * Make sure they don't modify worktree if they are already
531 * outside checkout area
533 if (was_skip_worktree && ce_skip_worktree(ce)) {
534 ce->ce_flags &= ~CE_UPDATE;
537 * By default, when CE_REMOVE is on, CE_WT_REMOVE is also
538 * on to get that file removed from both index and worktree.
539 * If that file is already outside worktree area, don't
540 * bother remove it.
542 if (ce->ce_flags & CE_REMOVE)
543 ce->ce_flags &= ~CE_WT_REMOVE;
546 if (!was_skip_worktree && ce_skip_worktree(ce)) {
548 * If CE_UPDATE is set, verify_uptodate() must be called already
549 * also stat info may have lost after merged_entry() so calling
550 * verify_uptodate() again may fail
552 if (!(ce->ce_flags & CE_UPDATE) &&
553 verify_uptodate_sparse(ce, o)) {
554 ce->ce_flags &= ~CE_SKIP_WORKTREE;
555 return -1;
557 ce->ce_flags |= CE_WT_REMOVE;
558 ce->ce_flags &= ~CE_UPDATE;
560 if (was_skip_worktree && !ce_skip_worktree(ce)) {
561 if (verify_absent_sparse(ce, WARNING_SPARSE_ORPHANED_NOT_OVERWRITTEN, o))
562 return -1;
563 ce->ce_flags |= CE_UPDATE;
565 return 0;
568 static int warn_conflicted_path(struct index_state *istate,
569 int i,
570 struct unpack_trees_options *o)
572 char *conflicting_path = istate->cache[i]->name;
573 int count = 0;
575 add_rejected_path(o, WARNING_SPARSE_UNMERGED_FILE, conflicting_path);
577 /* Find out how many higher stage entries are at same path */
578 while ((++count) + i < istate->cache_nr &&
579 !strcmp(conflicting_path, istate->cache[count + i]->name))
580 ; /* do nothing */
582 return count;
585 static inline int call_unpack_fn(const struct cache_entry * const *src,
586 struct unpack_trees_options *o)
588 int ret = o->fn(src, o);
589 if (ret > 0)
590 ret = 0;
591 return ret;
594 static void mark_ce_used(struct cache_entry *ce, struct unpack_trees_options *o)
596 ce->ce_flags |= CE_UNPACKED;
598 if (o->cache_bottom < o->src_index->cache_nr &&
599 o->src_index->cache[o->cache_bottom] == ce) {
600 int bottom = o->cache_bottom;
601 while (bottom < o->src_index->cache_nr &&
602 o->src_index->cache[bottom]->ce_flags & CE_UNPACKED)
603 bottom++;
604 o->cache_bottom = bottom;
608 static void mark_all_ce_unused(struct index_state *index)
610 int i;
611 for (i = 0; i < index->cache_nr; i++)
612 index->cache[i]->ce_flags &= ~(CE_UNPACKED | CE_ADDED | CE_NEW_SKIP_WORKTREE);
615 static int locate_in_src_index(const struct cache_entry *ce,
616 struct unpack_trees_options *o)
618 struct index_state *index = o->src_index;
619 int len = ce_namelen(ce);
620 int pos = index_name_pos(index, ce->name, len);
621 if (pos < 0)
622 pos = -1 - pos;
623 return pos;
627 * We call unpack_index_entry() with an unmerged cache entry
628 * only in diff-index, and it wants a single callback. Skip
629 * the other unmerged entry with the same name.
631 static void mark_ce_used_same_name(struct cache_entry *ce,
632 struct unpack_trees_options *o)
634 struct index_state *index = o->src_index;
635 int len = ce_namelen(ce);
636 int pos;
638 for (pos = locate_in_src_index(ce, o); pos < index->cache_nr; pos++) {
639 struct cache_entry *next = index->cache[pos];
640 if (len != ce_namelen(next) ||
641 memcmp(ce->name, next->name, len))
642 break;
643 mark_ce_used(next, o);
647 static struct cache_entry *next_cache_entry(struct unpack_trees_options *o)
649 const struct index_state *index = o->src_index;
650 int pos = o->cache_bottom;
652 while (pos < index->cache_nr) {
653 struct cache_entry *ce = index->cache[pos];
654 if (!(ce->ce_flags & CE_UNPACKED))
655 return ce;
656 pos++;
658 return NULL;
661 static void add_same_unmerged(const struct cache_entry *ce,
662 struct unpack_trees_options *o)
664 struct index_state *index = o->src_index;
665 int len = ce_namelen(ce);
666 int pos = index_name_pos(index, ce->name, len);
668 if (0 <= pos)
669 die("programming error in a caller of mark_ce_used_same_name");
670 for (pos = -pos - 1; pos < index->cache_nr; pos++) {
671 struct cache_entry *next = index->cache[pos];
672 if (len != ce_namelen(next) ||
673 memcmp(ce->name, next->name, len))
674 break;
675 add_entry(o, next, 0, 0);
676 mark_ce_used(next, o);
680 static int unpack_index_entry(struct cache_entry *ce,
681 struct unpack_trees_options *o)
683 const struct cache_entry *src[MAX_UNPACK_TREES + 1] = { NULL, };
684 int ret;
686 src[0] = ce;
688 mark_ce_used(ce, o);
689 if (ce_stage(ce)) {
690 if (o->skip_unmerged) {
691 add_entry(o, ce, 0, 0);
692 return 0;
695 ret = call_unpack_fn(src, o);
696 if (ce_stage(ce))
697 mark_ce_used_same_name(ce, o);
698 return ret;
701 static int find_cache_pos(struct traverse_info *, const char *p, size_t len);
703 static void restore_cache_bottom(struct traverse_info *info, int bottom)
705 struct unpack_trees_options *o = info->data;
707 if (o->diff_index_cached)
708 return;
709 o->cache_bottom = bottom;
712 static int switch_cache_bottom(struct traverse_info *info)
714 struct unpack_trees_options *o = info->data;
715 int ret, pos;
717 if (o->diff_index_cached)
718 return 0;
719 ret = o->cache_bottom;
720 pos = find_cache_pos(info->prev, info->name, info->namelen);
722 if (pos < -1)
723 o->cache_bottom = -2 - pos;
724 else if (pos < 0)
725 o->cache_bottom = o->src_index->cache_nr;
726 return ret;
729 static inline int are_same_oid(struct name_entry *name_j, struct name_entry *name_k)
731 return !is_null_oid(&name_j->oid) && !is_null_oid(&name_k->oid) && oideq(&name_j->oid, &name_k->oid);
734 static int all_trees_same_as_cache_tree(int n, unsigned long dirmask,
735 struct name_entry *names,
736 struct traverse_info *info)
738 struct unpack_trees_options *o = info->data;
739 int i;
741 if (!o->merge || dirmask != ((1 << n) - 1))
742 return 0;
744 for (i = 1; i < n; i++)
745 if (!are_same_oid(names, names + i))
746 return 0;
748 return cache_tree_matches_traversal(o->src_index->cache_tree, names, info);
751 static int index_pos_by_traverse_info(struct name_entry *names,
752 struct traverse_info *info)
754 struct unpack_trees_options *o = info->data;
755 struct strbuf name = STRBUF_INIT;
756 int pos;
758 strbuf_make_traverse_path(&name, info, names->path, names->pathlen);
759 strbuf_addch(&name, '/');
760 pos = index_name_pos(o->src_index, name.buf, name.len);
761 if (pos >= 0) {
762 if (!o->src_index->sparse_index ||
763 !(o->src_index->cache[pos]->ce_flags & CE_SKIP_WORKTREE))
764 BUG("This is a directory and should not exist in index");
765 } else {
766 pos = -pos - 1;
768 if (pos >= o->src_index->cache_nr ||
769 !starts_with(o->src_index->cache[pos]->name, name.buf) ||
770 (pos > 0 && starts_with(o->src_index->cache[pos-1]->name, name.buf)))
771 BUG("pos %d doesn't point to the first entry of %s in index",
772 pos, name.buf);
773 strbuf_release(&name);
774 return pos;
778 * Fast path if we detect that all trees are the same as cache-tree at this
779 * path. We'll walk these trees in an iterative loop using cache-tree/index
780 * instead of ODB since we already know what these trees contain.
782 static int traverse_by_cache_tree(int pos, int nr_entries, int nr_names,
783 struct traverse_info *info)
785 struct cache_entry *src[MAX_UNPACK_TREES + 1] = { NULL, };
786 struct unpack_trees_options *o = info->data;
787 struct cache_entry *tree_ce = NULL;
788 int ce_len = 0;
789 int i, d;
791 if (!o->merge)
792 BUG("We need cache-tree to do this optimization");
795 * Do what unpack_callback() and unpack_single_entry() normally
796 * do. But we walk all paths in an iterative loop instead.
798 * D/F conflicts and higher stage entries are not a concern
799 * because cache-tree would be invalidated and we would never
800 * get here in the first place.
802 for (i = 0; i < nr_entries; i++) {
803 int new_ce_len, len, rc;
805 src[0] = o->src_index->cache[pos + i];
807 len = ce_namelen(src[0]);
808 new_ce_len = cache_entry_size(len);
810 if (new_ce_len > ce_len) {
811 new_ce_len <<= 1;
812 tree_ce = xrealloc(tree_ce, new_ce_len);
813 memset(tree_ce, 0, new_ce_len);
814 ce_len = new_ce_len;
816 tree_ce->ce_flags = create_ce_flags(0);
818 for (d = 1; d <= nr_names; d++)
819 src[d] = tree_ce;
822 tree_ce->ce_mode = src[0]->ce_mode;
823 tree_ce->ce_namelen = len;
824 oidcpy(&tree_ce->oid, &src[0]->oid);
825 memcpy(tree_ce->name, src[0]->name, len + 1);
827 rc = call_unpack_fn((const struct cache_entry * const *)src, o);
828 if (rc < 0) {
829 free(tree_ce);
830 return rc;
833 mark_ce_used(src[0], o);
835 free(tree_ce);
836 if (o->debug_unpack)
837 printf("Unpacked %d entries from %s to %s using cache-tree\n",
838 nr_entries,
839 o->src_index->cache[pos]->name,
840 o->src_index->cache[pos + nr_entries - 1]->name);
841 return 0;
844 static int traverse_trees_recursive(int n, unsigned long dirmask,
845 unsigned long df_conflicts,
846 struct name_entry *names,
847 struct traverse_info *info)
849 struct unpack_trees_options *o = info->data;
850 int i, ret, bottom;
851 int nr_buf = 0;
852 struct tree_desc t[MAX_UNPACK_TREES];
853 void *buf[MAX_UNPACK_TREES];
854 struct traverse_info newinfo;
855 struct name_entry *p;
856 int nr_entries;
858 nr_entries = all_trees_same_as_cache_tree(n, dirmask, names, info);
859 if (nr_entries > 0) {
860 int pos = index_pos_by_traverse_info(names, info);
862 if (!o->merge || df_conflicts)
863 BUG("Wrong condition to get here buddy");
866 * All entries up to 'pos' must have been processed
867 * (i.e. marked CE_UNPACKED) at this point. But to be safe,
868 * save and restore cache_bottom anyway to not miss
869 * unprocessed entries before 'pos'.
871 bottom = o->cache_bottom;
872 ret = traverse_by_cache_tree(pos, nr_entries, n, info);
873 o->cache_bottom = bottom;
874 return ret;
877 p = names;
878 while (!p->mode)
879 p++;
881 newinfo = *info;
882 newinfo.prev = info;
883 newinfo.pathspec = info->pathspec;
884 newinfo.name = p->path;
885 newinfo.namelen = p->pathlen;
886 newinfo.mode = p->mode;
887 newinfo.pathlen = st_add3(newinfo.pathlen, tree_entry_len(p), 1);
888 newinfo.df_conflicts |= df_conflicts;
891 * Fetch the tree from the ODB for each peer directory in the
892 * n commits.
894 * For 2- and 3-way traversals, we try to avoid hitting the
895 * ODB twice for the same OID. This should yield a nice speed
896 * up in checkouts and merges when the commits are similar.
898 * We don't bother doing the full O(n^2) search for larger n,
899 * because wider traversals don't happen that often and we
900 * avoid the search setup.
902 * When 2 peer OIDs are the same, we just copy the tree
903 * descriptor data. This implicitly borrows the buffer
904 * data from the earlier cell.
906 for (i = 0; i < n; i++, dirmask >>= 1) {
907 if (i > 0 && are_same_oid(&names[i], &names[i - 1]))
908 t[i] = t[i - 1];
909 else if (i > 1 && are_same_oid(&names[i], &names[i - 2]))
910 t[i] = t[i - 2];
911 else {
912 const struct object_id *oid = NULL;
913 if (dirmask & 1)
914 oid = &names[i].oid;
915 buf[nr_buf++] = fill_tree_descriptor(the_repository, t + i, oid);
919 bottom = switch_cache_bottom(&newinfo);
920 ret = traverse_trees(o->src_index, n, t, &newinfo);
921 restore_cache_bottom(&newinfo, bottom);
923 for (i = 0; i < nr_buf; i++)
924 free(buf[i]);
926 return ret;
930 * Compare the traverse-path to the cache entry without actually
931 * having to generate the textual representation of the traverse
932 * path.
934 * NOTE! This *only* compares up to the size of the traverse path
935 * itself - the caller needs to do the final check for the cache
936 * entry having more data at the end!
938 static int do_compare_entry_piecewise(const struct cache_entry *ce,
939 const struct traverse_info *info,
940 const char *name, size_t namelen,
941 unsigned mode)
943 int pathlen, ce_len;
944 const char *ce_name;
946 if (info->prev) {
947 int cmp = do_compare_entry_piecewise(ce, info->prev,
948 info->name, info->namelen,
949 info->mode);
950 if (cmp)
951 return cmp;
953 pathlen = info->pathlen;
954 ce_len = ce_namelen(ce);
956 /* If ce_len < pathlen then we must have previously hit "name == directory" entry */
957 if (ce_len < pathlen)
958 return -1;
960 ce_len -= pathlen;
961 ce_name = ce->name + pathlen;
963 return df_name_compare(ce_name, ce_len, S_IFREG, name, namelen, mode);
966 static int do_compare_entry(const struct cache_entry *ce,
967 const struct traverse_info *info,
968 const char *name, size_t namelen,
969 unsigned mode)
971 int pathlen, ce_len;
972 const char *ce_name;
973 int cmp;
974 unsigned ce_mode;
977 * If we have not precomputed the traverse path, it is quicker
978 * to avoid doing so. But if we have precomputed it,
979 * it is quicker to use the precomputed version.
981 if (!info->traverse_path)
982 return do_compare_entry_piecewise(ce, info, name, namelen, mode);
984 cmp = strncmp(ce->name, info->traverse_path, info->pathlen);
985 if (cmp)
986 return cmp;
988 pathlen = info->pathlen;
989 ce_len = ce_namelen(ce);
991 if (ce_len < pathlen)
992 return -1;
994 ce_len -= pathlen;
995 ce_name = ce->name + pathlen;
997 ce_mode = S_ISSPARSEDIR(ce->ce_mode) ? S_IFDIR : S_IFREG;
998 return df_name_compare(ce_name, ce_len, ce_mode, name, namelen, mode);
1001 static int compare_entry(const struct cache_entry *ce, const struct traverse_info *info, const struct name_entry *n)
1003 int cmp = do_compare_entry(ce, info, n->path, n->pathlen, n->mode);
1004 if (cmp)
1005 return cmp;
1008 * At this point, we know that we have a prefix match. If ce
1009 * is a sparse directory, then allow an exact match. This only
1010 * works when the input name is a directory, since ce->name
1011 * ends in a directory separator.
1013 if (S_ISSPARSEDIR(ce->ce_mode) &&
1014 ce->ce_namelen == traverse_path_len(info, tree_entry_len(n)) + 1)
1015 return 0;
1018 * Even if the beginning compared identically, the ce should
1019 * compare as bigger than a directory leading up to it!
1021 return ce_namelen(ce) > traverse_path_len(info, tree_entry_len(n));
1024 static int ce_in_traverse_path(const struct cache_entry *ce,
1025 const struct traverse_info *info)
1027 if (!info->prev)
1028 return 1;
1029 if (do_compare_entry(ce, info->prev,
1030 info->name, info->namelen, info->mode))
1031 return 0;
1033 * If ce (blob) is the same name as the path (which is a tree
1034 * we will be descending into), it won't be inside it.
1036 return (info->pathlen < ce_namelen(ce));
1039 static struct cache_entry *create_ce_entry(const struct traverse_info *info,
1040 const struct name_entry *n,
1041 int stage,
1042 struct index_state *istate,
1043 int is_transient,
1044 int is_sparse_directory)
1046 size_t len = traverse_path_len(info, tree_entry_len(n));
1047 size_t alloc_len = is_sparse_directory ? len + 1 : len;
1048 struct cache_entry *ce =
1049 is_transient ?
1050 make_empty_transient_cache_entry(alloc_len, NULL) :
1051 make_empty_cache_entry(istate, alloc_len);
1053 ce->ce_mode = create_ce_mode(n->mode);
1054 ce->ce_flags = create_ce_flags(stage);
1055 ce->ce_namelen = len;
1056 oidcpy(&ce->oid, &n->oid);
1057 /* len+1 because the cache_entry allocates space for NUL */
1058 make_traverse_path(ce->name, len + 1, info, n->path, n->pathlen);
1060 if (is_sparse_directory) {
1061 ce->name[len] = '/';
1062 ce->name[len + 1] = '\0';
1063 ce->ce_namelen++;
1064 ce->ce_flags |= CE_SKIP_WORKTREE;
1067 return ce;
1071 * Note that traverse_by_cache_tree() duplicates some logic in this function
1072 * without actually calling it. If you change the logic here you may need to
1073 * check and change there as well.
1075 static int unpack_single_entry(int n, unsigned long mask,
1076 unsigned long dirmask,
1077 struct cache_entry **src,
1078 const struct name_entry *names,
1079 const struct traverse_info *info)
1081 int i;
1082 struct unpack_trees_options *o = info->data;
1083 unsigned long conflicts = info->df_conflicts | dirmask;
1085 if (mask == dirmask && !src[0])
1086 return 0;
1089 * When we have a sparse directory entry for src[0],
1090 * then this isn't necessarily a directory-file conflict.
1092 if (mask == dirmask && src[0] &&
1093 S_ISSPARSEDIR(src[0]->ce_mode))
1094 conflicts = 0;
1097 * Ok, we've filled in up to any potential index entry in src[0],
1098 * now do the rest.
1100 for (i = 0; i < n; i++) {
1101 int stage;
1102 unsigned int bit = 1ul << i;
1103 if (conflicts & bit) {
1104 src[i + o->merge] = o->df_conflict_entry;
1105 continue;
1107 if (!(mask & bit))
1108 continue;
1109 if (!o->merge)
1110 stage = 0;
1111 else if (i + 1 < o->head_idx)
1112 stage = 1;
1113 else if (i + 1 > o->head_idx)
1114 stage = 3;
1115 else
1116 stage = 2;
1119 * If the merge bit is set, then the cache entries are
1120 * discarded in the following block. In this case,
1121 * construct "transient" cache_entries, as they are
1122 * not stored in the index. otherwise construct the
1123 * cache entry from the index aware logic.
1125 src[i + o->merge] = create_ce_entry(info, names + i, stage,
1126 &o->result, o->merge,
1127 bit & dirmask);
1130 if (o->merge) {
1131 int rc = call_unpack_fn((const struct cache_entry * const *)src,
1133 for (i = 0; i < n; i++) {
1134 struct cache_entry *ce = src[i + o->merge];
1135 if (ce != o->df_conflict_entry)
1136 discard_cache_entry(ce);
1138 return rc;
1141 for (i = 0; i < n; i++)
1142 if (src[i] && src[i] != o->df_conflict_entry)
1143 if (do_add_entry(o, src[i], 0, 0))
1144 return -1;
1146 return 0;
1149 static int unpack_failed(struct unpack_trees_options *o, const char *message)
1151 discard_index(&o->result);
1152 if (!o->quiet && !o->exiting_early) {
1153 if (message)
1154 return error("%s", message);
1155 return -1;
1157 return -1;
1161 * The tree traversal is looking at name p. If we have a matching entry,
1162 * return it. If name p is a directory in the index, do not return
1163 * anything, as we will want to match it when the traversal descends into
1164 * the directory.
1166 static int find_cache_pos(struct traverse_info *info,
1167 const char *p, size_t p_len)
1169 int pos;
1170 struct unpack_trees_options *o = info->data;
1171 struct index_state *index = o->src_index;
1172 int pfxlen = info->pathlen;
1174 for (pos = o->cache_bottom; pos < index->cache_nr; pos++) {
1175 const struct cache_entry *ce = index->cache[pos];
1176 const char *ce_name, *ce_slash;
1177 int cmp, ce_len;
1179 if (ce->ce_flags & CE_UNPACKED) {
1181 * cache_bottom entry is already unpacked, so
1182 * we can never match it; don't check it
1183 * again.
1185 if (pos == o->cache_bottom)
1186 ++o->cache_bottom;
1187 continue;
1189 if (!ce_in_traverse_path(ce, info)) {
1191 * Check if we can skip future cache checks
1192 * (because we're already past all possible
1193 * entries in the traverse path).
1195 if (info->traverse_path) {
1196 if (strncmp(ce->name, info->traverse_path,
1197 info->pathlen) > 0)
1198 break;
1200 continue;
1202 ce_name = ce->name + pfxlen;
1203 ce_slash = strchr(ce_name, '/');
1204 if (ce_slash)
1205 ce_len = ce_slash - ce_name;
1206 else
1207 ce_len = ce_namelen(ce) - pfxlen;
1208 cmp = name_compare(p, p_len, ce_name, ce_len);
1210 * Exact match; if we have a directory we need to
1211 * delay returning it.
1213 if (!cmp)
1214 return ce_slash ? -2 - pos : pos;
1215 if (0 < cmp)
1216 continue; /* keep looking */
1218 * ce_name sorts after p->path; could it be that we
1219 * have files under p->path directory in the index?
1220 * E.g. ce_name == "t-i", and p->path == "t"; we may
1221 * have "t/a" in the index.
1223 if (p_len < ce_len && !memcmp(ce_name, p, p_len) &&
1224 ce_name[p_len] < '/')
1225 continue; /* keep looking */
1226 break;
1228 return -1;
1232 * Given a sparse directory entry 'ce', compare ce->name to
1233 * info->traverse_path + p->path + '/' if info->traverse_path
1234 * is non-empty.
1236 * Compare ce->name to p->path + '/' otherwise. Note that
1237 * ce->name must end in a trailing '/' because it is a sparse
1238 * directory entry.
1240 static int sparse_dir_matches_path(const struct cache_entry *ce,
1241 struct traverse_info *info,
1242 const struct name_entry *p)
1244 assert(S_ISSPARSEDIR(ce->ce_mode));
1245 assert(ce->name[ce->ce_namelen - 1] == '/');
1247 if (info->pathlen)
1248 return ce->ce_namelen == info->pathlen + p->pathlen + 1 &&
1249 ce->name[info->pathlen - 1] == '/' &&
1250 !strncmp(ce->name, info->traverse_path, info->pathlen) &&
1251 !strncmp(ce->name + info->pathlen, p->path, p->pathlen);
1252 return ce->ce_namelen == p->pathlen + 1 &&
1253 !strncmp(ce->name, p->path, p->pathlen);
1256 static struct cache_entry *find_cache_entry(struct traverse_info *info,
1257 const struct name_entry *p)
1259 const char *path;
1260 int pos = find_cache_pos(info, p->path, p->pathlen);
1261 struct unpack_trees_options *o = info->data;
1263 if (0 <= pos)
1264 return o->src_index->cache[pos];
1267 * Check for a sparse-directory entry named "path/".
1268 * Due to the input p->path not having a trailing
1269 * slash, the negative 'pos' value overshoots the
1270 * expected position, hence "-2" instead of "-1".
1272 pos = -pos - 2;
1274 if (pos < 0 || pos >= o->src_index->cache_nr)
1275 return NULL;
1278 * Due to lexicographic sorting and sparse directory
1279 * entries ending with a trailing slash, our path as a
1280 * sparse directory (e.g "subdir/") and our path as a
1281 * file (e.g. "subdir") might be separated by other
1282 * paths (e.g. "subdir-").
1284 while (pos >= 0) {
1285 struct cache_entry *ce = o->src_index->cache[pos];
1287 if (!skip_prefix(ce->name, info->traverse_path, &path) ||
1288 strncmp(path, p->path, p->pathlen) ||
1289 path[p->pathlen] != '/')
1290 return NULL;
1292 if (S_ISSPARSEDIR(ce->ce_mode) &&
1293 sparse_dir_matches_path(ce, info, p))
1294 return ce;
1296 pos--;
1299 return NULL;
1302 static void debug_path(struct traverse_info *info)
1304 if (info->prev) {
1305 debug_path(info->prev);
1306 if (*info->prev->name)
1307 putchar('/');
1309 printf("%s", info->name);
1312 static void debug_name_entry(int i, struct name_entry *n)
1314 printf("ent#%d %06o %s\n", i,
1315 n->path ? n->mode : 0,
1316 n->path ? n->path : "(missing)");
1319 static void debug_unpack_callback(int n,
1320 unsigned long mask,
1321 unsigned long dirmask,
1322 struct name_entry *names,
1323 struct traverse_info *info)
1325 int i;
1326 printf("* unpack mask %lu, dirmask %lu, cnt %d ",
1327 mask, dirmask, n);
1328 debug_path(info);
1329 putchar('\n');
1330 for (i = 0; i < n; i++)
1331 debug_name_entry(i, names + i);
1335 * Returns true if and only if the given cache_entry is a
1336 * sparse-directory entry that matches the given name_entry
1337 * from the tree walk at the given traverse_info.
1339 static int is_sparse_directory_entry(struct cache_entry *ce,
1340 struct name_entry *name,
1341 struct traverse_info *info)
1343 if (!ce || !name || !S_ISSPARSEDIR(ce->ce_mode))
1344 return 0;
1346 return sparse_dir_matches_path(ce, info, name);
1349 static int unpack_sparse_callback(int n, unsigned long mask, unsigned long dirmask, struct name_entry *names, struct traverse_info *info)
1351 struct cache_entry *src[MAX_UNPACK_TREES + 1] = { NULL, };
1352 struct unpack_trees_options *o = info->data;
1353 int ret;
1355 assert(o->merge);
1358 * Unlike in 'unpack_callback', where src[0] is derived from the index when
1359 * merging, src[0] is a transient cache entry derived from the first tree
1360 * provided. Create the temporary entry as if it came from a non-sparse index.
1362 if (!is_null_oid(&names[0].oid)) {
1363 src[0] = create_ce_entry(info, &names[0], 0,
1364 &o->result, 1,
1365 dirmask & (1ul << 0));
1366 src[0]->ce_flags |= (CE_SKIP_WORKTREE | CE_NEW_SKIP_WORKTREE);
1370 * 'unpack_single_entry' assumes that src[0] is derived directly from
1371 * the index, rather than from an entry in 'names'. This is *not* true when
1372 * merging a sparse directory, in which case names[0] is the "index" source
1373 * entry. To match the expectations of 'unpack_single_entry', shift past the
1374 * "index" tree (i.e., names[0]) and adjust 'names', 'n', 'mask', and
1375 * 'dirmask' accordingly.
1377 ret = unpack_single_entry(n - 1, mask >> 1, dirmask >> 1, src, names + 1, info);
1379 if (src[0])
1380 discard_cache_entry(src[0]);
1382 return ret >= 0 ? mask : -1;
1386 * Note that traverse_by_cache_tree() duplicates some logic in this function
1387 * without actually calling it. If you change the logic here you may need to
1388 * check and change there as well.
1390 static int unpack_callback(int n, unsigned long mask, unsigned long dirmask, struct name_entry *names, struct traverse_info *info)
1392 struct cache_entry *src[MAX_UNPACK_TREES + 1] = { NULL, };
1393 struct unpack_trees_options *o = info->data;
1394 const struct name_entry *p = names;
1396 /* Find first entry with a real name (we could use "mask" too) */
1397 while (!p->mode)
1398 p++;
1400 if (o->debug_unpack)
1401 debug_unpack_callback(n, mask, dirmask, names, info);
1403 /* Are we supposed to look at the index too? */
1404 if (o->merge) {
1405 while (1) {
1406 int cmp;
1407 struct cache_entry *ce;
1409 if (o->diff_index_cached)
1410 ce = next_cache_entry(o);
1411 else
1412 ce = find_cache_entry(info, p);
1414 if (!ce)
1415 break;
1416 cmp = compare_entry(ce, info, p);
1417 if (cmp < 0) {
1418 if (unpack_index_entry(ce, o) < 0)
1419 return unpack_failed(o, NULL);
1420 continue;
1422 if (!cmp) {
1423 if (ce_stage(ce)) {
1425 * If we skip unmerged index
1426 * entries, we'll skip this
1427 * entry *and* the tree
1428 * entries associated with it!
1430 if (o->skip_unmerged) {
1431 add_same_unmerged(ce, o);
1432 return mask;
1435 src[0] = ce;
1437 break;
1441 if (unpack_single_entry(n, mask, dirmask, src, names, info) < 0)
1442 return -1;
1444 if (o->merge && src[0]) {
1445 if (ce_stage(src[0]))
1446 mark_ce_used_same_name(src[0], o);
1447 else
1448 mark_ce_used(src[0], o);
1451 /* Now handle any directories.. */
1452 if (dirmask) {
1453 /* special case: "diff-index --cached" looking at a tree */
1454 if (o->diff_index_cached &&
1455 n == 1 && dirmask == 1 && S_ISDIR(names->mode)) {
1456 int matches;
1457 matches = cache_tree_matches_traversal(o->src_index->cache_tree,
1458 names, info);
1460 * Everything under the name matches; skip the
1461 * entire hierarchy. diff_index_cached codepath
1462 * special cases D/F conflicts in such a way that
1463 * it does not do any look-ahead, so this is safe.
1465 if (matches) {
1467 * Only increment the cache_bottom if the
1468 * directory isn't a sparse directory index
1469 * entry (if it is, it was already incremented)
1470 * in 'mark_ce_used()'
1472 if (!src[0] || !S_ISSPARSEDIR(src[0]->ce_mode))
1473 o->cache_bottom += matches;
1474 return mask;
1478 if (!is_sparse_directory_entry(src[0], names, info) &&
1479 traverse_trees_recursive(n, dirmask, mask & ~dirmask,
1480 names, info) < 0) {
1481 return -1;
1484 return mask;
1487 return mask;
1490 static int clear_ce_flags_1(struct index_state *istate,
1491 struct cache_entry **cache, int nr,
1492 struct strbuf *prefix,
1493 int select_mask, int clear_mask,
1494 struct pattern_list *pl,
1495 enum pattern_match_result default_match,
1496 int progress_nr);
1498 /* Whole directory matching */
1499 static int clear_ce_flags_dir(struct index_state *istate,
1500 struct cache_entry **cache, int nr,
1501 struct strbuf *prefix,
1502 char *basename,
1503 int select_mask, int clear_mask,
1504 struct pattern_list *pl,
1505 enum pattern_match_result default_match,
1506 int progress_nr)
1508 struct cache_entry **cache_end;
1509 int dtype = DT_DIR;
1510 int rc;
1511 enum pattern_match_result ret, orig_ret;
1512 orig_ret = path_matches_pattern_list(prefix->buf, prefix->len,
1513 basename, &dtype, pl, istate);
1515 strbuf_addch(prefix, '/');
1517 /* If undecided, use matching result of parent dir in defval */
1518 if (orig_ret == UNDECIDED)
1519 ret = default_match;
1520 else
1521 ret = orig_ret;
1523 for (cache_end = cache; cache_end != cache + nr; cache_end++) {
1524 struct cache_entry *ce = *cache_end;
1525 if (strncmp(ce->name, prefix->buf, prefix->len))
1526 break;
1529 if (pl->use_cone_patterns && orig_ret == MATCHED_RECURSIVE) {
1530 struct cache_entry **ce = cache;
1531 rc = cache_end - cache;
1533 while (ce < cache_end) {
1534 (*ce)->ce_flags &= ~clear_mask;
1535 ce++;
1537 } else if (pl->use_cone_patterns && orig_ret == NOT_MATCHED) {
1538 rc = cache_end - cache;
1539 } else {
1540 rc = clear_ce_flags_1(istate, cache, cache_end - cache,
1541 prefix,
1542 select_mask, clear_mask,
1543 pl, ret,
1544 progress_nr);
1547 strbuf_setlen(prefix, prefix->len - 1);
1548 return rc;
1552 * Traverse the index, find every entry that matches according to
1553 * o->pl. Do "ce_flags &= ~clear_mask" on those entries. Return the
1554 * number of traversed entries.
1556 * If select_mask is non-zero, only entries whose ce_flags has on of
1557 * those bits enabled are traversed.
1559 * cache : pointer to an index entry
1560 * prefix_len : an offset to its path
1562 * The current path ("prefix") including the trailing '/' is
1563 * cache[0]->name[0..(prefix_len-1)]
1564 * Top level path has prefix_len zero.
1566 static int clear_ce_flags_1(struct index_state *istate,
1567 struct cache_entry **cache, int nr,
1568 struct strbuf *prefix,
1569 int select_mask, int clear_mask,
1570 struct pattern_list *pl,
1571 enum pattern_match_result default_match,
1572 int progress_nr)
1574 struct cache_entry **cache_end = nr ? cache + nr : cache;
1577 * Process all entries that have the given prefix and meet
1578 * select_mask condition
1580 while(cache != cache_end) {
1581 struct cache_entry *ce = *cache;
1582 const char *name, *slash;
1583 int len, dtype;
1584 enum pattern_match_result ret;
1586 display_progress(istate->progress, progress_nr);
1588 if (select_mask && !(ce->ce_flags & select_mask)) {
1589 cache++;
1590 progress_nr++;
1591 continue;
1594 if (prefix->len && strncmp(ce->name, prefix->buf, prefix->len))
1595 break;
1597 name = ce->name + prefix->len;
1598 slash = strchr(name, '/');
1600 /* If it's a directory, try whole directory match first */
1601 if (slash) {
1602 int processed;
1604 len = slash - name;
1605 strbuf_add(prefix, name, len);
1607 processed = clear_ce_flags_dir(istate, cache, cache_end - cache,
1608 prefix,
1609 prefix->buf + prefix->len - len,
1610 select_mask, clear_mask,
1611 pl, default_match,
1612 progress_nr);
1614 /* clear_c_f_dir eats a whole dir already? */
1615 if (processed) {
1616 cache += processed;
1617 progress_nr += processed;
1618 strbuf_setlen(prefix, prefix->len - len);
1619 continue;
1622 strbuf_addch(prefix, '/');
1623 processed = clear_ce_flags_1(istate, cache, cache_end - cache,
1624 prefix,
1625 select_mask, clear_mask, pl,
1626 default_match, progress_nr);
1628 cache += processed;
1629 progress_nr += processed;
1631 strbuf_setlen(prefix, prefix->len - len - 1);
1632 continue;
1635 /* Non-directory */
1636 dtype = ce_to_dtype(ce);
1637 ret = path_matches_pattern_list(ce->name,
1638 ce_namelen(ce),
1639 name, &dtype, pl, istate);
1640 if (ret == UNDECIDED)
1641 ret = default_match;
1642 if (ret == MATCHED || ret == MATCHED_RECURSIVE)
1643 ce->ce_flags &= ~clear_mask;
1644 cache++;
1645 progress_nr++;
1648 display_progress(istate->progress, progress_nr);
1649 return nr - (cache_end - cache);
1652 static int clear_ce_flags(struct index_state *istate,
1653 int select_mask, int clear_mask,
1654 struct pattern_list *pl,
1655 int show_progress)
1657 static struct strbuf prefix = STRBUF_INIT;
1658 char label[100];
1659 int rval;
1661 strbuf_reset(&prefix);
1662 if (show_progress)
1663 istate->progress = start_delayed_progress(
1664 _("Updating index flags"),
1665 istate->cache_nr);
1667 xsnprintf(label, sizeof(label), "clear_ce_flags(0x%08lx,0x%08lx)",
1668 (unsigned long)select_mask, (unsigned long)clear_mask);
1669 trace2_region_enter("unpack_trees", label, the_repository);
1670 rval = clear_ce_flags_1(istate,
1671 istate->cache,
1672 istate->cache_nr,
1673 &prefix,
1674 select_mask, clear_mask,
1675 pl, 0, 0);
1676 trace2_region_leave("unpack_trees", label, the_repository);
1678 stop_progress(&istate->progress);
1679 return rval;
1683 * Set/Clear CE_NEW_SKIP_WORKTREE according to $GIT_DIR/info/sparse-checkout
1685 static void mark_new_skip_worktree(struct pattern_list *pl,
1686 struct index_state *istate,
1687 int select_flag, int skip_wt_flag,
1688 int show_progress)
1690 int i;
1693 * 1. Pretend the narrowest worktree: only unmerged entries
1694 * are checked out
1696 for (i = 0; i < istate->cache_nr; i++) {
1697 struct cache_entry *ce = istate->cache[i];
1699 if (select_flag && !(ce->ce_flags & select_flag))
1700 continue;
1702 if (!ce_stage(ce) && !(ce->ce_flags & CE_CONFLICTED))
1703 ce->ce_flags |= skip_wt_flag;
1704 else
1705 ce->ce_flags &= ~skip_wt_flag;
1709 * 2. Widen worktree according to sparse-checkout file.
1710 * Matched entries will have skip_wt_flag cleared (i.e. "in")
1712 clear_ce_flags(istate, select_flag, skip_wt_flag, pl, show_progress);
1715 static void populate_from_existing_patterns(struct unpack_trees_options *o,
1716 struct pattern_list *pl)
1718 if (get_sparse_checkout_patterns(pl) < 0)
1719 o->skip_sparse_checkout = 1;
1720 else
1721 o->pl = pl;
1724 static void update_sparsity_for_prefix(const char *prefix,
1725 struct index_state *istate)
1727 int prefix_len = strlen(prefix);
1728 struct strbuf ce_prefix = STRBUF_INIT;
1730 if (!istate->sparse_index)
1731 return;
1733 while (prefix_len > 0 && prefix[prefix_len - 1] == '/')
1734 prefix_len--;
1736 if (prefix_len <= 0)
1737 BUG("Invalid prefix passed to update_sparsity_for_prefix");
1739 strbuf_grow(&ce_prefix, prefix_len + 1);
1740 strbuf_add(&ce_prefix, prefix, prefix_len);
1741 strbuf_addch(&ce_prefix, '/');
1744 * If the prefix points to a sparse directory or a path inside a sparse
1745 * directory, the index should be expanded. This is accomplished in one
1746 * of two ways:
1747 * - if the prefix is inside a sparse directory, it will be expanded by
1748 * the 'ensure_full_index(...)' call in 'index_name_pos(...)'.
1749 * - if the prefix matches an existing sparse directory entry,
1750 * 'index_name_pos(...)' will return its index position, triggering
1751 * the 'ensure_full_index(...)' below.
1753 if (!path_in_cone_mode_sparse_checkout(ce_prefix.buf, istate) &&
1754 index_name_pos(istate, ce_prefix.buf, ce_prefix.len) >= 0)
1755 ensure_full_index(istate);
1757 strbuf_release(&ce_prefix);
1760 static int verify_absent(const struct cache_entry *,
1761 enum unpack_trees_error_types,
1762 struct unpack_trees_options *);
1764 * N-way merge "len" trees. Returns 0 on success, -1 on failure to manipulate the
1765 * resulting index, -2 on failure to reflect the changes to the work tree.
1767 * CE_ADDED, CE_UNPACKED and CE_NEW_SKIP_WORKTREE are used internally
1769 int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options *o)
1771 struct repository *repo = the_repository;
1772 int i, ret;
1773 static struct cache_entry *dfc;
1774 struct pattern_list pl;
1775 int free_pattern_list = 0;
1776 struct dir_struct dir = DIR_INIT;
1778 if (o->reset == UNPACK_RESET_INVALID)
1779 BUG("o->reset had a value of 1; should be UNPACK_TREES_*_UNTRACKED");
1781 if (len > MAX_UNPACK_TREES)
1782 die("unpack_trees takes at most %d trees", MAX_UNPACK_TREES);
1783 if (o->dir)
1784 BUG("o->dir is for internal use only");
1786 trace_performance_enter();
1787 trace2_region_enter("unpack_trees", "unpack_trees", the_repository);
1789 prepare_repo_settings(repo);
1790 if (repo->settings.command_requires_full_index) {
1791 ensure_full_index(o->src_index);
1792 ensure_full_index(o->dst_index);
1795 if (o->reset == UNPACK_RESET_OVERWRITE_UNTRACKED &&
1796 o->preserve_ignored)
1797 BUG("UNPACK_RESET_OVERWRITE_UNTRACKED incompatible with preserved ignored files");
1799 if (!o->preserve_ignored) {
1800 o->dir = &dir;
1801 o->dir->flags |= DIR_SHOW_IGNORED;
1802 setup_standard_excludes(o->dir);
1805 if (o->prefix)
1806 update_sparsity_for_prefix(o->prefix, o->src_index);
1808 if (!core_apply_sparse_checkout || !o->update)
1809 o->skip_sparse_checkout = 1;
1810 if (!o->skip_sparse_checkout && !o->pl) {
1811 memset(&pl, 0, sizeof(pl));
1812 free_pattern_list = 1;
1813 populate_from_existing_patterns(o, &pl);
1816 memset(&o->result, 0, sizeof(o->result));
1817 o->result.initialized = 1;
1818 o->result.timestamp.sec = o->src_index->timestamp.sec;
1819 o->result.timestamp.nsec = o->src_index->timestamp.nsec;
1820 o->result.version = o->src_index->version;
1821 if (!o->src_index->split_index) {
1822 o->result.split_index = NULL;
1823 } else if (o->src_index == o->dst_index) {
1825 * o->dst_index (and thus o->src_index) will be discarded
1826 * and overwritten with o->result at the end of this function,
1827 * so just use src_index's split_index to avoid having to
1828 * create a new one.
1830 o->result.split_index = o->src_index->split_index;
1831 o->result.split_index->refcount++;
1832 } else {
1833 o->result.split_index = init_split_index(&o->result);
1835 oidcpy(&o->result.oid, &o->src_index->oid);
1836 o->merge_size = len;
1837 mark_all_ce_unused(o->src_index);
1839 o->result.fsmonitor_last_update =
1840 xstrdup_or_null(o->src_index->fsmonitor_last_update);
1843 * Sparse checkout loop #1: set NEW_SKIP_WORKTREE on existing entries
1845 if (!o->skip_sparse_checkout)
1846 mark_new_skip_worktree(o->pl, o->src_index, 0,
1847 CE_NEW_SKIP_WORKTREE, o->verbose_update);
1849 if (!dfc)
1850 dfc = xcalloc(1, cache_entry_size(0));
1851 o->df_conflict_entry = dfc;
1853 if (len) {
1854 const char *prefix = o->prefix ? o->prefix : "";
1855 struct traverse_info info;
1857 setup_traverse_info(&info, prefix);
1858 info.fn = unpack_callback;
1859 info.data = o;
1860 info.show_all_errors = o->show_all_errors;
1861 info.pathspec = o->pathspec;
1863 if (o->prefix) {
1865 * Unpack existing index entries that sort before the
1866 * prefix the tree is spliced into. Note that o->merge
1867 * is always true in this case.
1869 while (1) {
1870 struct cache_entry *ce = next_cache_entry(o);
1871 if (!ce)
1872 break;
1873 if (ce_in_traverse_path(ce, &info))
1874 break;
1875 if (unpack_index_entry(ce, o) < 0)
1876 goto return_failed;
1880 trace_performance_enter();
1881 trace2_region_enter("unpack_trees", "traverse_trees", the_repository);
1882 ret = traverse_trees(o->src_index, len, t, &info);
1883 trace2_region_leave("unpack_trees", "traverse_trees", the_repository);
1884 trace_performance_leave("traverse_trees");
1885 if (ret < 0)
1886 goto return_failed;
1889 /* Any left-over entries in the index? */
1890 if (o->merge) {
1891 while (1) {
1892 struct cache_entry *ce = next_cache_entry(o);
1893 if (!ce)
1894 break;
1895 if (unpack_index_entry(ce, o) < 0)
1896 goto return_failed;
1899 mark_all_ce_unused(o->src_index);
1901 if (o->trivial_merges_only && o->nontrivial_merge) {
1902 ret = unpack_failed(o, "Merge requires file-level merging");
1903 goto done;
1906 if (!o->skip_sparse_checkout) {
1908 * Sparse checkout loop #2: set NEW_SKIP_WORKTREE on entries not in loop #1
1909 * If they will have NEW_SKIP_WORKTREE, also set CE_SKIP_WORKTREE
1910 * so apply_sparse_checkout() won't attempt to remove it from worktree
1912 mark_new_skip_worktree(o->pl, &o->result,
1913 CE_ADDED, CE_SKIP_WORKTREE | CE_NEW_SKIP_WORKTREE,
1914 o->verbose_update);
1916 ret = 0;
1917 for (i = 0; i < o->result.cache_nr; i++) {
1918 struct cache_entry *ce = o->result.cache[i];
1921 * Entries marked with CE_ADDED in merged_entry() do not have
1922 * verify_absent() check (the check is effectively disabled
1923 * because CE_NEW_SKIP_WORKTREE is set unconditionally).
1925 * Do the real check now because we have had
1926 * correct CE_NEW_SKIP_WORKTREE
1928 if (ce->ce_flags & CE_ADDED &&
1929 verify_absent(ce, WARNING_SPARSE_ORPHANED_NOT_OVERWRITTEN, o))
1930 ret = 1;
1932 if (apply_sparse_checkout(&o->result, ce, o))
1933 ret = 1;
1935 if (ret == 1) {
1937 * Inability to sparsify or de-sparsify individual
1938 * paths is not an error, but just a warning.
1940 if (o->show_all_errors)
1941 display_warning_msgs(o);
1942 ret = 0;
1946 ret = check_updates(o, &o->result) ? (-2) : 0;
1947 if (o->dst_index) {
1948 move_index_extensions(&o->result, o->src_index);
1949 if (!ret) {
1950 if (git_env_bool("GIT_TEST_CHECK_CACHE_TREE", 0))
1951 cache_tree_verify(the_repository, &o->result);
1952 if (!cache_tree_fully_valid(o->result.cache_tree))
1953 cache_tree_update(&o->result,
1954 WRITE_TREE_SILENT |
1955 WRITE_TREE_REPAIR);
1958 o->result.updated_workdir = 1;
1959 discard_index(o->dst_index);
1960 *o->dst_index = o->result;
1961 } else {
1962 discard_index(&o->result);
1964 o->src_index = NULL;
1966 done:
1967 if (free_pattern_list)
1968 clear_pattern_list(&pl);
1969 if (o->dir) {
1970 dir_clear(o->dir);
1971 o->dir = NULL;
1973 trace2_region_leave("unpack_trees", "unpack_trees", the_repository);
1974 trace_performance_leave("unpack_trees");
1975 return ret;
1977 return_failed:
1978 if (o->show_all_errors)
1979 display_error_msgs(o);
1980 mark_all_ce_unused(o->src_index);
1981 ret = unpack_failed(o, NULL);
1982 if (o->exiting_early)
1983 ret = 0;
1984 goto done;
1988 * Update SKIP_WORKTREE bits according to sparsity patterns, and update
1989 * working directory to match.
1991 * CE_NEW_SKIP_WORKTREE is used internally.
1993 enum update_sparsity_result update_sparsity(struct unpack_trees_options *o)
1995 enum update_sparsity_result ret = UPDATE_SPARSITY_SUCCESS;
1996 struct pattern_list pl;
1997 int i;
1998 unsigned old_show_all_errors;
1999 int free_pattern_list = 0;
2001 old_show_all_errors = o->show_all_errors;
2002 o->show_all_errors = 1;
2004 /* Sanity checks */
2005 if (!o->update || o->index_only || o->skip_sparse_checkout)
2006 BUG("update_sparsity() is for reflecting sparsity patterns in working directory");
2007 if (o->src_index != o->dst_index || o->fn)
2008 BUG("update_sparsity() called wrong");
2010 trace_performance_enter();
2012 /* If we weren't given patterns, use the recorded ones */
2013 if (!o->pl) {
2014 memset(&pl, 0, sizeof(pl));
2015 free_pattern_list = 1;
2016 populate_from_existing_patterns(o, &pl);
2017 if (o->skip_sparse_checkout)
2018 goto skip_sparse_checkout;
2021 /* Set NEW_SKIP_WORKTREE on existing entries. */
2022 mark_all_ce_unused(o->src_index);
2023 mark_new_skip_worktree(o->pl, o->src_index, 0,
2024 CE_NEW_SKIP_WORKTREE, o->verbose_update);
2026 /* Then loop over entries and update/remove as needed */
2027 ret = UPDATE_SPARSITY_SUCCESS;
2028 for (i = 0; i < o->src_index->cache_nr; i++) {
2029 struct cache_entry *ce = o->src_index->cache[i];
2032 if (ce_stage(ce)) {
2033 /* -1 because for loop will increment by 1 */
2034 i += warn_conflicted_path(o->src_index, i, o) - 1;
2035 ret = UPDATE_SPARSITY_WARNINGS;
2036 continue;
2039 if (apply_sparse_checkout(o->src_index, ce, o))
2040 ret = UPDATE_SPARSITY_WARNINGS;
2043 skip_sparse_checkout:
2044 if (check_updates(o, o->src_index))
2045 ret = UPDATE_SPARSITY_WORKTREE_UPDATE_FAILURES;
2047 display_warning_msgs(o);
2048 o->show_all_errors = old_show_all_errors;
2049 if (free_pattern_list)
2050 clear_pattern_list(&pl);
2051 trace_performance_leave("update_sparsity");
2052 return ret;
2055 /* Here come the merge functions */
2057 static int reject_merge(const struct cache_entry *ce,
2058 struct unpack_trees_options *o)
2060 return add_rejected_path(o, ERROR_WOULD_OVERWRITE, ce->name);
2063 static int same(const struct cache_entry *a, const struct cache_entry *b)
2065 if (!!a != !!b)
2066 return 0;
2067 if (!a && !b)
2068 return 1;
2069 if ((a->ce_flags | b->ce_flags) & CE_CONFLICTED)
2070 return 0;
2071 return a->ce_mode == b->ce_mode &&
2072 oideq(&a->oid, &b->oid);
2077 * When a CE gets turned into an unmerged entry, we
2078 * want it to be up-to-date
2080 static int verify_uptodate_1(const struct cache_entry *ce,
2081 struct unpack_trees_options *o,
2082 enum unpack_trees_error_types error_type)
2084 struct stat st;
2086 if (o->index_only)
2087 return 0;
2090 * CE_VALID and CE_SKIP_WORKTREE cheat, we better check again
2091 * if this entry is truly up-to-date because this file may be
2092 * overwritten.
2094 if ((ce->ce_flags & CE_VALID) || ce_skip_worktree(ce))
2095 ; /* keep checking */
2096 else if (o->reset || ce_uptodate(ce))
2097 return 0;
2099 if (!lstat(ce->name, &st)) {
2100 int flags = CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE;
2101 unsigned changed = ie_match_stat(o->src_index, ce, &st, flags);
2103 if (submodule_from_ce(ce)) {
2104 int r = check_submodule_move_head(ce,
2105 "HEAD", oid_to_hex(&ce->oid), o);
2106 if (r)
2107 return add_rejected_path(o, error_type, ce->name);
2108 return 0;
2111 if (!changed)
2112 return 0;
2114 * Historic default policy was to allow submodule to be out
2115 * of sync wrt the superproject index. If the submodule was
2116 * not considered interesting above, we don't care here.
2118 if (S_ISGITLINK(ce->ce_mode))
2119 return 0;
2121 errno = 0;
2123 if (errno == ENOENT)
2124 return 0;
2125 return add_rejected_path(o, error_type, ce->name);
2128 int verify_uptodate(const struct cache_entry *ce,
2129 struct unpack_trees_options *o)
2131 if (!o->skip_sparse_checkout &&
2132 (ce->ce_flags & CE_SKIP_WORKTREE) &&
2133 (ce->ce_flags & CE_NEW_SKIP_WORKTREE))
2134 return 0;
2135 return verify_uptodate_1(ce, o, ERROR_NOT_UPTODATE_FILE);
2138 static int verify_uptodate_sparse(const struct cache_entry *ce,
2139 struct unpack_trees_options *o)
2141 return verify_uptodate_1(ce, o, WARNING_SPARSE_NOT_UPTODATE_FILE);
2145 * TODO: We should actually invalidate o->result, not src_index [1].
2146 * But since cache tree and untracked cache both are not copied to
2147 * o->result until unpacking is complete, we invalidate them on
2148 * src_index instead with the assumption that they will be copied to
2149 * dst_index at the end.
2151 * [1] src_index->cache_tree is also used in unpack_callback() so if
2152 * we invalidate o->result, we need to update it to use
2153 * o->result.cache_tree as well.
2155 static void invalidate_ce_path(const struct cache_entry *ce,
2156 struct unpack_trees_options *o)
2158 if (!ce)
2159 return;
2160 cache_tree_invalidate_path(o->src_index, ce->name);
2161 untracked_cache_invalidate_path(o->src_index, ce->name, 1);
2165 * Check that checking out ce->sha1 in subdir ce->name is not
2166 * going to overwrite any working files.
2168 static int verify_clean_submodule(const char *old_sha1,
2169 const struct cache_entry *ce,
2170 struct unpack_trees_options *o)
2172 if (!submodule_from_ce(ce))
2173 return 0;
2175 return check_submodule_move_head(ce, old_sha1,
2176 oid_to_hex(&ce->oid), o);
2179 static int verify_clean_subdirectory(const struct cache_entry *ce,
2180 struct unpack_trees_options *o)
2183 * we are about to extract "ce->name"; we would not want to lose
2184 * anything in the existing directory there.
2186 int namelen;
2187 int i;
2188 struct dir_struct d;
2189 char *pathbuf;
2190 int cnt = 0;
2192 if (S_ISGITLINK(ce->ce_mode)) {
2193 struct object_id oid;
2194 int sub_head = resolve_gitlink_ref(ce->name, "HEAD", &oid);
2196 * If we are not going to update the submodule, then
2197 * we don't care.
2199 if (!sub_head && oideq(&oid, &ce->oid))
2200 return 0;
2201 return verify_clean_submodule(sub_head ? NULL : oid_to_hex(&oid),
2202 ce, o);
2206 * First let's make sure we do not have a local modification
2207 * in that directory.
2209 namelen = ce_namelen(ce);
2210 for (i = locate_in_src_index(ce, o);
2211 i < o->src_index->cache_nr;
2212 i++) {
2213 struct cache_entry *ce2 = o->src_index->cache[i];
2214 int len = ce_namelen(ce2);
2215 if (len < namelen ||
2216 strncmp(ce->name, ce2->name, namelen) ||
2217 ce2->name[namelen] != '/')
2218 break;
2220 * ce2->name is an entry in the subdirectory to be
2221 * removed.
2223 if (!ce_stage(ce2)) {
2224 if (verify_uptodate(ce2, o))
2225 return -1;
2226 add_entry(o, ce2, CE_REMOVE, 0);
2227 invalidate_ce_path(ce, o);
2228 mark_ce_used(ce2, o);
2230 cnt++;
2233 /* Do not lose a locally present file that is not ignored. */
2234 pathbuf = xstrfmt("%.*s/", namelen, ce->name);
2236 memset(&d, 0, sizeof(d));
2237 if (o->dir)
2238 d.exclude_per_dir = o->dir->exclude_per_dir;
2239 i = read_directory(&d, o->src_index, pathbuf, namelen+1, NULL);
2240 dir_clear(&d);
2241 free(pathbuf);
2242 if (i)
2243 return add_rejected_path(o, ERROR_NOT_UPTODATE_DIR, ce->name);
2245 /* Do not lose startup_info->original_cwd */
2246 if (startup_info->original_cwd &&
2247 !strcmp(startup_info->original_cwd, ce->name))
2248 return add_rejected_path(o, ERROR_CWD_IN_THE_WAY, ce->name);
2250 return cnt;
2254 * This gets called when there was no index entry for the tree entry 'dst',
2255 * but we found a file in the working tree that 'lstat()' said was fine,
2256 * and we're on a case-insensitive filesystem.
2258 * See if we can find a case-insensitive match in the index that also
2259 * matches the stat information, and assume it's that other file!
2261 static int icase_exists(struct unpack_trees_options *o, const char *name, int len, struct stat *st)
2263 const struct cache_entry *src;
2265 src = index_file_exists(o->src_index, name, len, 1);
2266 return src && !ie_match_stat(o->src_index, src, st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE);
2269 enum absent_checking_type {
2270 COMPLETELY_ABSENT,
2271 ABSENT_ANY_DIRECTORY
2274 static int check_ok_to_remove(const char *name, int len, int dtype,
2275 const struct cache_entry *ce, struct stat *st,
2276 enum unpack_trees_error_types error_type,
2277 enum absent_checking_type absent_type,
2278 struct unpack_trees_options *o)
2280 const struct cache_entry *result;
2283 * It may be that the 'lstat()' succeeded even though
2284 * target 'ce' was absent, because there is an old
2285 * entry that is different only in case..
2287 * Ignore that lstat() if it matches.
2289 if (ignore_case && icase_exists(o, name, len, st))
2290 return 0;
2292 if (o->dir &&
2293 is_excluded(o->dir, o->src_index, name, &dtype))
2295 * ce->name is explicitly excluded, so it is Ok to
2296 * overwrite it.
2298 return 0;
2299 if (S_ISDIR(st->st_mode)) {
2301 * We are checking out path "foo" and
2302 * found "foo/." in the working tree.
2303 * This is tricky -- if we have modified
2304 * files that are in "foo/" we would lose
2305 * them.
2307 if (verify_clean_subdirectory(ce, o) < 0)
2308 return -1;
2309 return 0;
2312 /* If we only care about directories, then we can remove */
2313 if (absent_type == ABSENT_ANY_DIRECTORY)
2314 return 0;
2317 * The previous round may already have decided to
2318 * delete this path, which is in a subdirectory that
2319 * is being replaced with a blob.
2321 result = index_file_exists(&o->result, name, len, 0);
2322 if (result) {
2323 if (result->ce_flags & CE_REMOVE)
2324 return 0;
2327 return add_rejected_path(o, error_type, name);
2331 * We do not want to remove or overwrite a working tree file that
2332 * is not tracked, unless it is ignored.
2334 static int verify_absent_1(const struct cache_entry *ce,
2335 enum unpack_trees_error_types error_type,
2336 enum absent_checking_type absent_type,
2337 struct unpack_trees_options *o)
2339 int len;
2340 struct stat st;
2342 if (o->index_only || !o->update)
2343 return 0;
2345 if (o->reset == UNPACK_RESET_OVERWRITE_UNTRACKED) {
2346 /* Avoid nuking startup_info->original_cwd... */
2347 if (startup_info->original_cwd &&
2348 !strcmp(startup_info->original_cwd, ce->name))
2349 return add_rejected_path(o, ERROR_CWD_IN_THE_WAY,
2350 ce->name);
2351 /* ...but nuke anything else. */
2352 return 0;
2355 len = check_leading_path(ce->name, ce_namelen(ce), 0);
2356 if (!len)
2357 return 0;
2358 else if (len > 0) {
2359 char *path;
2360 int ret;
2362 path = xmemdupz(ce->name, len);
2363 if (lstat(path, &st))
2364 ret = error_errno("cannot stat '%s'", path);
2365 else {
2366 if (submodule_from_ce(ce))
2367 ret = check_submodule_move_head(ce,
2368 oid_to_hex(&ce->oid),
2369 NULL, o);
2370 else
2371 ret = check_ok_to_remove(path, len, DT_UNKNOWN, NULL,
2372 &st, error_type,
2373 absent_type, o);
2375 free(path);
2376 return ret;
2377 } else if (lstat(ce->name, &st)) {
2378 if (errno != ENOENT)
2379 return error_errno("cannot stat '%s'", ce->name);
2380 return 0;
2381 } else {
2382 if (submodule_from_ce(ce))
2383 return check_submodule_move_head(ce, oid_to_hex(&ce->oid),
2384 NULL, o);
2386 return check_ok_to_remove(ce->name, ce_namelen(ce),
2387 ce_to_dtype(ce), ce, &st,
2388 error_type, absent_type, o);
2392 static int verify_absent(const struct cache_entry *ce,
2393 enum unpack_trees_error_types error_type,
2394 struct unpack_trees_options *o)
2396 if (!o->skip_sparse_checkout && (ce->ce_flags & CE_NEW_SKIP_WORKTREE))
2397 return 0;
2398 return verify_absent_1(ce, error_type, COMPLETELY_ABSENT, o);
2401 static int verify_absent_if_directory(const struct cache_entry *ce,
2402 enum unpack_trees_error_types error_type,
2403 struct unpack_trees_options *o)
2405 if (!o->skip_sparse_checkout && (ce->ce_flags & CE_NEW_SKIP_WORKTREE))
2406 return 0;
2407 return verify_absent_1(ce, error_type, ABSENT_ANY_DIRECTORY, o);
2410 static int verify_absent_sparse(const struct cache_entry *ce,
2411 enum unpack_trees_error_types error_type,
2412 struct unpack_trees_options *o)
2414 return verify_absent_1(ce, error_type, COMPLETELY_ABSENT, o);
2417 static int merged_entry(const struct cache_entry *ce,
2418 const struct cache_entry *old,
2419 struct unpack_trees_options *o)
2421 int update = CE_UPDATE;
2422 struct cache_entry *merge = dup_cache_entry(ce, &o->result);
2424 if (!old) {
2426 * New index entries. In sparse checkout, the following
2427 * verify_absent() will be delayed until after
2428 * traverse_trees() finishes in unpack_trees(), then:
2430 * - CE_NEW_SKIP_WORKTREE will be computed correctly
2431 * - verify_absent() be called again, this time with
2432 * correct CE_NEW_SKIP_WORKTREE
2434 * verify_absent() call here does nothing in sparse
2435 * checkout (i.e. o->skip_sparse_checkout == 0)
2437 update |= CE_ADDED;
2438 merge->ce_flags |= CE_NEW_SKIP_WORKTREE;
2440 if (verify_absent(merge,
2441 ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN, o)) {
2442 discard_cache_entry(merge);
2443 return -1;
2445 invalidate_ce_path(merge, o);
2447 if (submodule_from_ce(ce) && file_exists(ce->name)) {
2448 int ret = check_submodule_move_head(ce, NULL,
2449 oid_to_hex(&ce->oid),
2451 if (ret)
2452 return ret;
2455 } else if (!(old->ce_flags & CE_CONFLICTED)) {
2457 * See if we can re-use the old CE directly?
2458 * That way we get the uptodate stat info.
2460 * This also removes the UPDATE flag on a match; otherwise
2461 * we will end up overwriting local changes in the work tree.
2463 if (same(old, merge)) {
2464 copy_cache_entry(merge, old);
2465 update = 0;
2466 } else {
2467 if (verify_uptodate(old, o)) {
2468 discard_cache_entry(merge);
2469 return -1;
2471 /* Migrate old flags over */
2472 update |= old->ce_flags & (CE_SKIP_WORKTREE | CE_NEW_SKIP_WORKTREE);
2473 invalidate_ce_path(old, o);
2476 if (submodule_from_ce(ce) && file_exists(ce->name)) {
2477 int ret = check_submodule_move_head(ce, oid_to_hex(&old->oid),
2478 oid_to_hex(&ce->oid),
2480 if (ret)
2481 return ret;
2483 } else {
2485 * Previously unmerged entry left as an existence
2486 * marker by read_index_unmerged();
2488 if (verify_absent_if_directory(merge,
2489 ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN, o)) {
2490 discard_cache_entry(merge);
2491 return -1;
2494 invalidate_ce_path(old, o);
2497 if (do_add_entry(o, merge, update, CE_STAGEMASK) < 0)
2498 return -1;
2499 return 1;
2502 static int merged_sparse_dir(const struct cache_entry * const *src, int n,
2503 struct unpack_trees_options *o)
2505 struct tree_desc t[MAX_UNPACK_TREES + 1];
2506 void * tree_bufs[MAX_UNPACK_TREES + 1];
2507 struct traverse_info info;
2508 int i, ret;
2511 * Create the tree traversal information for traversing into *only* the
2512 * sparse directory.
2514 setup_traverse_info(&info, src[0]->name);
2515 info.fn = unpack_sparse_callback;
2516 info.data = o;
2517 info.show_all_errors = o->show_all_errors;
2518 info.pathspec = o->pathspec;
2520 /* Get the tree descriptors of the sparse directory in each of the merging trees */
2521 for (i = 0; i < n; i++)
2522 tree_bufs[i] = fill_tree_descriptor(o->src_index->repo, &t[i],
2523 src[i] && !is_null_oid(&src[i]->oid) ? &src[i]->oid : NULL);
2525 ret = traverse_trees(o->src_index, n, t, &info);
2527 for (i = 0; i < n; i++)
2528 free(tree_bufs[i]);
2530 return ret;
2533 static int deleted_entry(const struct cache_entry *ce,
2534 const struct cache_entry *old,
2535 struct unpack_trees_options *o)
2537 /* Did it exist in the index? */
2538 if (!old) {
2539 if (verify_absent(ce, ERROR_WOULD_LOSE_UNTRACKED_REMOVED, o))
2540 return -1;
2541 return 0;
2542 } else if (verify_absent_if_directory(ce, ERROR_WOULD_LOSE_UNTRACKED_REMOVED, o)) {
2543 return -1;
2546 if (!(old->ce_flags & CE_CONFLICTED) && verify_uptodate(old, o))
2547 return -1;
2548 add_entry(o, ce, CE_REMOVE, 0);
2549 invalidate_ce_path(ce, o);
2550 return 1;
2553 static int keep_entry(const struct cache_entry *ce,
2554 struct unpack_trees_options *o)
2556 add_entry(o, ce, 0, 0);
2557 if (ce_stage(ce))
2558 invalidate_ce_path(ce, o);
2559 return 1;
2562 #if DBRT_DEBUG
2563 static void show_stage_entry(FILE *o,
2564 const char *label, const struct cache_entry *ce)
2566 if (!ce)
2567 fprintf(o, "%s (missing)\n", label);
2568 else
2569 fprintf(o, "%s%06o %s %d\t%s\n",
2570 label,
2571 ce->ce_mode,
2572 oid_to_hex(&ce->oid),
2573 ce_stage(ce),
2574 ce->name);
2576 #endif
2578 int threeway_merge(const struct cache_entry * const *stages,
2579 struct unpack_trees_options *o)
2581 const struct cache_entry *index;
2582 const struct cache_entry *head;
2583 const struct cache_entry *remote = stages[o->head_idx + 1];
2584 int count;
2585 int head_match = 0;
2586 int remote_match = 0;
2588 int df_conflict_head = 0;
2589 int df_conflict_remote = 0;
2591 int any_anc_missing = 0;
2592 int no_anc_exists = 1;
2593 int i;
2595 for (i = 1; i < o->head_idx; i++) {
2596 if (!stages[i] || stages[i] == o->df_conflict_entry)
2597 any_anc_missing = 1;
2598 else
2599 no_anc_exists = 0;
2602 index = stages[0];
2603 head = stages[o->head_idx];
2605 if (head == o->df_conflict_entry) {
2606 df_conflict_head = 1;
2607 head = NULL;
2610 if (remote == o->df_conflict_entry) {
2611 df_conflict_remote = 1;
2612 remote = NULL;
2616 * First, if there's a #16 situation, note that to prevent #13
2617 * and #14.
2619 if (!same(remote, head)) {
2620 for (i = 1; i < o->head_idx; i++) {
2621 if (same(stages[i], head)) {
2622 head_match = i;
2624 if (same(stages[i], remote)) {
2625 remote_match = i;
2631 * We start with cases where the index is allowed to match
2632 * something other than the head: #14(ALT) and #2ALT, where it
2633 * is permitted to match the result instead.
2635 /* #14, #14ALT, #2ALT */
2636 if (remote && !df_conflict_head && head_match && !remote_match) {
2637 if (index && !same(index, remote) && !same(index, head)) {
2638 if (S_ISSPARSEDIR(index->ce_mode))
2639 return merged_sparse_dir(stages, 4, o);
2640 else
2641 return reject_merge(index, o);
2643 return merged_entry(remote, index, o);
2646 * If we have an entry in the index cache, then we want to
2647 * make sure that it matches head.
2649 if (index && !same(index, head)) {
2650 if (S_ISSPARSEDIR(index->ce_mode))
2651 return merged_sparse_dir(stages, 4, o);
2652 else
2653 return reject_merge(index, o);
2656 if (head) {
2657 /* #5ALT, #15 */
2658 if (same(head, remote))
2659 return merged_entry(head, index, o);
2660 /* #13, #3ALT */
2661 if (!df_conflict_remote && remote_match && !head_match)
2662 return merged_entry(head, index, o);
2665 /* #1 */
2666 if (!head && !remote && any_anc_missing)
2667 return 0;
2670 * Under the "aggressive" rule, we resolve mostly trivial
2671 * cases that we historically had git-merge-one-file resolve.
2673 if (o->aggressive) {
2674 int head_deleted = !head;
2675 int remote_deleted = !remote;
2676 const struct cache_entry *ce = NULL;
2678 if (index)
2679 ce = index;
2680 else if (head)
2681 ce = head;
2682 else if (remote)
2683 ce = remote;
2684 else {
2685 for (i = 1; i < o->head_idx; i++) {
2686 if (stages[i] && stages[i] != o->df_conflict_entry) {
2687 ce = stages[i];
2688 break;
2694 * Deleted in both.
2695 * Deleted in one and unchanged in the other.
2697 if ((head_deleted && remote_deleted) ||
2698 (head_deleted && remote && remote_match) ||
2699 (remote_deleted && head && head_match)) {
2700 if (index)
2701 return deleted_entry(index, index, o);
2702 if (ce && !head_deleted) {
2703 if (verify_absent(ce, ERROR_WOULD_LOSE_UNTRACKED_REMOVED, o))
2704 return -1;
2706 return 0;
2709 * Added in both, identically.
2711 if (no_anc_exists && head && remote && same(head, remote))
2712 return merged_entry(head, index, o);
2716 /* Handle "no merge" cases (see t/t1000-read-tree-m-3way.sh) */
2717 if (index) {
2719 * If we've reached the "no merge" cases and we're merging
2720 * a sparse directory, we may have an "edit/edit" conflict that
2721 * can be resolved by individually merging directory contents.
2723 if (S_ISSPARSEDIR(index->ce_mode))
2724 return merged_sparse_dir(stages, 4, o);
2727 * If we're not merging a sparse directory, ensure the index is
2728 * up-to-date to avoid files getting overwritten with conflict
2729 * resolution files
2731 if (verify_uptodate(index, o))
2732 return -1;
2735 o->nontrivial_merge = 1;
2737 /* #2, #3, #4, #6, #7, #9, #10, #11. */
2738 count = 0;
2739 if (!head_match || !remote_match) {
2740 for (i = 1; i < o->head_idx; i++) {
2741 if (stages[i] && stages[i] != o->df_conflict_entry) {
2742 keep_entry(stages[i], o);
2743 count++;
2744 break;
2748 #if DBRT_DEBUG
2749 else {
2750 fprintf(stderr, "read-tree: warning #16 detected\n");
2751 show_stage_entry(stderr, "head ", stages[head_match]);
2752 show_stage_entry(stderr, "remote ", stages[remote_match]);
2754 #endif
2755 if (head) { count += keep_entry(head, o); }
2756 if (remote) { count += keep_entry(remote, o); }
2757 return count;
2761 * Two-way merge.
2763 * The rule is to "carry forward" what is in the index without losing
2764 * information across a "fast-forward", favoring a successful merge
2765 * over a merge failure when it makes sense. For details of the
2766 * "carry forward" rule, please see <Documentation/git-read-tree.txt>.
2769 int twoway_merge(const struct cache_entry * const *src,
2770 struct unpack_trees_options *o)
2772 const struct cache_entry *current = src[0];
2773 const struct cache_entry *oldtree = src[1];
2774 const struct cache_entry *newtree = src[2];
2776 if (o->merge_size != 2)
2777 return error("Cannot do a twoway merge of %d trees",
2778 o->merge_size);
2780 if (oldtree == o->df_conflict_entry)
2781 oldtree = NULL;
2782 if (newtree == o->df_conflict_entry)
2783 newtree = NULL;
2785 if (current) {
2786 if (current->ce_flags & CE_CONFLICTED) {
2787 if (same(oldtree, newtree) || o->reset) {
2788 if (!newtree)
2789 return deleted_entry(current, current, o);
2790 else
2791 return merged_entry(newtree, current, o);
2793 return reject_merge(current, o);
2794 } else if ((!oldtree && !newtree) || /* 4 and 5 */
2795 (!oldtree && newtree &&
2796 same(current, newtree)) || /* 6 and 7 */
2797 (oldtree && newtree &&
2798 same(oldtree, newtree)) || /* 14 and 15 */
2799 (oldtree && newtree &&
2800 !same(oldtree, newtree) && /* 18 and 19 */
2801 same(current, newtree))) {
2802 return keep_entry(current, o);
2803 } else if (oldtree && !newtree && same(current, oldtree)) {
2804 /* 10 or 11 */
2805 return deleted_entry(oldtree, current, o);
2806 } else if (oldtree && newtree &&
2807 same(current, oldtree) && !same(current, newtree)) {
2808 /* 20 or 21 */
2809 return merged_entry(newtree, current, o);
2810 } else if (current && !oldtree && newtree &&
2811 S_ISSPARSEDIR(current->ce_mode) != S_ISSPARSEDIR(newtree->ce_mode) &&
2812 ce_stage(current) == 0) {
2814 * This case is a directory/file conflict across the sparse-index
2815 * boundary. When we are changing from one path to another via
2816 * 'git checkout', then we want to replace one entry with another
2817 * via merged_entry(). If there are staged changes, then we should
2818 * reject the merge instead.
2820 return merged_entry(newtree, current, o);
2821 } else if (S_ISSPARSEDIR(current->ce_mode)) {
2823 * The sparse directories differ, but we don't know whether that's
2824 * because of two different files in the directory being modified
2825 * (can be trivially merged) or if there is a real file conflict.
2826 * Merge the sparse directory by OID to compare file-by-file.
2828 return merged_sparse_dir(src, 3, o);
2829 } else
2830 return reject_merge(current, o);
2832 else if (newtree) {
2833 if (oldtree && !o->initial_checkout) {
2835 * deletion of the path was staged;
2837 if (same(oldtree, newtree))
2838 return 1;
2839 return reject_merge(oldtree, o);
2841 return merged_entry(newtree, current, o);
2843 return deleted_entry(oldtree, current, o);
2847 * Bind merge.
2849 * Keep the index entries at stage0, collapse stage1 but make sure
2850 * stage0 does not have anything there.
2852 int bind_merge(const struct cache_entry * const *src,
2853 struct unpack_trees_options *o)
2855 const struct cache_entry *old = src[0];
2856 const struct cache_entry *a = src[1];
2858 if (o->merge_size != 1)
2859 return error("Cannot do a bind merge of %d trees",
2860 o->merge_size);
2861 if (a && old)
2862 return o->quiet ? -1 :
2863 error(ERRORMSG(o, ERROR_BIND_OVERLAP),
2864 super_prefixed(a->name),
2865 super_prefixed(old->name));
2866 if (!a)
2867 return keep_entry(old, o);
2868 else
2869 return merged_entry(a, NULL, o);
2873 * One-way merge.
2875 * The rule is:
2876 * - take the stat information from stage0, take the data from stage1
2878 int oneway_merge(const struct cache_entry * const *src,
2879 struct unpack_trees_options *o)
2881 const struct cache_entry *old = src[0];
2882 const struct cache_entry *a = src[1];
2884 if (o->merge_size != 1)
2885 return error("Cannot do a oneway merge of %d trees",
2886 o->merge_size);
2888 if (!a || a == o->df_conflict_entry)
2889 return deleted_entry(old, old, o);
2891 if (old && same(old, a)) {
2892 int update = 0;
2893 if (o->reset && o->update && !ce_uptodate(old) && !ce_skip_worktree(old) &&
2894 !(old->ce_flags & CE_FSMONITOR_VALID)) {
2895 struct stat st;
2896 if (lstat(old->name, &st) ||
2897 ie_match_stat(o->src_index, old, &st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE))
2898 update |= CE_UPDATE;
2900 if (o->update && S_ISGITLINK(old->ce_mode) &&
2901 should_update_submodules() && !verify_uptodate(old, o))
2902 update |= CE_UPDATE;
2903 add_entry(o, old, update, CE_STAGEMASK);
2904 return 0;
2906 return merged_entry(a, old, o);
2910 * Merge worktree and untracked entries in a stash entry.
2912 * Ignore all index entries. Collapse remaining trees but make sure that they
2913 * don't have any conflicting files.
2915 int stash_worktree_untracked_merge(const struct cache_entry * const *src,
2916 struct unpack_trees_options *o)
2918 const struct cache_entry *worktree = src[1];
2919 const struct cache_entry *untracked = src[2];
2921 if (o->merge_size != 2)
2922 BUG("invalid merge_size: %d", o->merge_size);
2924 if (worktree && untracked)
2925 return error(_("worktree and untracked commit have duplicate entries: %s"),
2926 super_prefixed(worktree->name));
2928 return merged_entry(worktree ? worktree : untracked, NULL, o);