user-manual.txt: render ASCII art correctly under Asciidoctor
[git/git.git] / unpack-trees.c
CommitLineData
16da134b 1#include "cache.h"
1c41d280 2#include "argv-array.h"
33028713 3#include "repository.h"
b2141fc1 4#include "config.h"
f8a9d428 5#include "dir.h"
16da134b
JS
6#include "tree.h"
7#include "tree-walk.h"
076b0adc 8#include "cache-tree.h"
16da134b 9#include "unpack-trees.h"
96a02f8f 10#include "progress.h"
0cf73755 11#include "refs.h"
06f33c17 12#include "attr.h"
5fc2fc8f 13#include "split-index.h"
e931371a 14#include "dir.h"
a7bc845a
SB
15#include "submodule.h"
16#include "submodule-config.h"
883e248b 17#include "fsmonitor.h"
cbd53a21 18#include "object-store.h"
c0c578b3 19#include "fetch-object.h"
16da134b 20
8ccba008
JH
21/*
22 * Error messages expected by scripts out of plumbing commands such as
23 * read-tree. Non-scripted Porcelain is not required to use these messages
24 * and in fact are encouraged to reword them to better suit their particular
23cbf11b 25 * situation better. See how "git checkout" and "git merge" replaces
dc1166e6 26 * them using setup_unpack_trees_porcelain(), for example.
8ccba008 27 */
c2e86add 28static const char *unpack_plumbing_errors[NB_UNPACK_TREES_ERROR_TYPES] = {
08353ebb 29 /* ERROR_WOULD_OVERWRITE */
8ccba008
JH
30 "Entry '%s' would be overwritten by merge. Cannot merge.",
31
08353ebb 32 /* ERROR_NOT_UPTODATE_FILE */
8ccba008
JH
33 "Entry '%s' not uptodate. Cannot merge.",
34
08353ebb 35 /* ERROR_NOT_UPTODATE_DIR */
8ccba008
JH
36 "Updating '%s' would lose untracked files in it",
37
08402b04
MM
38 /* ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN */
39 "Untracked working tree file '%s' would be overwritten by merge.",
8ccba008 40
08402b04
MM
41 /* ERROR_WOULD_LOSE_UNTRACKED_REMOVED */
42 "Untracked working tree file '%s' would be removed by merge.",
8ccba008 43
08353ebb 44 /* ERROR_BIND_OVERLAP */
8ccba008 45 "Entry '%s' overlaps with '%s'. Cannot bind.",
e800ec9d 46
08353ebb 47 /* ERROR_SPARSE_NOT_UPTODATE_FILE */
e800ec9d
NTND
48 "Entry '%s' not uptodate. Cannot update sparse checkout.",
49
08402b04
MM
50 /* ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN */
51 "Working tree file '%s' would be overwritten by sparse checkout update.",
52
53 /* ERROR_WOULD_LOSE_ORPHANED_REMOVED */
54 "Working tree file '%s' would be removed by sparse checkout update.",
a7bc845a
SB
55
56 /* ERROR_WOULD_LOSE_SUBMODULE */
57 "Submodule '%s' cannot checkout new HEAD.",
8ccba008
JH
58};
59
08353ebb
MM
60#define ERRORMSG(o,type) \
61 ( ((o) && (o)->msgs[(type)]) \
62 ? ((o)->msgs[(type)]) \
63 : (unpack_plumbing_errors[(type)]) )
8ccba008 64
3d415425
SB
65static const char *super_prefixed(const char *path)
66{
67 /*
68 * It is necessary and sufficient to have two static buffers
69 * here, as the return value of this function is fed to
70 * error() using the unpack_*_errors[] templates we see above.
71 */
72 static struct strbuf buf[2] = {STRBUF_INIT, STRBUF_INIT};
73 static int super_prefix_len = -1;
74 static unsigned idx = ARRAY_SIZE(buf) - 1;
75
76 if (super_prefix_len < 0) {
77 const char *super_prefix = get_super_prefix();
78 if (!super_prefix) {
79 super_prefix_len = 0;
80 } else {
81 int i;
82 for (i = 0; i < ARRAY_SIZE(buf); i++)
83 strbuf_addstr(&buf[i], super_prefix);
84 super_prefix_len = buf[0].len;
85 }
86 }
87
88 if (!super_prefix_len)
89 return path;
90
91 if (++idx >= ARRAY_SIZE(buf))
92 idx = 0;
93
94 strbuf_setlen(&buf[idx], super_prefix_len);
95 strbuf_addstr(&buf[idx], path);
96
97 return buf[idx].buf;
98}
99
e294030f
MM
100void setup_unpack_trees_porcelain(struct unpack_trees_options *opts,
101 const char *cmd)
dc1166e6 102{
7980872d 103 int i;
e294030f 104 const char **msgs = opts->msgs;
dc1166e6 105 const char *msg;
fa3f60b7 106
1c41d280
107 argv_array_init(&opts->msgs_to_free);
108
2e3926b9
VA
109 if (!strcmp(cmd, "checkout"))
110 msg = advice_commit_before_merge
111 ? _("Your local changes to the following files would be overwritten by checkout:\n%%s"
c2691e2a 112 "Please commit your changes or stash them before you switch branches.")
2e3926b9
VA
113 : _("Your local changes to the following files would be overwritten by checkout:\n%%s");
114 else if (!strcmp(cmd, "merge"))
115 msg = advice_commit_before_merge
116 ? _("Your local changes to the following files would be overwritten by merge:\n%%s"
c2691e2a 117 "Please commit your changes or stash them before you merge.")
2e3926b9 118 : _("Your local changes to the following files would be overwritten by merge:\n%%s");
dc1166e6 119 else
2e3926b9
VA
120 msg = advice_commit_before_merge
121 ? _("Your local changes to the following files would be overwritten by %s:\n%%s"
c2691e2a 122 "Please commit your changes or stash them before you %s.")
2e3926b9 123 : _("Your local changes to the following files would be overwritten by %s:\n%%s");
fa3f60b7 124 msgs[ERROR_WOULD_OVERWRITE] = msgs[ERROR_NOT_UPTODATE_FILE] =
1c41d280 125 argv_array_pushf(&opts->msgs_to_free, msg, cmd, cmd);
dc1166e6
MM
126
127 msgs[ERROR_NOT_UPTODATE_DIR] =
584f99c8 128 _("Updating the following directories would lose untracked files in them:\n%s");
dc1166e6 129
2e3926b9
VA
130 if (!strcmp(cmd, "checkout"))
131 msg = advice_commit_before_merge
132 ? _("The following untracked working tree files would be removed by checkout:\n%%s"
c2691e2a 133 "Please move or remove them before you switch branches.")
2e3926b9
VA
134 : _("The following untracked working tree files would be removed by checkout:\n%%s");
135 else if (!strcmp(cmd, "merge"))
136 msg = advice_commit_before_merge
137 ? _("The following untracked working tree files would be removed by merge:\n%%s"
c2691e2a 138 "Please move or remove them before you merge.")
2e3926b9 139 : _("The following untracked working tree files would be removed by merge:\n%%s");
dc1166e6 140 else
2e3926b9
VA
141 msg = advice_commit_before_merge
142 ? _("The following untracked working tree files would be removed by %s:\n%%s"
c2691e2a 143 "Please move or remove them before you %s.")
2e3926b9 144 : _("The following untracked working tree files would be removed by %s:\n%%s");
1c41d280
145 msgs[ERROR_WOULD_LOSE_UNTRACKED_REMOVED] =
146 argv_array_pushf(&opts->msgs_to_free, msg, cmd, cmd);
2e3926b9
VA
147
148 if (!strcmp(cmd, "checkout"))
149 msg = advice_commit_before_merge
150 ? _("The following untracked working tree files would be overwritten by checkout:\n%%s"
c2691e2a 151 "Please move or remove them before you switch branches.")
2e3926b9
VA
152 : _("The following untracked working tree files would be overwritten by checkout:\n%%s");
153 else if (!strcmp(cmd, "merge"))
154 msg = advice_commit_before_merge
155 ? _("The following untracked working tree files would be overwritten by merge:\n%%s"
c2691e2a 156 "Please move or remove them before you merge.")
2e3926b9
VA
157 : _("The following untracked working tree files would be overwritten by merge:\n%%s");
158 else
159 msg = advice_commit_before_merge
160 ? _("The following untracked working tree files would be overwritten by %s:\n%%s"
c2691e2a 161 "Please move or remove them before you %s.")
2e3926b9 162 : _("The following untracked working tree files would be overwritten by %s:\n%%s");
1c41d280
163 msgs[ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN] =
164 argv_array_pushf(&opts->msgs_to_free, msg, cmd, cmd);
dc1166e6
MM
165
166 /*
167 * Special case: ERROR_BIND_OVERLAP refers to a pair of paths, we
168 * cannot easily display it as a list.
169 */
ed47fdf7 170 msgs[ERROR_BIND_OVERLAP] = _("Entry '%s' overlaps with '%s'. Cannot bind.");
dc1166e6
MM
171
172 msgs[ERROR_SPARSE_NOT_UPTODATE_FILE] =
7560f547 173 _("Cannot update sparse checkout: the following entries are not up to date:\n%s");
dc1166e6 174 msgs[ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN] =
a1c80446 175 _("The following working tree files would be overwritten by sparse checkout update:\n%s");
dc1166e6 176 msgs[ERROR_WOULD_LOSE_ORPHANED_REMOVED] =
a1c80446 177 _("The following working tree files would be removed by sparse checkout update:\n%s");
a7bc845a 178 msgs[ERROR_WOULD_LOSE_SUBMODULE] =
6362ed0b 179 _("Cannot update submodule:\n%s");
5e65ee35
MM
180
181 opts->show_all_errors = 1;
7980872d
CB
182 /* rejected paths may not have a static buffer */
183 for (i = 0; i < ARRAY_SIZE(opts->unpack_rejects); i++)
184 opts->unpack_rejects[i].strdup_strings = 1;
dc1166e6
MM
185}
186
1c41d280
187void clear_unpack_trees_porcelain(struct unpack_trees_options *opts)
188{
189 argv_array_clear(&opts->msgs_to_free);
190 memset(opts->msgs, 0, sizeof(opts->msgs));
191}
192
46169180 193static int do_add_entry(struct unpack_trees_options *o, struct cache_entry *ce,
6ff264ee 194 unsigned int set, unsigned int clear)
b48d5a05 195{
419a597f 196 clear |= CE_HASHED;
34110cd4 197
700e66d6
NTND
198 if (set & CE_REMOVE)
199 set |= CE_WT_REMOVE;
200
6ff264ee 201 ce->ce_flags = (ce->ce_flags & ~clear) | set;
46169180
JK
202 return add_index_entry(&o->result, ce,
203 ADD_CACHE_OK_TO_ADD | ADD_CACHE_OK_TO_REPLACE);
6ff264ee
RS
204}
205
a33bd4d3
RS
206static void add_entry(struct unpack_trees_options *o,
207 const struct cache_entry *ce,
208 unsigned int set, unsigned int clear)
209{
8e72d675 210 do_add_entry(o, dup_cache_entry(ce, &o->result), set, clear);
b48d5a05
LT
211}
212
e6c111b4
MM
213/*
214 * add error messages on path <path>
215 * corresponding to the type <e> with the message <msg>
216 * indicating if it should be display in porcelain or not
217 */
218static int add_rejected_path(struct unpack_trees_options *o,
219 enum unpack_trees_error_types e,
220 const char *path)
221{
b165fac8 222 if (o->quiet)
191e9d2c
NTND
223 return -1;
224
e6c111b4 225 if (!o->show_all_errors)
3d415425 226 return error(ERRORMSG(o, e), super_prefixed(path));
e6c111b4
MM
227
228 /*
229 * Otherwise, insert in a list for future display by
230 * display_error_msgs()
231 */
7980872d 232 string_list_append(&o->unpack_rejects[e], path);
e6c111b4
MM
233 return -1;
234}
235
e6c111b4
MM
236/*
237 * display all the error messages stored in a nice way
238 */
239static void display_error_msgs(struct unpack_trees_options *o)
240{
7980872d 241 int e, i;
e6c111b4
MM
242 int something_displayed = 0;
243 for (e = 0; e < NB_UNPACK_TREES_ERROR_TYPES; e++) {
7980872d
CB
244 struct string_list *rejects = &o->unpack_rejects[e];
245 if (rejects->nr > 0) {
e6c111b4
MM
246 struct strbuf path = STRBUF_INIT;
247 something_displayed = 1;
7980872d
CB
248 for (i = 0; i < rejects->nr; i++)
249 strbuf_addf(&path, "\t%s\n", rejects->items[i].string);
3d415425 250 error(ERRORMSG(o, e), super_prefixed(path.buf));
e6c111b4 251 strbuf_release(&path);
e6c111b4 252 }
7980872d 253 string_list_clear(rejects, 0);
e6c111b4
MM
254 }
255 if (something_displayed)
ed47fdf7 256 fprintf(stderr, _("Aborting\n"));
e6c111b4
MM
257}
258
a7bc845a
SB
259static int check_submodule_move_head(const struct cache_entry *ce,
260 const char *old_id,
261 const char *new_id,
262 struct unpack_trees_options *o)
263{
cd279e2e 264 unsigned flags = SUBMODULE_MOVE_HEAD_DRY_RUN;
a7bc845a 265 const struct submodule *sub = submodule_from_ce(ce);
7463e2ec 266
a7bc845a
SB
267 if (!sub)
268 return 0;
269
cd279e2e
SB
270 if (o->reset)
271 flags |= SUBMODULE_MOVE_HEAD_FORCE;
272
7463e2ec 273 if (submodule_move_head(ce->name, old_id, new_id, flags))
191e9d2c 274 return add_rejected_path(o, ERROR_WOULD_LOSE_SUBMODULE, ce->name);
7463e2ec 275 return 0;
a7bc845a
SB
276}
277
33028713
BW
278/*
279 * Preform the loading of the repository's gitmodules file. This function is
280 * used by 'check_update()' to perform loading of the gitmodules file in two
281 * differnt situations:
282 * (1) before removing entries from the working tree if the gitmodules file has
283 * been marked for removal. This situation is specified by 'state' == NULL.
284 * (2) before checking out entries to the working tree if the gitmodules file
285 * has been marked for update. This situation is specified by 'state' != NULL.
286 */
287static void load_gitmodules_file(struct index_state *index,
288 struct checkout *state)
a7bc845a 289{
33028713
BW
290 int pos = index_name_pos(index, GITMODULES_FILE, strlen(GITMODULES_FILE));
291
292 if (pos >= 0) {
293 struct cache_entry *ce = index->cache[pos];
294 if (!state && ce->ce_flags & CE_WT_REMOVE) {
295 repo_read_gitmodules(the_repository);
296 } else if (state && (ce->ce_flags & CE_UPDATE)) {
f793b895 297 submodule_free(the_repository);
0f086e6d 298 checkout_entry(ce, state, NULL, NULL);
33028713 299 repo_read_gitmodules(the_repository);
a7bc845a
SB
300 }
301 }
302}
303
384f1a16 304static struct progress *get_progress(struct unpack_trees_options *o)
16da134b 305{
96a02f8f 306 unsigned cnt = 0, total = 0;
384f1a16
SB
307 struct index_state *index = &o->result;
308
309 if (!o->update || !o->verbose_update)
310 return NULL;
311
312 for (; cnt < index->cache_nr; cnt++) {
313 const struct cache_entry *ce = index->cache[cnt];
314 if (ce->ce_flags & (CE_UPDATE | CE_WT_REMOVE))
315 total++;
316 }
317
328c6cb8 318 return start_delayed_progress(_("Updating files"), total);
384f1a16
SB
319}
320
b878579a
NTND
321static void setup_collided_checkout_detection(struct checkout *state,
322 struct index_state *index)
323{
324 int i;
325
326 state->clone = 1;
327 for (i = 0; i < index->cache_nr; i++)
328 index->cache[i]->ce_flags &= ~CE_MATCHED;
329}
330
331static void report_collided_checkout(struct index_state *index)
332{
333 struct string_list list = STRING_LIST_INIT_NODUP;
334 int i;
335
336 for (i = 0; i < index->cache_nr; i++) {
337 struct cache_entry *ce = index->cache[i];
338
339 if (!(ce->ce_flags & CE_MATCHED))
340 continue;
341
342 string_list_append(&list, ce->name);
343 ce->ce_flags &= ~CE_MATCHED;
344 }
345
346 list.cmp = fspathcmp;
347 string_list_sort(&list);
348
349 if (list.nr) {
350 warning(_("the following paths have collided (e.g. case-sensitive paths\n"
351 "on a case-insensitive filesystem) and only one from the same\n"
352 "colliding group is in the working tree:\n"));
353
354 for (i = 0; i < list.nr; i++)
355 fprintf(stderr, " '%s'\n", list.items[i].string);
356 }
357
358 string_list_clear(&list, 0);
359}
360
384f1a16
SB
361static int check_updates(struct unpack_trees_options *o)
362{
363 unsigned cnt = 0;
30ac275b 364 int errs = 0;
07f967ad 365 struct progress *progress;
34110cd4 366 struct index_state *index = &o->result;
30ac275b 367 struct checkout state = CHECKOUT_INIT;
33ecf7eb 368 int i;
16da134b 369
0d1ed596 370 trace_performance_enter();
30ac275b
SB
371 state.force = 1;
372 state.quiet = 1;
373 state.refresh_cache = 1;
374 state.istate = index;
16da134b 375
b878579a
NTND
376 if (o->clone)
377 setup_collided_checkout_detection(&state, index);
378
384f1a16 379 progress = get_progress(o);
16da134b 380
66985e66 381 if (o->update)
c4500e25 382 git_attr_set_direction(GIT_ATTR_CHECKOUT);
33028713
BW
383
384 if (should_update_submodules() && o->update && !o->dry_run)
385 load_gitmodules_file(index, NULL);
386
34110cd4 387 for (i = 0; i < index->cache_nr; i++) {
9c5e6c80 388 const struct cache_entry *ce = index->cache[i];
16da134b 389
e663db2f
NTND
390 if (ce->ce_flags & CE_WT_REMOVE) {
391 display_progress(progress, ++cnt);
2c9078d0 392 if (o->update && !o->dry_run)
e663db2f 393 unlink_entry(ce);
e663db2f 394 }
1fa6ead4 395 }
6fdc2057 396 remove_marked_cache_entries(index, 0);
78478927 397 remove_scheduled_dirs();
1fa6ead4 398
a7bc845a 399 if (should_update_submodules() && o->update && !o->dry_run)
33028713 400 load_gitmodules_file(index, &state);
a7bc845a 401
2841e8f8 402 enable_delayed_checkout(&state);
c0c578b3
JT
403 if (repository_format_partial_clone && o->update && !o->dry_run) {
404 /*
405 * Prefetch the objects that are to be checked out in the loop
406 * below.
407 */
408 struct oid_array to_fetch = OID_ARRAY_INIT;
c0c578b3
JT
409 for (i = 0; i < index->cache_nr; i++) {
410 struct cache_entry *ce = index->cache[i];
0f4a4fb1
JT
411
412 if (!(ce->ce_flags & CE_UPDATE) ||
413 S_ISGITLINK(ce->ce_mode))
414 continue;
415 if (!oid_object_info_extended(the_repository, &ce->oid,
416 NULL,
417 OBJECT_INFO_FOR_PREFETCH))
418 continue;
419 oid_array_append(&to_fetch, &ce->oid);
c0c578b3
JT
420 }
421 if (to_fetch.nr)
422 fetch_objects(repository_format_partial_clone,
8708ca09 423 to_fetch.oid, to_fetch.nr);
9f242a13 424 oid_array_clear(&to_fetch);
c0c578b3 425 }
1fa6ead4
LT
426 for (i = 0; i < index->cache_nr; i++) {
427 struct cache_entry *ce = index->cache[i];
428
7a51ed66 429 if (ce->ce_flags & CE_UPDATE) {
7d782416 430 if (ce->ce_flags & CE_WT_REMOVE)
033abf97 431 BUG("both update and delete flags are set on %s",
7d782416 432 ce->name);
1fa6ead4 433 display_progress(progress, ++cnt);
7a51ed66 434 ce->ce_flags &= ~CE_UPDATE;
2c9078d0 435 if (o->update && !o->dry_run) {
0f086e6d 436 errs |= checkout_entry(ce, &state, NULL, NULL);
16a4c617 437 }
16da134b
JS
438 }
439 }
4d4fcc54 440 stop_progress(&progress);
0f086e6d 441 errs |= finish_delayed_checkout(&state, NULL);
66985e66 442 if (o->update)
c4500e25 443 git_attr_set_direction(GIT_ATTR_CHECKIN);
b878579a
NTND
444
445 if (o->clone)
446 report_collided_checkout(index);
447
0d1ed596 448 trace_performance_leave("check_updates");
c4758d3c 449 return errs != 0;
16da134b
JS
450}
451
eb9ae4b5
RS
452static int verify_uptodate_sparse(const struct cache_entry *ce,
453 struct unpack_trees_options *o);
454static int verify_absent_sparse(const struct cache_entry *ce,
455 enum unpack_trees_error_types,
456 struct unpack_trees_options *o);
e800ec9d 457
a5c446f1
NTND
458static int apply_sparse_checkout(struct index_state *istate,
459 struct cache_entry *ce,
460 struct unpack_trees_options *o)
e800ec9d
NTND
461{
462 int was_skip_worktree = ce_skip_worktree(ce);
463
2431afbf 464 if (ce->ce_flags & CE_NEW_SKIP_WORKTREE)
e800ec9d
NTND
465 ce->ce_flags |= CE_SKIP_WORKTREE;
466 else
467 ce->ce_flags &= ~CE_SKIP_WORKTREE;
078a58e8
NTND
468 if (was_skip_worktree != ce_skip_worktree(ce)) {
469 ce->ce_flags |= CE_UPDATE_IN_BASE;
883e248b 470 mark_fsmonitor_invalid(istate, ce);
a5c446f1 471 istate->cache_changed |= CE_ENTRY_CHANGED;
078a58e8 472 }
e800ec9d
NTND
473
474 /*
eec3fc03
NTND
475 * if (!was_skip_worktree && !ce_skip_worktree()) {
476 * This is perfectly normal. Move on;
477 * }
e800ec9d 478 */
eec3fc03
NTND
479
480 /*
481 * Merge strategies may set CE_UPDATE|CE_REMOVE outside checkout
482 * area as a result of ce_skip_worktree() shortcuts in
700e66d6
NTND
483 * verify_absent() and verify_uptodate().
484 * Make sure they don't modify worktree if they are already
485 * outside checkout area
eec3fc03 486 */
700e66d6
NTND
487 if (was_skip_worktree && ce_skip_worktree(ce)) {
488 ce->ce_flags &= ~CE_UPDATE;
489
490 /*
491 * By default, when CE_REMOVE is on, CE_WT_REMOVE is also
492 * on to get that file removed from both index and worktree.
493 * If that file is already outside worktree area, don't
494 * bother remove it.
495 */
496 if (ce->ce_flags & CE_REMOVE)
497 ce->ce_flags &= ~CE_WT_REMOVE;
498 }
e800ec9d
NTND
499
500 if (!was_skip_worktree && ce_skip_worktree(ce)) {
501 /*
502 * If CE_UPDATE is set, verify_uptodate() must be called already
503 * also stat info may have lost after merged_entry() so calling
504 * verify_uptodate() again may fail
505 */
506 if (!(ce->ce_flags & CE_UPDATE) && verify_uptodate_sparse(ce, o))
507 return -1;
508 ce->ce_flags |= CE_WT_REMOVE;
7d782416 509 ce->ce_flags &= ~CE_UPDATE;
e800ec9d
NTND
510 }
511 if (was_skip_worktree && !ce_skip_worktree(ce)) {
08402b04 512 if (verify_absent_sparse(ce, ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN, o))
e800ec9d
NTND
513 return -1;
514 ce->ce_flags |= CE_UPDATE;
515 }
516 return 0;
517}
518
5828e835
RS
519static inline int call_unpack_fn(const struct cache_entry * const *src,
520 struct unpack_trees_options *o)
01904572 521{
34110cd4
LT
522 int ret = o->fn(src, o);
523 if (ret > 0)
01904572 524 ret = 0;
01904572
LT
525 return ret;
526}
527
da165f47
JH
528static void mark_ce_used(struct cache_entry *ce, struct unpack_trees_options *o)
529{
530 ce->ce_flags |= CE_UNPACKED;
531
532 if (o->cache_bottom < o->src_index->cache_nr &&
533 o->src_index->cache[o->cache_bottom] == ce) {
534 int bottom = o->cache_bottom;
535 while (bottom < o->src_index->cache_nr &&
536 o->src_index->cache[bottom]->ce_flags & CE_UNPACKED)
537 bottom++;
538 o->cache_bottom = bottom;
539 }
540}
541
542static void mark_all_ce_unused(struct index_state *index)
543{
544 int i;
545 for (i = 0; i < index->cache_nr; i++)
2431afbf 546 index->cache[i]->ce_flags &= ~(CE_UNPACKED | CE_ADDED | CE_NEW_SKIP_WORKTREE);
da165f47
JH
547}
548
eb9ae4b5 549static int locate_in_src_index(const struct cache_entry *ce,
da165f47
JH
550 struct unpack_trees_options *o)
551{
552 struct index_state *index = o->src_index;
553 int len = ce_namelen(ce);
554 int pos = index_name_pos(index, ce->name, len);
555 if (pos < 0)
556 pos = -1 - pos;
557 return pos;
558}
559
560/*
561 * We call unpack_index_entry() with an unmerged cache entry
562 * only in diff-index, and it wants a single callback. Skip
563 * the other unmerged entry with the same name.
564 */
565static void mark_ce_used_same_name(struct cache_entry *ce,
566 struct unpack_trees_options *o)
567{
568 struct index_state *index = o->src_index;
569 int len = ce_namelen(ce);
570 int pos;
571
572 for (pos = locate_in_src_index(ce, o); pos < index->cache_nr; pos++) {
573 struct cache_entry *next = index->cache[pos];
574 if (len != ce_namelen(next) ||
575 memcmp(ce->name, next->name, len))
576 break;
577 mark_ce_used(next, o);
578 }
579}
580
581static struct cache_entry *next_cache_entry(struct unpack_trees_options *o)
582{
583 const struct index_state *index = o->src_index;
584 int pos = o->cache_bottom;
585
586 while (pos < index->cache_nr) {
587 struct cache_entry *ce = index->cache[pos];
588 if (!(ce->ce_flags & CE_UNPACKED))
589 return ce;
590 pos++;
591 }
592 return NULL;
593}
594
9c5e6c80 595static void add_same_unmerged(const struct cache_entry *ce,
da165f47
JH
596 struct unpack_trees_options *o)
597{
598 struct index_state *index = o->src_index;
599 int len = ce_namelen(ce);
600 int pos = index_name_pos(index, ce->name, len);
601
602 if (0 <= pos)
603 die("programming error in a caller of mark_ce_used_same_name");
604 for (pos = -pos - 1; pos < index->cache_nr; pos++) {
605 struct cache_entry *next = index->cache[pos];
606 if (len != ce_namelen(next) ||
607 memcmp(ce->name, next->name, len))
608 break;
609 add_entry(o, next, 0, 0);
610 mark_ce_used(next, o);
611 }
612}
613
614static int unpack_index_entry(struct cache_entry *ce,
615 struct unpack_trees_options *o)
01904572 616{
5828e835 617 const struct cache_entry *src[MAX_UNPACK_TREES + 1] = { NULL, };
da165f47 618 int ret;
34110cd4 619
66dbfd55
GV
620 src[0] = ce;
621
da165f47 622 mark_ce_used(ce, o);
01904572
LT
623 if (ce_stage(ce)) {
624 if (o->skip_unmerged) {
34110cd4
LT
625 add_entry(o, ce, 0, 0);
626 return 0;
01904572 627 }
01904572 628 }
da165f47
JH
629 ret = call_unpack_fn(src, o);
630 if (ce_stage(ce))
631 mark_ce_used_same_name(ce, o);
632 return ret;
01904572
LT
633}
634
730f7284
JH
635static int find_cache_pos(struct traverse_info *, const struct name_entry *);
636
637static void restore_cache_bottom(struct traverse_info *info, int bottom)
638{
639 struct unpack_trees_options *o = info->data;
640
641 if (o->diff_index_cached)
642 return;
643 o->cache_bottom = bottom;
644}
645
646static int switch_cache_bottom(struct traverse_info *info)
647{
648 struct unpack_trees_options *o = info->data;
649 int ret, pos;
650
651 if (o->diff_index_cached)
652 return 0;
653 ret = o->cache_bottom;
654 pos = find_cache_pos(info->prev, &info->name);
655
656 if (pos < -1)
657 o->cache_bottom = -2 - pos;
658 else if (pos < 0)
659 o->cache_bottom = o->src_index->cache_nr;
660 return ret;
01904572
LT
661}
662
d12a8cf0
JH
663static inline int are_same_oid(struct name_entry *name_j, struct name_entry *name_k)
664{
ea82b2a0 665 return !is_null_oid(&name_j->oid) && !is_null_oid(&name_k->oid) && oideq(&name_j->oid, &name_k->oid);
d12a8cf0
JH
666}
667
b4da3738
NTND
668static int all_trees_same_as_cache_tree(int n, unsigned long dirmask,
669 struct name_entry *names,
670 struct traverse_info *info)
671{
672 struct unpack_trees_options *o = info->data;
673 int i;
674
675 if (!o->merge || dirmask != ((1 << n) - 1))
676 return 0;
677
678 for (i = 1; i < n; i++)
679 if (!are_same_oid(names, names + i))
680 return 0;
681
682 return cache_tree_matches_traversal(o->src_index->cache_tree, names, info);
683}
684
685static int index_pos_by_traverse_info(struct name_entry *names,
686 struct traverse_info *info)
687{
688 struct unpack_trees_options *o = info->data;
689 int len = traverse_path_len(info, names);
690 char *name = xmalloc(len + 1 /* slash */ + 1 /* NUL */);
691 int pos;
692
693 make_traverse_path(name, info, names);
694 name[len++] = '/';
695 name[len] = '\0';
696 pos = index_name_pos(o->src_index, name, len);
697 if (pos >= 0)
698 BUG("This is a directory and should not exist in index");
699 pos = -pos - 1;
700 if (!starts_with(o->src_index->cache[pos]->name, name) ||
701 (pos > 0 && starts_with(o->src_index->cache[pos-1]->name, name)))
702 BUG("pos must point at the first entry in this directory");
703 free(name);
704 return pos;
705}
706
707/*
708 * Fast path if we detect that all trees are the same as cache-tree at this
5f4436a7
NTND
709 * path. We'll walk these trees in an iterative loop using cache-tree/index
710 * instead of ODB since we already know what these trees contain.
b4da3738
NTND
711 */
712static int traverse_by_cache_tree(int pos, int nr_entries, int nr_names,
b4da3738
NTND
713 struct traverse_info *info)
714{
715 struct cache_entry *src[MAX_UNPACK_TREES + 1] = { NULL, };
716 struct unpack_trees_options *o = info->data;
f1e11c65
NTND
717 struct cache_entry *tree_ce = NULL;
718 int ce_len = 0;
b4da3738
NTND
719 int i, d;
720
721 if (!o->merge)
722 BUG("We need cache-tree to do this optimization");
723
724 /*
725 * Do what unpack_callback() and unpack_nondirectories() normally
726 * do. But we walk all paths in an iterative loop instead.
727 *
728 * D/F conflicts and higher stage entries are not a concern
729 * because cache-tree would be invalidated and we would never
730 * get here in the first place.
731 */
732 for (i = 0; i < nr_entries; i++) {
f1e11c65 733 int new_ce_len, len, rc;
b4da3738
NTND
734
735 src[0] = o->src_index->cache[pos + i];
736
737 len = ce_namelen(src[0]);
f1e11c65
NTND
738 new_ce_len = cache_entry_size(len);
739
740 if (new_ce_len > ce_len) {
741 new_ce_len <<= 1;
742 tree_ce = xrealloc(tree_ce, new_ce_len);
743 memset(tree_ce, 0, new_ce_len);
744 ce_len = new_ce_len;
745
746 tree_ce->ce_flags = create_ce_flags(0);
747
748 for (d = 1; d <= nr_names; d++)
749 src[d] = tree_ce;
750 }
b4da3738
NTND
751
752 tree_ce->ce_mode = src[0]->ce_mode;
b4da3738
NTND
753 tree_ce->ce_namelen = len;
754 oidcpy(&tree_ce->oid, &src[0]->oid);
755 memcpy(tree_ce->name, src[0]->name, len + 1);
756
b4da3738 757 rc = call_unpack_fn((const struct cache_entry * const *)src, o);
f1e11c65
NTND
758 if (rc < 0) {
759 free(tree_ce);
b4da3738 760 return rc;
f1e11c65 761 }
b4da3738
NTND
762
763 mark_ce_used(src[0], o);
764 }
f1e11c65 765 free(tree_ce);
b4da3738
NTND
766 if (o->debug_unpack)
767 printf("Unpacked %d entries from %s to %s using cache-tree\n",
768 nr_entries,
769 o->src_index->cache[pos]->name,
770 o->src_index->cache[pos + nr_entries - 1]->name);
771 return 0;
772}
773
84563a62
JH
774static int traverse_trees_recursive(int n, unsigned long dirmask,
775 unsigned long df_conflicts,
776 struct name_entry *names,
777 struct traverse_info *info)
16da134b 778{
67022e02 779 struct unpack_trees_options *o = info->data;
730f7284 780 int i, ret, bottom;
d12a8cf0 781 int nr_buf = 0;
ca885a4f 782 struct tree_desc t[MAX_UNPACK_TREES];
1ce584b0 783 void *buf[MAX_UNPACK_TREES];
01904572
LT
784 struct traverse_info newinfo;
785 struct name_entry *p;
b4da3738
NTND
786 int nr_entries;
787
788 nr_entries = all_trees_same_as_cache_tree(n, dirmask, names, info);
789 if (nr_entries > 0) {
b4da3738
NTND
790 int pos = index_pos_by_traverse_info(names, info);
791
792 if (!o->merge || df_conflicts)
793 BUG("Wrong condition to get here buddy");
794
795 /*
796 * All entries up to 'pos' must have been processed
797 * (i.e. marked CE_UNPACKED) at this point. But to be safe,
798 * save and restore cache_bottom anyway to not miss
799 * unprocessed entries before 'pos'.
800 */
801 bottom = o->cache_bottom;
66429698 802 ret = traverse_by_cache_tree(pos, nr_entries, n, info);
b4da3738
NTND
803 o->cache_bottom = bottom;
804 return ret;
805 }
01904572
LT
806
807 p = names;
808 while (!p->mode)
809 p++;
810
811 newinfo = *info;
812 newinfo.prev = info;
40e37256 813 newinfo.pathspec = info->pathspec;
01904572 814 newinfo.name = *p;
0de16337 815 newinfo.pathlen += tree_entry_len(p) + 1;
603d2498 816 newinfo.df_conflicts |= df_conflicts;
01904572 817
d12a8cf0
JH
818 /*
819 * Fetch the tree from the ODB for each peer directory in the
820 * n commits.
821 *
822 * For 2- and 3-way traversals, we try to avoid hitting the
823 * ODB twice for the same OID. This should yield a nice speed
824 * up in checkouts and merges when the commits are similar.
825 *
826 * We don't bother doing the full O(n^2) search for larger n,
827 * because wider traversals don't happen that often and we
828 * avoid the search setup.
829 *
830 * When 2 peer OIDs are the same, we just copy the tree
831 * descriptor data. This implicitly borrows the buffer
832 * data from the earlier cell.
833 */
01904572 834 for (i = 0; i < n; i++, dirmask >>= 1) {
d12a8cf0
JH
835 if (i > 0 && are_same_oid(&names[i], &names[i - 1]))
836 t[i] = t[i - 1];
837 else if (i > 1 && are_same_oid(&names[i], &names[i - 2]))
838 t[i] = t[i - 2];
839 else {
5c377d3d 840 const struct object_id *oid = NULL;
d12a8cf0 841 if (dirmask & 1)
ea82b2a0 842 oid = &names[i].oid;
5e575807 843 buf[nr_buf++] = fill_tree_descriptor(the_repository, t + i, oid);
d12a8cf0 844 }
01904572 845 }
730f7284
JH
846
847 bottom = switch_cache_bottom(&newinfo);
67022e02 848 ret = traverse_trees(o->src_index, n, t, &newinfo);
730f7284 849 restore_cache_bottom(&newinfo, bottom);
1ce584b0 850
d12a8cf0 851 for (i = 0; i < nr_buf; i++)
1ce584b0
JN
852 free(buf[i]);
853
730f7284 854 return ret;
01904572
LT
855}
856
857/*
858 * Compare the traverse-path to the cache entry without actually
859 * having to generate the textual representation of the traverse
860 * path.
861 *
862 * NOTE! This *only* compares up to the size of the traverse path
863 * itself - the caller needs to do the final check for the cache
864 * entry having more data at the end!
865 */
d9c2bd56 866static int do_compare_entry_piecewise(const struct cache_entry *ce, const struct traverse_info *info, const struct name_entry *n)
01904572
LT
867{
868 int len, pathlen, ce_len;
869 const char *ce_name;
870
871 if (info->prev) {
d9c2bd56
DT
872 int cmp = do_compare_entry_piecewise(ce, info->prev,
873 &info->name);
01904572
LT
874 if (cmp)
875 return cmp;
876 }
877 pathlen = info->pathlen;
878 ce_len = ce_namelen(ce);
879
880 /* If ce_len < pathlen then we must have previously hit "name == directory" entry */
881 if (ce_len < pathlen)
882 return -1;
883
884 ce_len -= pathlen;
885 ce_name = ce->name + pathlen;
886
0de16337 887 len = tree_entry_len(n);
01904572
LT
888 return df_name_compare(ce_name, ce_len, S_IFREG, n->path, len, n->mode);
889}
890
d9c2bd56
DT
891static int do_compare_entry(const struct cache_entry *ce,
892 const struct traverse_info *info,
893 const struct name_entry *n)
894{
895 int len, pathlen, ce_len;
896 const char *ce_name;
897 int cmp;
898
899 /*
900 * If we have not precomputed the traverse path, it is quicker
901 * to avoid doing so. But if we have precomputed it,
902 * it is quicker to use the precomputed version.
903 */
904 if (!info->traverse_path)
905 return do_compare_entry_piecewise(ce, info, n);
906
907 cmp = strncmp(ce->name, info->traverse_path, info->pathlen);
908 if (cmp)
909 return cmp;
910
911 pathlen = info->pathlen;
912 ce_len = ce_namelen(ce);
913
914 if (ce_len < pathlen)
915 return -1;
916
917 ce_len -= pathlen;
918 ce_name = ce->name + pathlen;
919
920 len = tree_entry_len(n);
921 return df_name_compare(ce_name, ce_len, S_IFREG, n->path, len, n->mode);
922}
923
01904572
LT
924static int compare_entry(const struct cache_entry *ce, const struct traverse_info *info, const struct name_entry *n)
925{
926 int cmp = do_compare_entry(ce, info, n);
927 if (cmp)
928 return cmp;
929
930 /*
931 * Even if the beginning compared identically, the ce should
932 * compare as bigger than a directory leading up to it!
933 */
934 return ce_namelen(ce) > traverse_path_len(info, n);
935}
936
da165f47
JH
937static int ce_in_traverse_path(const struct cache_entry *ce,
938 const struct traverse_info *info)
939{
940 if (!info->prev)
941 return 1;
942 if (do_compare_entry(ce, info->prev, &info->name))
943 return 0;
944 /*
945 * If ce (blob) is the same name as the path (which is a tree
946 * we will be descending into), it won't be inside it.
947 */
948 return (info->pathlen < ce_namelen(ce));
949}
950
a849735b
JM
951static struct cache_entry *create_ce_entry(const struct traverse_info *info,
952 const struct name_entry *n,
953 int stage,
954 struct index_state *istate,
955 int is_transient)
01904572
LT
956{
957 int len = traverse_path_len(info, n);
a849735b
JM
958 struct cache_entry *ce =
959 is_transient ?
960 make_empty_transient_cache_entry(len) :
961 make_empty_cache_entry(istate, len);
01904572
LT
962
963 ce->ce_mode = create_ce_mode(n->mode);
b60e188c
TG
964 ce->ce_flags = create_ce_flags(stage);
965 ce->ce_namelen = len;
ea82b2a0 966 oidcpy(&ce->oid, &n->oid);
01904572
LT
967 make_traverse_path(ce->name, info, n);
968
969 return ce;
970}
971
b4da3738
NTND
972/*
973 * Note that traverse_by_cache_tree() duplicates some logic in this function
974 * without actually calling it. If you change the logic here you may need to
975 * check and change there as well.
976 */
c7cddc1a
RS
977static int unpack_nondirectories(int n, unsigned long mask,
978 unsigned long dirmask,
979 struct cache_entry **src,
980 const struct name_entry *names,
981 const struct traverse_info *info)
01904572
LT
982{
983 int i;
984 struct unpack_trees_options *o = info->data;
603d2498 985 unsigned long conflicts = info->df_conflicts | dirmask;
01904572
LT
986
987 /* Do we have *only* directories? Nothing to do */
988 if (mask == dirmask && !src[0])
989 return 0;
990
01904572
LT
991 /*
992 * Ok, we've filled in up to any potential index entry in src[0],
993 * now do the rest.
994 */
995 for (i = 0; i < n; i++) {
996 int stage;
997 unsigned int bit = 1ul << i;
998 if (conflicts & bit) {
999 src[i + o->merge] = o->df_conflict_entry;
1000 continue;
1001 }
1002 if (!(mask & bit))
1003 continue;
1004 if (!o->merge)
1005 stage = 0;
1006 else if (i + 1 < o->head_idx)
1007 stage = 1;
1008 else if (i + 1 > o->head_idx)
1009 stage = 3;
1010 else
1011 stage = 2;
a849735b
JM
1012
1013 /*
1014 * If the merge bit is set, then the cache entries are
1015 * discarded in the following block. In this case,
1016 * construct "transient" cache_entries, as they are
1017 * not stored in the index. otherwise construct the
1018 * cache entry from the index aware logic.
1019 */
1020 src[i + o->merge] = create_ce_entry(info, names + i, stage, &o->result, o->merge);
01904572
LT
1021 }
1022
5d80ef5a
RS
1023 if (o->merge) {
1024 int rc = call_unpack_fn((const struct cache_entry * const *)src,
1025 o);
1026 for (i = 0; i < n; i++) {
1027 struct cache_entry *ce = src[i + o->merge];
1028 if (ce != o->df_conflict_entry)
a849735b 1029 discard_cache_entry(ce);
5d80ef5a
RS
1030 }
1031 return rc;
1032 }
01904572 1033
01904572 1034 for (i = 0; i < n; i++)
aab3b9a1 1035 if (src[i] && src[i] != o->df_conflict_entry)
46169180
JK
1036 if (do_add_entry(o, src[i], 0, 0))
1037 return -1;
1038
01904572
LT
1039 return 0;
1040}
1041
353c5eeb
JH
1042static int unpack_failed(struct unpack_trees_options *o, const char *message)
1043{
1044 discard_index(&o->result);
b165fac8 1045 if (!o->quiet && !o->exiting_early) {
353c5eeb
JH
1046 if (message)
1047 return error("%s", message);
1048 return -1;
1049 }
1050 return -1;
1051}
1052
730f7284
JH
1053/*
1054 * The tree traversal is looking at name p. If we have a matching entry,
1055 * return it. If name p is a directory in the index, do not return
1056 * anything, as we will want to match it when the traversal descends into
1057 * the directory.
1058 */
1059static int find_cache_pos(struct traverse_info *info,
1060 const struct name_entry *p)
1061{
1062 int pos;
1063 struct unpack_trees_options *o = info->data;
1064 struct index_state *index = o->src_index;
1065 int pfxlen = info->pathlen;
0de16337 1066 int p_len = tree_entry_len(p);
730f7284
JH
1067
1068 for (pos = o->cache_bottom; pos < index->cache_nr; pos++) {
9c5e6c80 1069 const struct cache_entry *ce = index->cache[pos];
730f7284
JH
1070 const char *ce_name, *ce_slash;
1071 int cmp, ce_len;
1072
e53e6b44
BD
1073 if (ce->ce_flags & CE_UNPACKED) {
1074 /*
1075 * cache_bottom entry is already unpacked, so
1076 * we can never match it; don't check it
1077 * again.
1078 */
1079 if (pos == o->cache_bottom)
1080 ++o->cache_bottom;
730f7284 1081 continue;
e53e6b44 1082 }
a6720955
DT
1083 if (!ce_in_traverse_path(ce, info)) {
1084 /*
1085 * Check if we can skip future cache checks
1086 * (because we're already past all possible
1087 * entries in the traverse path).
1088 */
1089 if (info->traverse_path) {
1090 if (strncmp(ce->name, info->traverse_path,
1091 info->pathlen) > 0)
1092 break;
1093 }
730f7284 1094 continue;
a6720955 1095 }
730f7284
JH
1096 ce_name = ce->name + pfxlen;
1097 ce_slash = strchr(ce_name, '/');
1098 if (ce_slash)
1099 ce_len = ce_slash - ce_name;
1100 else
1101 ce_len = ce_namelen(ce) - pfxlen;
1102 cmp = name_compare(p->path, p_len, ce_name, ce_len);
1103 /*
1104 * Exact match; if we have a directory we need to
1105 * delay returning it.
1106 */
1107 if (!cmp)
1108 return ce_slash ? -2 - pos : pos;
1109 if (0 < cmp)
1110 continue; /* keep looking */
1111 /*
1112 * ce_name sorts after p->path; could it be that we
1113 * have files under p->path directory in the index?
1114 * E.g. ce_name == "t-i", and p->path == "t"; we may
1115 * have "t/a" in the index.
1116 */
1117 if (p_len < ce_len && !memcmp(ce_name, p->path, p_len) &&
1118 ce_name[p_len] < '/')
1119 continue; /* keep looking */
1120 break;
1121 }
1122 return -1;
1123}
1124
1125static struct cache_entry *find_cache_entry(struct traverse_info *info,
1126 const struct name_entry *p)
1127{
1128 int pos = find_cache_pos(info, p);
1129 struct unpack_trees_options *o = info->data;
1130
1131 if (0 <= pos)
1132 return o->src_index->cache[pos];
1133 else
1134 return NULL;
1135}
1136
ba655da5
JH
1137static void debug_path(struct traverse_info *info)
1138{
1139 if (info->prev) {
1140 debug_path(info->prev);
1141 if (*info->prev->name.path)
1142 putchar('/');
1143 }
1144 printf("%s", info->name.path);
1145}
1146
1147static void debug_name_entry(int i, struct name_entry *n)
1148{
1149 printf("ent#%d %06o %s\n", i,
1150 n->path ? n->mode : 0,
1151 n->path ? n->path : "(missing)");
1152}
1153
1154static void debug_unpack_callback(int n,
1155 unsigned long mask,
1156 unsigned long dirmask,
1157 struct name_entry *names,
1158 struct traverse_info *info)
1159{
1160 int i;
1161 printf("* unpack mask %lu, dirmask %lu, cnt %d ",
1162 mask, dirmask, n);
1163 debug_path(info);
1164 putchar('\n');
1165 for (i = 0; i < n; i++)
1166 debug_name_entry(i, names + i);
1167}
1168
b4da3738
NTND
1169/*
1170 * Note that traverse_by_cache_tree() duplicates some logic in this function
1171 * without actually calling it. If you change the logic here you may need to
1172 * check and change there as well.
1173 */
01904572
LT
1174static int unpack_callback(int n, unsigned long mask, unsigned long dirmask, struct name_entry *names, struct traverse_info *info)
1175{
c7cddc1a 1176 struct cache_entry *src[MAX_UNPACK_TREES + 1] = { NULL, };
01904572 1177 struct unpack_trees_options *o = info->data;
01904572
LT
1178 const struct name_entry *p = names;
1179
1180 /* Find first entry with a real name (we could use "mask" too) */
1181 while (!p->mode)
1182 p++;
1183
ba655da5
JH
1184 if (o->debug_unpack)
1185 debug_unpack_callback(n, mask, dirmask, names, info);
1186
01904572
LT
1187 /* Are we supposed to look at the index too? */
1188 if (o->merge) {
da165f47 1189 while (1) {
da165f47 1190 int cmp;
730f7284
JH
1191 struct cache_entry *ce;
1192
1193 if (o->diff_index_cached)
1194 ce = next_cache_entry(o);
1195 else
1196 ce = find_cache_entry(info, p);
1197
da165f47
JH
1198 if (!ce)
1199 break;
1200 cmp = compare_entry(ce, info, p);
01904572
LT
1201 if (cmp < 0) {
1202 if (unpack_index_entry(ce, o) < 0)
353c5eeb 1203 return unpack_failed(o, NULL);
01904572
LT
1204 continue;
1205 }
1206 if (!cmp) {
1207 if (ce_stage(ce)) {
1208 /*
da165f47
JH
1209 * If we skip unmerged index
1210 * entries, we'll skip this
1211 * entry *and* the tree
1212 * entries associated with it!
01904572 1213 */
34110cd4 1214 if (o->skip_unmerged) {
da165f47 1215 add_same_unmerged(ce, o);
01904572 1216 return mask;
34110cd4 1217 }
01904572
LT
1218 }
1219 src[0] = ce;
01904572
LT
1220 }
1221 break;
1222 }
1223 }
1224
34110cd4 1225 if (unpack_nondirectories(n, mask, dirmask, src, names, info) < 0)
01904572
LT
1226 return -1;
1227
97e5954b 1228 if (o->merge && src[0]) {
da165f47
JH
1229 if (ce_stage(src[0]))
1230 mark_ce_used_same_name(src[0], o);
1231 else
1232 mark_ce_used(src[0], o);
1233 }
1234
01904572
LT
1235 /* Now handle any directories.. */
1236 if (dirmask) {
b65982b6
JH
1237 /* special case: "diff-index --cached" looking at a tree */
1238 if (o->diff_index_cached &&
1239 n == 1 && dirmask == 1 && S_ISDIR(names->mode)) {
1240 int matches;
1241 matches = cache_tree_matches_traversal(o->src_index->cache_tree,
1242 names, info);
1243 /*
da165f47
JH
1244 * Everything under the name matches; skip the
1245 * entire hierarchy. diff_index_cached codepath
1246 * special cases D/F conflicts in such a way that
1247 * it does not do any look-ahead, so this is safe.
b65982b6
JH
1248 */
1249 if (matches) {
da165f47 1250 o->cache_bottom += matches;
b65982b6
JH
1251 return mask;
1252 }
1253 }
1254
603d2498 1255 if (traverse_trees_recursive(n, dirmask, mask & ~dirmask,
542c264b
JH
1256 names, info) < 0)
1257 return -1;
01904572
LT
1258 return mask;
1259 }
1260
1261 return mask;
1262}
1263
27c82fb3
NTND
1264static int clear_ce_flags_1(struct index_state *istate,
1265 struct cache_entry **cache, int nr,
fc2b6214 1266 struct strbuf *prefix,
28911091
NTND
1267 int select_mask, int clear_mask,
1268 struct exclude_list *el, int defval);
1269
9037026d 1270/* Whole directory matching */
27c82fb3
NTND
1271static int clear_ce_flags_dir(struct index_state *istate,
1272 struct cache_entry **cache, int nr,
fc2b6214 1273 struct strbuf *prefix,
9037026d
NTND
1274 char *basename,
1275 int select_mask, int clear_mask,
28911091 1276 struct exclude_list *el, int defval)
9037026d 1277{
28911091 1278 struct cache_entry **cache_end;
9037026d 1279 int dtype = DT_DIR;
fc2b6214 1280 int ret = is_excluded_from_list(prefix->buf, prefix->len,
27c82fb3 1281 basename, &dtype, el, istate);
fc2b6214 1282 int rc;
9037026d 1283
fc2b6214 1284 strbuf_addch(prefix, '/');
9037026d 1285
28911091
NTND
1286 /* If undecided, use matching result of parent dir in defval */
1287 if (ret < 0)
1288 ret = defval;
9037026d 1289
28911091
NTND
1290 for (cache_end = cache; cache_end != cache + nr; cache_end++) {
1291 struct cache_entry *ce = *cache_end;
fc2b6214 1292 if (strncmp(ce->name, prefix->buf, prefix->len))
28911091 1293 break;
9037026d
NTND
1294 }
1295
28911091
NTND
1296 /*
1297 * TODO: check el, if there are no patterns that may conflict
1298 * with ret (iow, we know in advance the incl/excl
1299 * decision for the entire directory), clear flag here without
1300 * calling clear_ce_flags_1(). That function will call
07958050 1301 * the expensive is_excluded_from_list() on every entry.
28911091 1302 */
27c82fb3 1303 rc = clear_ce_flags_1(istate, cache, cache_end - cache,
fc2b6214
AP
1304 prefix,
1305 select_mask, clear_mask,
1306 el, ret);
1307 strbuf_setlen(prefix, prefix->len - 1);
1308 return rc;
9037026d
NTND
1309}
1310
1311/*
1312 * Traverse the index, find every entry that matches according to
1313 * o->el. Do "ce_flags &= ~clear_mask" on those entries. Return the
1314 * number of traversed entries.
1315 *
1316 * If select_mask is non-zero, only entries whose ce_flags has on of
1317 * those bits enabled are traversed.
1318 *
1319 * cache : pointer to an index entry
1320 * prefix_len : an offset to its path
1321 *
1322 * The current path ("prefix") including the trailing '/' is
1323 * cache[0]->name[0..(prefix_len-1)]
1324 * Top level path has prefix_len zero.
1325 */
27c82fb3
NTND
1326static int clear_ce_flags_1(struct index_state *istate,
1327 struct cache_entry **cache, int nr,
fc2b6214 1328 struct strbuf *prefix,
9037026d 1329 int select_mask, int clear_mask,
28911091 1330 struct exclude_list *el, int defval)
9037026d
NTND
1331{
1332 struct cache_entry **cache_end = cache + nr;
1333
1334 /*
1335 * Process all entries that have the given prefix and meet
1336 * select_mask condition
1337 */
1338 while(cache != cache_end) {
1339 struct cache_entry *ce = *cache;
1340 const char *name, *slash;
28911091 1341 int len, dtype, ret;
9037026d
NTND
1342
1343 if (select_mask && !(ce->ce_flags & select_mask)) {
1344 cache++;
1345 continue;
1346 }
1347
fc2b6214 1348 if (prefix->len && strncmp(ce->name, prefix->buf, prefix->len))
9037026d
NTND
1349 break;
1350
fc2b6214 1351 name = ce->name + prefix->len;
9037026d
NTND
1352 slash = strchr(name, '/');
1353
1354 /* If it's a directory, try whole directory match first */
1355 if (slash) {
1356 int processed;
1357
1358 len = slash - name;
fc2b6214 1359 strbuf_add(prefix, name, len);
9037026d 1360
27c82fb3 1361 processed = clear_ce_flags_dir(istate, cache, cache_end - cache,
fc2b6214
AP
1362 prefix,
1363 prefix->buf + prefix->len - len,
9037026d 1364 select_mask, clear_mask,
28911091 1365 el, defval);
9037026d
NTND
1366
1367 /* clear_c_f_dir eats a whole dir already? */
1368 if (processed) {
1369 cache += processed;
fc2b6214 1370 strbuf_setlen(prefix, prefix->len - len);
9037026d
NTND
1371 continue;
1372 }
1373
fc2b6214 1374 strbuf_addch(prefix, '/');
27c82fb3 1375 cache += clear_ce_flags_1(istate, cache, cache_end - cache,
fc2b6214 1376 prefix,
28911091 1377 select_mask, clear_mask, el, defval);
fc2b6214 1378 strbuf_setlen(prefix, prefix->len - len - 1);
9037026d
NTND
1379 continue;
1380 }
1381
1382 /* Non-directory */
1383 dtype = ce_to_dtype(ce);
07958050 1384 ret = is_excluded_from_list(ce->name, ce_namelen(ce),
27c82fb3 1385 name, &dtype, el, istate);
28911091
NTND
1386 if (ret < 0)
1387 ret = defval;
1388 if (ret > 0)
9037026d
NTND
1389 ce->ce_flags &= ~clear_mask;
1390 cache++;
1391 }
1392 return nr - (cache_end - cache);
1393}
1394
27c82fb3
NTND
1395static int clear_ce_flags(struct index_state *istate,
1396 int select_mask, int clear_mask,
1397 struct exclude_list *el)
9037026d 1398{
fc2b6214
AP
1399 static struct strbuf prefix = STRBUF_INIT;
1400
1401 strbuf_reset(&prefix);
1402
27c82fb3
NTND
1403 return clear_ce_flags_1(istate,
1404 istate->cache,
1405 istate->cache_nr,
fc2b6214 1406 &prefix,
9037026d 1407 select_mask, clear_mask,
28911091 1408 el, 0);
9037026d
NTND
1409}
1410
2431afbf
NTND
1411/*
1412 * Set/Clear CE_NEW_SKIP_WORKTREE according to $GIT_DIR/info/sparse-checkout
1413 */
1414static void mark_new_skip_worktree(struct exclude_list *el,
86016ec3 1415 struct index_state *istate,
2431afbf
NTND
1416 int select_flag, int skip_wt_flag)
1417{
1418 int i;
1419
9037026d
NTND
1420 /*
1421 * 1. Pretend the narrowest worktree: only unmerged entries
1422 * are checked out
1423 */
86016ec3
NTND
1424 for (i = 0; i < istate->cache_nr; i++) {
1425 struct cache_entry *ce = istate->cache[i];
2431afbf
NTND
1426
1427 if (select_flag && !(ce->ce_flags & select_flag))
1428 continue;
1429
b33fdfc3 1430 if (!ce_stage(ce) && !(ce->ce_flags & CE_CONFLICTED))
2431afbf
NTND
1431 ce->ce_flags |= skip_wt_flag;
1432 else
1433 ce->ce_flags &= ~skip_wt_flag;
1434 }
9037026d
NTND
1435
1436 /*
1437 * 2. Widen worktree according to sparse-checkout file.
1438 * Matched entries will have skip_wt_flag cleared (i.e. "in")
1439 */
27c82fb3 1440 clear_ce_flags(istate, select_flag, skip_wt_flag, el);
2431afbf
NTND
1441}
1442
eb9ae4b5
RS
1443static int verify_absent(const struct cache_entry *,
1444 enum unpack_trees_error_types,
1445 struct unpack_trees_options *);
2e2b887d
JH
1446/*
1447 * N-way merge "len" trees. Returns 0 on success, -1 on failure to manipulate the
1448 * resulting index, -2 on failure to reflect the changes to the work tree.
2431afbf
NTND
1449 *
1450 * CE_ADDED, CE_UNPACKED and CE_NEW_SKIP_WORKTREE are used internally
2e2b887d 1451 */
01904572
LT
1452int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options *o)
1453{
e800ec9d 1454 int i, ret;
0fb1eaa8 1455 static struct cache_entry *dfc;
08aefc9e 1456 struct exclude_list el;
16da134b 1457
ca885a4f
JH
1458 if (len > MAX_UNPACK_TREES)
1459 die("unpack_trees takes at most %d trees", MAX_UNPACK_TREES);
16da134b 1460
0d1ed596 1461 trace_performance_enter();
08aefc9e
NTND
1462 memset(&el, 0, sizeof(el));
1463 if (!core_apply_sparse_checkout || !o->update)
1464 o->skip_sparse_checkout = 1;
1465 if (!o->skip_sparse_checkout) {
fcd12db6 1466 char *sparse = git_pathdup("info/sparse-checkout");
473e3930 1467 if (add_excludes_from_file_to_list(sparse, "", 0, &el, NULL) < 0)
08aefc9e
NTND
1468 o->skip_sparse_checkout = 1;
1469 else
1470 o->el = &el;
fcd12db6 1471 free(sparse);
08aefc9e
NTND
1472 }
1473
34110cd4 1474 memset(&o->result, 0, sizeof(o->result));
913e0e99 1475 o->result.initialized = 1;
da165f47
JH
1476 o->result.timestamp.sec = o->src_index->timestamp.sec;
1477 o->result.timestamp.nsec = o->src_index->timestamp.nsec;
9170c7ab 1478 o->result.version = o->src_index->version;
7db11830
EN
1479 if (!o->src_index->split_index) {
1480 o->result.split_index = NULL;
1481 } else if (o->src_index == o->dst_index) {
1482 /*
1483 * o->dst_index (and thus o->src_index) will be discarded
1484 * and overwritten with o->result at the end of this function,
1485 * so just use src_index's split_index to avoid having to
1486 * create a new one.
1487 */
1488 o->result.split_index = o->src_index->split_index;
5fc2fc8f 1489 o->result.split_index->refcount++;
7db11830
EN
1490 } else {
1491 o->result.split_index = init_split_index(&o->result);
1492 }
75691ea3 1493 oidcpy(&o->result.oid, &o->src_index->oid);
16da134b 1494 o->merge_size = len;
da165f47 1495 mark_all_ce_unused(o->src_index);
0fb1eaa8 1496
2431afbf
NTND
1497 /*
1498 * Sparse checkout loop #1: set NEW_SKIP_WORKTREE on existing entries
1499 */
1500 if (!o->skip_sparse_checkout)
1501 mark_new_skip_worktree(o->el, o->src_index, 0, CE_NEW_SKIP_WORKTREE);
1502
0fb1eaa8 1503 if (!dfc)
13494ed1 1504 dfc = xcalloc(1, cache_entry_size(0));
0fb1eaa8 1505 o->df_conflict_entry = dfc;
16da134b
JS
1506
1507 if (len) {
01904572
LT
1508 const char *prefix = o->prefix ? o->prefix : "";
1509 struct traverse_info info;
1510
1511 setup_traverse_info(&info, prefix);
1512 info.fn = unpack_callback;
1513 info.data = o;
e6c111b4 1514 info.show_all_errors = o->show_all_errors;
40e37256 1515 info.pathspec = o->pathspec;
01904572 1516
da165f47
JH
1517 if (o->prefix) {
1518 /*
1519 * Unpack existing index entries that sort before the
1520 * prefix the tree is spliced into. Note that o->merge
1521 * is always true in this case.
1522 */
1523 while (1) {
1524 struct cache_entry *ce = next_cache_entry(o);
1525 if (!ce)
1526 break;
1527 if (ce_in_traverse_path(ce, &info))
1528 break;
1529 if (unpack_index_entry(ce, o) < 0)
1530 goto return_failed;
1531 }
08aefc9e 1532 }
da165f47 1533
0d1ed596 1534 trace_performance_enter();
67022e02 1535 ret = traverse_trees(o->src_index, len, t, &info);
0d1ed596
NTND
1536 trace_performance_leave("traverse_trees");
1537 if (ret < 0)
da165f47 1538 goto return_failed;
16da134b
JS
1539 }
1540
01904572
LT
1541 /* Any left-over entries in the index? */
1542 if (o->merge) {
da165f47
JH
1543 while (1) {
1544 struct cache_entry *ce = next_cache_entry(o);
1545 if (!ce)
1546 break;
01904572 1547 if (unpack_index_entry(ce, o) < 0)
da165f47 1548 goto return_failed;
17e46426 1549 }
17e46426 1550 }
da165f47 1551 mark_all_ce_unused(o->src_index);
16da134b 1552
08aefc9e
NTND
1553 if (o->trivial_merges_only && o->nontrivial_merge) {
1554 ret = unpack_failed(o, "Merge requires file-level merging");
1555 goto done;
1556 }
01904572 1557
e800ec9d 1558 if (!o->skip_sparse_checkout) {
9e1afb16 1559 int empty_worktree = 1;
2431afbf
NTND
1560
1561 /*
1562 * Sparse checkout loop #2: set NEW_SKIP_WORKTREE on entries not in loop #1
1563 * If the will have NEW_SKIP_WORKTREE, also set CE_SKIP_WORKTREE
1564 * so apply_sparse_checkout() won't attempt to remove it from worktree
1565 */
1566 mark_new_skip_worktree(o->el, &o->result, CE_ADDED, CE_SKIP_WORKTREE | CE_NEW_SKIP_WORKTREE);
1567
17d26a4d 1568 ret = 0;
2431afbf 1569 for (i = 0; i < o->result.cache_nr; i++) {
e800ec9d
NTND
1570 struct cache_entry *ce = o->result.cache[i];
1571
2431afbf
NTND
1572 /*
1573 * Entries marked with CE_ADDED in merged_entry() do not have
1574 * verify_absent() check (the check is effectively disabled
1575 * because CE_NEW_SKIP_WORKTREE is set unconditionally).
1576 *
1577 * Do the real check now because we have had
1578 * correct CE_NEW_SKIP_WORKTREE
1579 */
1580 if (ce->ce_flags & CE_ADDED &&
17d26a4d
NTND
1581 verify_absent(ce, ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN, o)) {
1582 if (!o->show_all_errors)
1583 goto return_failed;
1584 ret = -1;
1585 }
2431afbf 1586
a5c446f1 1587 if (apply_sparse_checkout(&o->result, ce, o)) {
17d26a4d
NTND
1588 if (!o->show_all_errors)
1589 goto return_failed;
e800ec9d 1590 ret = -1;
e800ec9d 1591 }
eec3fc03 1592 if (!ce_skip_worktree(ce))
9e1afb16 1593 empty_worktree = 0;
f1f523ea 1594
e800ec9d 1595 }
17d26a4d
NTND
1596 if (ret < 0)
1597 goto return_failed;
a7bc906f
NTND
1598 /*
1599 * Sparse checkout is meant to narrow down checkout area
1600 * but it does not make sense to narrow down to empty working
1601 * tree. This is usually a mistake in sparse checkout rules.
1602 * Do not allow users to do that.
1603 */
9e1afb16
NTND
1604 if (o->result.cache_nr && empty_worktree) {
1605 ret = unpack_failed(o, "Sparse checkout leaves no entry on working directory");
1606 goto done;
1607 }
e800ec9d 1608 }
01904572 1609
30ac275b 1610 ret = check_updates(o) ? (-2) : 0;
e28f7641 1611 if (o->dst_index) {
836ef2b6 1612 move_index_extensions(&o->result, o->src_index);
52fca218 1613 if (!ret) {
4592e608 1614 if (git_env_bool("GIT_TEST_CHECK_CACHE_TREE", 0))
c207e9e1 1615 cache_tree_verify(the_repository, &o->result);
52fca218
BD
1616 if (!o->result.cache_tree)
1617 o->result.cache_tree = cache_tree();
1618 if (!cache_tree_fully_valid(o->result.cache_tree))
1619 cache_tree_update(&o->result,
1620 WRITE_TREE_SILENT |
1621 WRITE_TREE_REPAIR);
1622 }
1956ecd0
BP
1623
1624 o->result.updated_workdir = 1;
e28f7641 1625 discard_index(o->dst_index);
34110cd4 1626 *o->dst_index = o->result;
a16cc8b2
JH
1627 } else {
1628 discard_index(&o->result);
e28f7641 1629 }
7db11830 1630 o->src_index = NULL;
08aefc9e
NTND
1631
1632done:
0d1ed596 1633 trace_performance_leave("unpack_trees");
f6198812 1634 clear_exclude_list(&el);
2e2b887d 1635 return ret;
da165f47
JH
1636
1637return_failed:
e6c111b4
MM
1638 if (o->show_all_errors)
1639 display_error_msgs(o);
da165f47 1640 mark_all_ce_unused(o->src_index);
026680f8 1641 ret = unpack_failed(o, NULL);
b4194828
JH
1642 if (o->exiting_early)
1643 ret = 0;
026680f8 1644 goto done;
16da134b 1645}
076b0adc
JS
1646
1647/* Here come the merge functions */
1648
eb9ae4b5
RS
1649static int reject_merge(const struct cache_entry *ce,
1650 struct unpack_trees_options *o)
076b0adc 1651{
191e9d2c 1652 return add_rejected_path(o, ERROR_WOULD_OVERWRITE, ce->name);
076b0adc
JS
1653}
1654
eb9ae4b5 1655static int same(const struct cache_entry *a, const struct cache_entry *b)
076b0adc
JS
1656{
1657 if (!!a != !!b)
1658 return 0;
1659 if (!a && !b)
1660 return 1;
e11d7b59
JH
1661 if ((a->ce_flags | b->ce_flags) & CE_CONFLICTED)
1662 return 0;
076b0adc 1663 return a->ce_mode == b->ce_mode &&
4a7e27e9 1664 oideq(&a->oid, &b->oid);
076b0adc
JS
1665}
1666
1667
1668/*
1669 * When a CE gets turned into an unmerged entry, we
1670 * want it to be up-to-date
1671 */
eb9ae4b5
RS
1672static int verify_uptodate_1(const struct cache_entry *ce,
1673 struct unpack_trees_options *o,
1674 enum unpack_trees_error_types error_type)
076b0adc
JS
1675{
1676 struct stat st;
1677
d5b66299
NTND
1678 if (o->index_only)
1679 return 0;
1680
1681 /*
1682 * CE_VALID and CE_SKIP_WORKTREE cheat, we better check again
1683 * if this entry is truly up-to-date because this file may be
1684 * overwritten.
1685 */
1686 if ((ce->ce_flags & CE_VALID) || ce_skip_worktree(ce))
1687 ; /* keep checking */
1688 else if (o->reset || ce_uptodate(ce))
203a2fe1 1689 return 0;
076b0adc
JS
1690
1691 if (!lstat(ce->name, &st)) {
d5b66299
NTND
1692 int flags = CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE;
1693 unsigned changed = ie_match_stat(o->src_index, ce, &st, flags);
a7bc845a
SB
1694
1695 if (submodule_from_ce(ce)) {
1696 int r = check_submodule_move_head(ce,
1697 "HEAD", oid_to_hex(&ce->oid), o);
1698 if (r)
191e9d2c 1699 return add_rejected_path(o, error_type, ce->name);
a7bc845a
SB
1700 return 0;
1701 }
1702
076b0adc 1703 if (!changed)
203a2fe1 1704 return 0;
936492d3 1705 /*
a7bc845a
SB
1706 * Historic default policy was to allow submodule to be out
1707 * of sync wrt the superproject index. If the submodule was
1708 * not considered interesting above, we don't care here.
936492d3 1709 */
7a51ed66 1710 if (S_ISGITLINK(ce->ce_mode))
203a2fe1 1711 return 0;
a7bc845a 1712
076b0adc
JS
1713 errno = 0;
1714 }
076b0adc 1715 if (errno == ENOENT)
203a2fe1 1716 return 0;
191e9d2c 1717 return add_rejected_path(o, error_type, ce->name);
35a5aa79
NTND
1718}
1719
64b1abe9
EN
1720int verify_uptodate(const struct cache_entry *ce,
1721 struct unpack_trees_options *o)
35a5aa79 1722{
2431afbf 1723 if (!o->skip_sparse_checkout && (ce->ce_flags & CE_NEW_SKIP_WORKTREE))
f1f523ea 1724 return 0;
08402b04 1725 return verify_uptodate_1(ce, o, ERROR_NOT_UPTODATE_FILE);
076b0adc
JS
1726}
1727
eb9ae4b5 1728static int verify_uptodate_sparse(const struct cache_entry *ce,
e800ec9d
NTND
1729 struct unpack_trees_options *o)
1730{
08402b04 1731 return verify_uptodate_1(ce, o, ERROR_SPARSE_NOT_UPTODATE_FILE);
076b0adc
JS
1732}
1733
383480ba
NTND
1734/*
1735 * TODO: We should actually invalidate o->result, not src_index [1].
1736 * But since cache tree and untracked cache both are not copied to
1737 * o->result until unpacking is complete, we invalidate them on
1738 * src_index instead with the assumption that they will be copied to
1739 * dst_index at the end.
1740 *
1741 * [1] src_index->cache_tree is also used in unpack_callback() so if
1742 * we invalidate o->result, we need to update it to use
1743 * o->result.cache_tree as well.
1744 */
eb9ae4b5
RS
1745static void invalidate_ce_path(const struct cache_entry *ce,
1746 struct unpack_trees_options *o)
076b0adc 1747{
e931371a
NTND
1748 if (!ce)
1749 return;
1750 cache_tree_invalidate_path(o->src_index, ce->name);
0cacebf0 1751 untracked_cache_invalidate_path(o->src_index, ce->name, 1);
076b0adc
JS
1752}
1753
0cf73755
SV
1754/*
1755 * Check that checking out ce->sha1 in subdir ce->name is not
1756 * going to overwrite any working files.
1757 *
1758 * Currently, git does not checkout subprojects during a superproject
1759 * checkout, so it is not going to overwrite anything.
1760 */
d6b12300
SB
1761static int verify_clean_submodule(const char *old_sha1,
1762 const struct cache_entry *ce,
eb9ae4b5 1763 struct unpack_trees_options *o)
0cf73755 1764{
a7bc845a
SB
1765 if (!submodule_from_ce(ce))
1766 return 0;
1767
1768 return check_submodule_move_head(ce, old_sha1,
1769 oid_to_hex(&ce->oid), o);
0cf73755
SV
1770}
1771
eb9ae4b5 1772static int verify_clean_subdirectory(const struct cache_entry *ce,
eb9ae4b5 1773 struct unpack_trees_options *o)
c8193534
JH
1774{
1775 /*
0cf73755 1776 * we are about to extract "ce->name"; we would not want to lose
c8193534
JH
1777 * anything in the existing directory there.
1778 */
1779 int namelen;
7b9e3ce0 1780 int i;
c8193534
JH
1781 struct dir_struct d;
1782 char *pathbuf;
1783 int cnt = 0;
0cf73755 1784
d6b12300 1785 if (S_ISGITLINK(ce->ce_mode)) {
1053fe82 1786 struct object_id oid;
a98e6101 1787 int sub_head = resolve_gitlink_ref(ce->name, "HEAD", &oid);
d6b12300
SB
1788 /*
1789 * If we are not going to update the submodule, then
0cf73755
SV
1790 * we don't care.
1791 */
4a7e27e9 1792 if (!sub_head && oideq(&oid, &ce->oid))
0cf73755 1793 return 0;
1053fe82 1794 return verify_clean_submodule(sub_head ? NULL : oid_to_hex(&oid),
df351c6e 1795 ce, o);
0cf73755 1796 }
c8193534
JH
1797
1798 /*
1799 * First let's make sure we do not have a local modification
1800 * in that directory.
1801 */
68c4f6a5 1802 namelen = ce_namelen(ce);
da165f47
JH
1803 for (i = locate_in_src_index(ce, o);
1804 i < o->src_index->cache_nr;
1805 i++) {
837e5fe9
CB
1806 struct cache_entry *ce2 = o->src_index->cache[i];
1807 int len = ce_namelen(ce2);
c8193534 1808 if (len < namelen ||
837e5fe9
CB
1809 strncmp(ce->name, ce2->name, namelen) ||
1810 ce2->name[namelen] != '/')
c8193534
JH
1811 break;
1812 /*
da165f47
JH
1813 * ce2->name is an entry in the subdirectory to be
1814 * removed.
c8193534 1815 */
837e5fe9
CB
1816 if (!ce_stage(ce2)) {
1817 if (verify_uptodate(ce2, o))
203a2fe1 1818 return -1;
837e5fe9 1819 add_entry(o, ce2, CE_REMOVE, 0);
5697ca9a 1820 invalidate_ce_path(ce, o);
da165f47 1821 mark_ce_used(ce2, o);
c8193534
JH
1822 }
1823 cnt++;
1824 }
1825
1826 /*
1827 * Then we need to make sure that we do not lose a locally
1828 * present file that is not ignored.
1829 */
75faa45a 1830 pathbuf = xstrfmt("%.*s/", namelen, ce->name);
c8193534
JH
1831
1832 memset(&d, 0, sizeof(d));
1833 if (o->dir)
1834 d.exclude_per_dir = o->dir->exclude_per_dir;
c7f3259d 1835 i = read_directory(&d, o->src_index, pathbuf, namelen+1, NULL);
c8193534 1836 if (i)
191e9d2c 1837 return add_rejected_path(o, ERROR_NOT_UPTODATE_DIR, ce->name);
c8193534
JH
1838 free(pathbuf);
1839 return cnt;
1840}
1841
32260ad5
LT
1842/*
1843 * This gets called when there was no index entry for the tree entry 'dst',
1844 * but we found a file in the working tree that 'lstat()' said was fine,
1845 * and we're on a case-insensitive filesystem.
1846 *
1847 * See if we can find a case-insensitive match in the index that also
1848 * matches the stat information, and assume it's that other file!
1849 */
a9307f5a 1850static int icase_exists(struct unpack_trees_options *o, const char *name, int len, struct stat *st)
32260ad5 1851{
9c5e6c80 1852 const struct cache_entry *src;
32260ad5 1853
ebbd7439 1854 src = index_file_exists(o->src_index, name, len, 1);
56cac48c 1855 return src && !ie_match_stat(o->src_index, src, st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE);
32260ad5
LT
1856}
1857
a9307f5a 1858static int check_ok_to_remove(const char *name, int len, int dtype,
eb9ae4b5 1859 const struct cache_entry *ce, struct stat *st,
a9307f5a
CB
1860 enum unpack_trees_error_types error_type,
1861 struct unpack_trees_options *o)
1862{
9c5e6c80 1863 const struct cache_entry *result;
a9307f5a
CB
1864
1865 /*
1866 * It may be that the 'lstat()' succeeded even though
1867 * target 'ce' was absent, because there is an old
1868 * entry that is different only in case..
1869 *
1870 * Ignore that lstat() if it matches.
1871 */
1872 if (ignore_case && icase_exists(o, name, len, st))
1873 return 0;
1874
589570db 1875 if (o->dir &&
c7f3259d 1876 is_excluded(o->dir, o->src_index, name, &dtype))
a9307f5a
CB
1877 /*
1878 * ce->name is explicitly excluded, so it is Ok to
1879 * overwrite it.
1880 */
1881 return 0;
1882 if (S_ISDIR(st->st_mode)) {
1883 /*
1884 * We are checking out path "foo" and
1885 * found "foo/." in the working tree.
1886 * This is tricky -- if we have modified
1887 * files that are in "foo/" we would lose
1888 * them.
1889 */
df351c6e 1890 if (verify_clean_subdirectory(ce, o) < 0)
a9307f5a
CB
1891 return -1;
1892 return 0;
1893 }
1894
1895 /*
1896 * The previous round may already have decided to
1897 * delete this path, which is in a subdirectory that
1898 * is being replaced with a blob.
1899 */
ebbd7439 1900 result = index_file_exists(&o->result, name, len, 0);
a9307f5a
CB
1901 if (result) {
1902 if (result->ce_flags & CE_REMOVE)
1903 return 0;
1904 }
1905
191e9d2c 1906 return add_rejected_path(o, error_type, name);
a9307f5a
CB
1907}
1908
076b0adc
JS
1909/*
1910 * We do not want to remove or overwrite a working tree file that
f8a9d428 1911 * is not tracked, unless it is ignored.
076b0adc 1912 */
eb9ae4b5
RS
1913static int verify_absent_1(const struct cache_entry *ce,
1914 enum unpack_trees_error_types error_type,
1915 struct unpack_trees_options *o)
076b0adc 1916{
f66caaf9 1917 int len;
076b0adc
JS
1918 struct stat st;
1919
1920 if (o->index_only || o->reset || !o->update)
203a2fe1 1921 return 0;
c8193534 1922
f66caaf9
CB
1923 len = check_leading_path(ce->name, ce_namelen(ce));
1924 if (!len)
203a2fe1 1925 return 0;
f66caaf9 1926 else if (len > 0) {
f514ef97
JK
1927 char *path;
1928 int ret;
1929
1930 path = xmemdupz(ce->name, len);
a93e5301 1931 if (lstat(path, &st))
43c728e2 1932 ret = error_errno("cannot stat '%s'", path);
a7bc845a
SB
1933 else {
1934 if (submodule_from_ce(ce))
1935 ret = check_submodule_move_head(ce,
1936 oid_to_hex(&ce->oid),
1937 NULL, o);
1938 else
1939 ret = check_ok_to_remove(path, len, DT_UNKNOWN, NULL,
1940 &st, error_type, o);
1941 }
f514ef97
JK
1942 free(path);
1943 return ret;
92fda79e
JN
1944 } else if (lstat(ce->name, &st)) {
1945 if (errno != ENOENT)
43c728e2 1946 return error_errno("cannot stat '%s'", ce->name);
92fda79e
JN
1947 return 0;
1948 } else {
a7bc845a
SB
1949 if (submodule_from_ce(ce))
1950 return check_submodule_move_head(ce, oid_to_hex(&ce->oid),
1951 NULL, o);
1952
a9307f5a 1953 return check_ok_to_remove(ce->name, ce_namelen(ce),
92fda79e
JN
1954 ce_to_dtype(ce), ce, &st,
1955 error_type, o);
1956 }
076b0adc 1957}
a9307f5a 1958
eb9ae4b5 1959static int verify_absent(const struct cache_entry *ce,
08402b04 1960 enum unpack_trees_error_types error_type,
35a5aa79
NTND
1961 struct unpack_trees_options *o)
1962{
2431afbf 1963 if (!o->skip_sparse_checkout && (ce->ce_flags & CE_NEW_SKIP_WORKTREE))
f1f523ea 1964 return 0;
08402b04 1965 return verify_absent_1(ce, error_type, o);
35a5aa79 1966}
076b0adc 1967
eb9ae4b5
RS
1968static int verify_absent_sparse(const struct cache_entry *ce,
1969 enum unpack_trees_error_types error_type,
1970 struct unpack_trees_options *o)
e800ec9d 1971{
08402b04
MM
1972 enum unpack_trees_error_types orphaned_error = error_type;
1973 if (orphaned_error == ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN)
1974 orphaned_error = ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN;
1975
1976 return verify_absent_1(ce, orphaned_error, o);
e800ec9d 1977}
076b0adc 1978
f2fa3542 1979static int merged_entry(const struct cache_entry *ce,
eb9ae4b5 1980 const struct cache_entry *old,
f2fa3542 1981 struct unpack_trees_options *o)
076b0adc 1982{
7f8ab8dc 1983 int update = CE_UPDATE;
8e72d675 1984 struct cache_entry *merge = dup_cache_entry(ce, &o->result);
7f8ab8dc 1985
e11d7b59 1986 if (!old) {
2431afbf
NTND
1987 /*
1988 * New index entries. In sparse checkout, the following
1989 * verify_absent() will be delayed until after
1990 * traverse_trees() finishes in unpack_trees(), then:
1991 *
1992 * - CE_NEW_SKIP_WORKTREE will be computed correctly
1993 * - verify_absent() be called again, this time with
1994 * correct CE_NEW_SKIP_WORKTREE
1995 *
1996 * verify_absent() call here does nothing in sparse
1997 * checkout (i.e. o->skip_sparse_checkout == 0)
1998 */
1999 update |= CE_ADDED;
2000 merge->ce_flags |= CE_NEW_SKIP_WORKTREE;
2001
f2fa3542
RS
2002 if (verify_absent(merge,
2003 ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN, o)) {
a849735b 2004 discard_cache_entry(merge);
e11d7b59 2005 return -1;
f2fa3542 2006 }
e11d7b59 2007 invalidate_ce_path(merge, o);
a7bc845a
SB
2008
2009 if (submodule_from_ce(ce)) {
2010 int ret = check_submodule_move_head(ce, NULL,
2011 oid_to_hex(&ce->oid),
2012 o);
2013 if (ret)
2014 return ret;
2015 }
2016
e11d7b59 2017 } else if (!(old->ce_flags & CE_CONFLICTED)) {
076b0adc
JS
2018 /*
2019 * See if we can re-use the old CE directly?
2020 * That way we get the uptodate stat info.
2021 *
7f8ab8dc
LT
2022 * This also removes the UPDATE flag on a match; otherwise
2023 * we will end up overwriting local changes in the work tree.
076b0adc
JS
2024 */
2025 if (same(old, merge)) {
eb7a2f1d 2026 copy_cache_entry(merge, old);
7f8ab8dc 2027 update = 0;
076b0adc 2028 } else {
f2fa3542 2029 if (verify_uptodate(old, o)) {
a849735b 2030 discard_cache_entry(merge);
203a2fe1 2031 return -1;
f2fa3542 2032 }
2431afbf
NTND
2033 /* Migrate old flags over */
2034 update |= old->ce_flags & (CE_SKIP_WORKTREE | CE_NEW_SKIP_WORKTREE);
bc052d7f 2035 invalidate_ce_path(old, o);
076b0adc 2036 }
a7bc845a
SB
2037
2038 if (submodule_from_ce(ce)) {
2039 int ret = check_submodule_move_head(ce, oid_to_hex(&old->oid),
2040 oid_to_hex(&ce->oid),
2041 o);
2042 if (ret)
2043 return ret;
2044 }
e11d7b59
JH
2045 } else {
2046 /*
2047 * Previously unmerged entry left as an existence
2048 * marker by read_index_unmerged();
2049 */
2050 invalidate_ce_path(old, o);
076b0adc
JS
2051 }
2052
f2fa3542 2053 do_add_entry(o, merge, update, CE_STAGEMASK);
076b0adc
JS
2054 return 1;
2055}
2056
eb9ae4b5
RS
2057static int deleted_entry(const struct cache_entry *ce,
2058 const struct cache_entry *old,
2059 struct unpack_trees_options *o)
076b0adc 2060{
34110cd4
LT
2061 /* Did it exist in the index? */
2062 if (!old) {
08402b04 2063 if (verify_absent(ce, ERROR_WOULD_LOSE_UNTRACKED_REMOVED, o))
203a2fe1 2064 return -1;
34110cd4
LT
2065 return 0;
2066 }
e11d7b59 2067 if (!(old->ce_flags & CE_CONFLICTED) && verify_uptodate(old, o))
34110cd4
LT
2068 return -1;
2069 add_entry(o, ce, CE_REMOVE, 0);
bc052d7f 2070 invalidate_ce_path(ce, o);
076b0adc
JS
2071 return 1;
2072}
2073
eb9ae4b5
RS
2074static int keep_entry(const struct cache_entry *ce,
2075 struct unpack_trees_options *o)
076b0adc 2076{
34110cd4 2077 add_entry(o, ce, 0, 0);
5697ca9a
NTND
2078 if (ce_stage(ce))
2079 invalidate_ce_path(ce, o);
076b0adc
JS
2080 return 1;
2081}
2082
2083#if DBRT_DEBUG
2084static void show_stage_entry(FILE *o,
2085 const char *label, const struct cache_entry *ce)
2086{
2087 if (!ce)
2088 fprintf(o, "%s (missing)\n", label);
2089 else
2090 fprintf(o, "%s%06o %s %d\t%s\n",
2091 label,
7a51ed66 2092 ce->ce_mode,
99d1a986 2093 oid_to_hex(&ce->oid),
076b0adc
JS
2094 ce_stage(ce),
2095 ce->name);
2096}
2097#endif
2098
5828e835
RS
2099int threeway_merge(const struct cache_entry * const *stages,
2100 struct unpack_trees_options *o)
076b0adc 2101{
eb9ae4b5
RS
2102 const struct cache_entry *index;
2103 const struct cache_entry *head;
2104 const struct cache_entry *remote = stages[o->head_idx + 1];
076b0adc
JS
2105 int count;
2106 int head_match = 0;
2107 int remote_match = 0;
076b0adc
JS
2108
2109 int df_conflict_head = 0;
2110 int df_conflict_remote = 0;
2111
2112 int any_anc_missing = 0;
2113 int no_anc_exists = 1;
2114 int i;
2115
2116 for (i = 1; i < o->head_idx; i++) {
4c4caafc 2117 if (!stages[i] || stages[i] == o->df_conflict_entry)
076b0adc 2118 any_anc_missing = 1;
4c4caafc 2119 else
076b0adc 2120 no_anc_exists = 0;
076b0adc
JS
2121 }
2122
2123 index = stages[0];
2124 head = stages[o->head_idx];
2125
2126 if (head == o->df_conflict_entry) {
2127 df_conflict_head = 1;
2128 head = NULL;
2129 }
2130
2131 if (remote == o->df_conflict_entry) {
2132 df_conflict_remote = 1;
2133 remote = NULL;
2134 }
2135
cee2d6ae
JH
2136 /*
2137 * First, if there's a #16 situation, note that to prevent #13
076b0adc
JS
2138 * and #14.
2139 */
2140 if (!same(remote, head)) {
2141 for (i = 1; i < o->head_idx; i++) {
2142 if (same(stages[i], head)) {
2143 head_match = i;
2144 }
2145 if (same(stages[i], remote)) {
2146 remote_match = i;
2147 }
2148 }
2149 }
2150
cee2d6ae
JH
2151 /*
2152 * We start with cases where the index is allowed to match
076b0adc
JS
2153 * something other than the head: #14(ALT) and #2ALT, where it
2154 * is permitted to match the result instead.
2155 */
2156 /* #14, #14ALT, #2ALT */
2157 if (remote && !df_conflict_head && head_match && !remote_match) {
2158 if (index && !same(index, remote) && !same(index, head))
6a143aa2 2159 return reject_merge(index, o);
076b0adc
JS
2160 return merged_entry(remote, index, o);
2161 }
2162 /*
2163 * If we have an entry in the index cache, then we want to
2164 * make sure that it matches head.
2165 */
4e7c4571 2166 if (index && !same(index, head))
6a143aa2 2167 return reject_merge(index, o);
076b0adc
JS
2168
2169 if (head) {
2170 /* #5ALT, #15 */
2171 if (same(head, remote))
2172 return merged_entry(head, index, o);
2173 /* #13, #3ALT */
2174 if (!df_conflict_remote && remote_match && !head_match)
2175 return merged_entry(head, index, o);
2176 }
2177
2178 /* #1 */
34110cd4 2179 if (!head && !remote && any_anc_missing)
076b0adc
JS
2180 return 0;
2181
cee2d6ae
JH
2182 /*
2183 * Under the "aggressive" rule, we resolve mostly trivial
076b0adc
JS
2184 * cases that we historically had git-merge-one-file resolve.
2185 */
2186 if (o->aggressive) {
cee2d6ae
JH
2187 int head_deleted = !head;
2188 int remote_deleted = !remote;
eb9ae4b5 2189 const struct cache_entry *ce = NULL;
4c4caafc
JH
2190
2191 if (index)
0cf73755 2192 ce = index;
4c4caafc 2193 else if (head)
0cf73755 2194 ce = head;
4c4caafc 2195 else if (remote)
0cf73755 2196 ce = remote;
4c4caafc
JH
2197 else {
2198 for (i = 1; i < o->head_idx; i++) {
2199 if (stages[i] && stages[i] != o->df_conflict_entry) {
0cf73755 2200 ce = stages[i];
4c4caafc
JH
2201 break;
2202 }
2203 }
2204 }
2205
076b0adc
JS
2206 /*
2207 * Deleted in both.
2208 * Deleted in one and unchanged in the other.
2209 */
2210 if ((head_deleted && remote_deleted) ||
2211 (head_deleted && remote && remote_match) ||
2212 (remote_deleted && head && head_match)) {
2213 if (index)
2214 return deleted_entry(index, index, o);
34110cd4 2215 if (ce && !head_deleted) {
08402b04 2216 if (verify_absent(ce, ERROR_WOULD_LOSE_UNTRACKED_REMOVED, o))
203a2fe1
DB
2217 return -1;
2218 }
076b0adc
JS
2219 return 0;
2220 }
2221 /*
2222 * Added in both, identically.
2223 */
2224 if (no_anc_exists && head && remote && same(head, remote))
2225 return merged_entry(head, index, o);
2226
2227 }
2228
2229 /* Below are "no merge" cases, which require that the index be
2230 * up-to-date to avoid the files getting overwritten with
2231 * conflict resolution files.
2232 */
2233 if (index) {
203a2fe1
DB
2234 if (verify_uptodate(index, o))
2235 return -1;
076b0adc 2236 }
076b0adc
JS
2237
2238 o->nontrivial_merge = 1;
2239
ea4b52a8 2240 /* #2, #3, #4, #6, #7, #9, #10, #11. */
076b0adc
JS
2241 count = 0;
2242 if (!head_match || !remote_match) {
2243 for (i = 1; i < o->head_idx; i++) {
4c4caafc 2244 if (stages[i] && stages[i] != o->df_conflict_entry) {
7f7932ab 2245 keep_entry(stages[i], o);
076b0adc
JS
2246 count++;
2247 break;
2248 }
2249 }
2250 }
2251#if DBRT_DEBUG
2252 else {
2253 fprintf(stderr, "read-tree: warning #16 detected\n");
2254 show_stage_entry(stderr, "head ", stages[head_match]);
2255 show_stage_entry(stderr, "remote ", stages[remote_match]);
2256 }
2257#endif
7f7932ab
JH
2258 if (head) { count += keep_entry(head, o); }
2259 if (remote) { count += keep_entry(remote, o); }
076b0adc
JS
2260 return count;
2261}
2262
2263/*
2264 * Two-way merge.
2265 *
2266 * The rule is to "carry forward" what is in the index without losing
a75d7b54 2267 * information across a "fast-forward", favoring a successful merge
076b0adc
JS
2268 * over a merge failure when it makes sense. For details of the
2269 * "carry forward" rule, please see <Documentation/git-read-tree.txt>.
2270 *
2271 */
5828e835
RS
2272int twoway_merge(const struct cache_entry * const *src,
2273 struct unpack_trees_options *o)
076b0adc 2274{
eb9ae4b5
RS
2275 const struct cache_entry *current = src[0];
2276 const struct cache_entry *oldtree = src[1];
2277 const struct cache_entry *newtree = src[2];
076b0adc
JS
2278
2279 if (o->merge_size != 2)
2280 return error("Cannot do a twoway merge of %d trees",
2281 o->merge_size);
2282
b8ba1535
JH
2283 if (oldtree == o->df_conflict_entry)
2284 oldtree = NULL;
2285 if (newtree == o->df_conflict_entry)
2286 newtree = NULL;
2287
076b0adc 2288 if (current) {
b018ff60
JK
2289 if (current->ce_flags & CE_CONFLICTED) {
2290 if (same(oldtree, newtree) || o->reset) {
2291 if (!newtree)
2292 return deleted_entry(current, current, o);
2293 else
2294 return merged_entry(newtree, current, o);
2295 }
6a143aa2 2296 return reject_merge(current, o);
6c1db1b3 2297 } else if ((!oldtree && !newtree) || /* 4 and 5 */
b018ff60
JK
2298 (!oldtree && newtree &&
2299 same(current, newtree)) || /* 6 and 7 */
2300 (oldtree && newtree &&
2301 same(oldtree, newtree)) || /* 14 and 15 */
2302 (oldtree && newtree &&
2303 !same(oldtree, newtree) && /* 18 and 19 */
2304 same(current, newtree))) {
7f7932ab 2305 return keep_entry(current, o);
6c1db1b3 2306 } else if (oldtree && !newtree && same(current, oldtree)) {
076b0adc
JS
2307 /* 10 or 11 */
2308 return deleted_entry(oldtree, current, o);
6c1db1b3 2309 } else if (oldtree && newtree &&
076b0adc
JS
2310 same(current, oldtree) && !same(current, newtree)) {
2311 /* 20 or 21 */
2312 return merged_entry(newtree, current, o);
6c1db1b3 2313 } else
6a143aa2 2314 return reject_merge(current, o);
076b0adc 2315 }
55218834
JH
2316 else if (newtree) {
2317 if (oldtree && !o->initial_checkout) {
2318 /*
2319 * deletion of the path was staged;
2320 */
2321 if (same(oldtree, newtree))
2322 return 1;
2323 return reject_merge(oldtree, o);
2324 }
076b0adc 2325 return merged_entry(newtree, current, o);
55218834 2326 }
d699676d 2327 return deleted_entry(oldtree, current, o);
076b0adc
JS
2328}
2329
2330/*
2331 * Bind merge.
2332 *
2333 * Keep the index entries at stage0, collapse stage1 but make sure
2334 * stage0 does not have anything there.
2335 */
5828e835
RS
2336int bind_merge(const struct cache_entry * const *src,
2337 struct unpack_trees_options *o)
076b0adc 2338{
eb9ae4b5
RS
2339 const struct cache_entry *old = src[0];
2340 const struct cache_entry *a = src[1];
076b0adc
JS
2341
2342 if (o->merge_size != 1)
82247e9b 2343 return error("Cannot do a bind merge of %d trees",
076b0adc
JS
2344 o->merge_size);
2345 if (a && old)
b165fac8 2346 return o->quiet ? -1 :
3d415425
SB
2347 error(ERRORMSG(o, ERROR_BIND_OVERLAP),
2348 super_prefixed(a->name),
2349 super_prefixed(old->name));
076b0adc 2350 if (!a)
7f7932ab 2351 return keep_entry(old, o);
076b0adc
JS
2352 else
2353 return merged_entry(a, NULL, o);
2354}
2355
2356/*
2357 * One-way merge.
2358 *
2359 * The rule is:
2360 * - take the stat information from stage0, take the data from stage1
2361 */
5828e835
RS
2362int oneway_merge(const struct cache_entry * const *src,
2363 struct unpack_trees_options *o)
076b0adc 2364{
eb9ae4b5
RS
2365 const struct cache_entry *old = src[0];
2366 const struct cache_entry *a = src[1];
076b0adc
JS
2367
2368 if (o->merge_size != 1)
2369 return error("Cannot do a oneway merge of %d trees",
2370 o->merge_size);
2371
78d3b06e 2372 if (!a || a == o->df_conflict_entry)
076b0adc 2373 return deleted_entry(old, old, o);
34110cd4 2374
076b0adc 2375 if (old && same(old, a)) {
34110cd4 2376 int update = 0;
686b2de0 2377 if (o->reset && o->update && !ce_uptodate(old) && !ce_skip_worktree(old)) {
076b0adc
JS
2378 struct stat st;
2379 if (lstat(old->name, &st) ||
56cac48c 2380 ie_match_stat(o->src_index, old, &st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE))
34110cd4 2381 update |= CE_UPDATE;
076b0adc 2382 }
ad17312e
SB
2383 if (o->update && S_ISGITLINK(old->ce_mode) &&
2384 should_update_submodules() && !verify_uptodate(old, o))
2385 update |= CE_UPDATE;
ab5af825 2386 add_entry(o, old, update, CE_STAGEMASK);
34110cd4 2387 return 0;
076b0adc
JS
2388 }
2389 return merged_entry(a, old, o);
2390}