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