Merge branch 'bc/hash-independent-tests-part-5'
[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"
b14ed5ad 19#include "promisor-remote.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);
b14ed5ad 403 if (has_promisor_remote() && o->update && !o->dry_run) {
c0c578b3
JT
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)
b14ed5ad
CC
422 promisor_remote_get_direct(the_repository,
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
90553847 635static int find_cache_pos(struct traverse_info *, const char *p, size_t len);
730f7284
JH
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;
90553847 654 pos = find_cache_pos(info->prev, info->name, info->namelen);
730f7284
JH
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;
c43ab062 689 struct strbuf name = STRBUF_INIT;
b4da3738
NTND
690 int pos;
691
c43ab062
JK
692 strbuf_make_traverse_path(&name, info, names->path, names->pathlen);
693 strbuf_addch(&name, '/');
694 pos = index_name_pos(o->src_index, name.buf, name.len);
b4da3738
NTND
695 if (pos >= 0)
696 BUG("This is a directory and should not exist in index");
697 pos = -pos - 1;
c43ab062
JK
698 if (!starts_with(o->src_index->cache[pos]->name, name.buf) ||
699 (pos > 0 && starts_with(o->src_index->cache[pos-1]->name, name.buf)))
b4da3738 700 BUG("pos must point at the first entry in this directory");
c43ab062 701 strbuf_release(&name);
b4da3738
NTND
702 return pos;
703}
704
705/*
706 * Fast path if we detect that all trees are the same as cache-tree at this
5f4436a7
NTND
707 * path. We'll walk these trees in an iterative loop using cache-tree/index
708 * instead of ODB since we already know what these trees contain.
b4da3738
NTND
709 */
710static int traverse_by_cache_tree(int pos, int nr_entries, int nr_names,
b4da3738
NTND
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;
66429698 800 ret = traverse_by_cache_tree(pos, nr_entries, n, info);
b4da3738
NTND
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;
90553847
JK
812 newinfo.name = p->path;
813 newinfo.namelen = p->pathlen;
814 newinfo.mode = p->mode;
37806080 815 newinfo.pathlen = st_add3(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 */
90553847
JK
866static int do_compare_entry_piecewise(const struct cache_entry *ce,
867 const struct traverse_info *info,
868 const char *name, size_t namelen,
869 unsigned mode)
01904572 870{
90553847 871 int pathlen, ce_len;
01904572
LT
872 const char *ce_name;
873
874 if (info->prev) {
d9c2bd56 875 int cmp = do_compare_entry_piecewise(ce, info->prev,
90553847
JK
876 info->name, info->namelen,
877 info->mode);
01904572
LT
878 if (cmp)
879 return cmp;
880 }
881 pathlen = info->pathlen;
882 ce_len = ce_namelen(ce);
883
884 /* If ce_len < pathlen then we must have previously hit "name == directory" entry */
885 if (ce_len < pathlen)
886 return -1;
887
888 ce_len -= pathlen;
889 ce_name = ce->name + pathlen;
890
90553847 891 return df_name_compare(ce_name, ce_len, S_IFREG, name, namelen, mode);
01904572
LT
892}
893
d9c2bd56
DT
894static int do_compare_entry(const struct cache_entry *ce,
895 const struct traverse_info *info,
90553847
JK
896 const char *name, size_t namelen,
897 unsigned mode)
d9c2bd56 898{
90553847 899 int pathlen, ce_len;
d9c2bd56
DT
900 const char *ce_name;
901 int cmp;
902
903 /*
904 * If we have not precomputed the traverse path, it is quicker
905 * to avoid doing so. But if we have precomputed it,
906 * it is quicker to use the precomputed version.
907 */
908 if (!info->traverse_path)
90553847 909 return do_compare_entry_piecewise(ce, info, name, namelen, mode);
d9c2bd56
DT
910
911 cmp = strncmp(ce->name, info->traverse_path, info->pathlen);
912 if (cmp)
913 return cmp;
914
915 pathlen = info->pathlen;
916 ce_len = ce_namelen(ce);
917
918 if (ce_len < pathlen)
919 return -1;
920
921 ce_len -= pathlen;
922 ce_name = ce->name + pathlen;
923
90553847 924 return df_name_compare(ce_name, ce_len, S_IFREG, name, namelen, mode);
d9c2bd56
DT
925}
926
01904572
LT
927static int compare_entry(const struct cache_entry *ce, const struct traverse_info *info, const struct name_entry *n)
928{
90553847 929 int cmp = do_compare_entry(ce, info, n->path, n->pathlen, n->mode);
01904572
LT
930 if (cmp)
931 return cmp;
932
933 /*
934 * Even if the beginning compared identically, the ce should
935 * compare as bigger than a directory leading up to it!
936 */
b3b3cbcb 937 return ce_namelen(ce) > traverse_path_len(info, tree_entry_len(n));
01904572
LT
938}
939
da165f47
JH
940static int ce_in_traverse_path(const struct cache_entry *ce,
941 const struct traverse_info *info)
942{
943 if (!info->prev)
944 return 1;
90553847
JK
945 if (do_compare_entry(ce, info->prev,
946 info->name, info->namelen, info->mode))
da165f47
JH
947 return 0;
948 /*
949 * If ce (blob) is the same name as the path (which is a tree
950 * we will be descending into), it won't be inside it.
951 */
952 return (info->pathlen < ce_namelen(ce));
953}
954
a849735b
JM
955static struct cache_entry *create_ce_entry(const struct traverse_info *info,
956 const struct name_entry *n,
957 int stage,
958 struct index_state *istate,
959 int is_transient)
01904572 960{
b3b3cbcb 961 size_t len = traverse_path_len(info, tree_entry_len(n));
a849735b
JM
962 struct cache_entry *ce =
963 is_transient ?
964 make_empty_transient_cache_entry(len) :
965 make_empty_cache_entry(istate, len);
01904572
LT
966
967 ce->ce_mode = create_ce_mode(n->mode);
b60e188c
TG
968 ce->ce_flags = create_ce_flags(stage);
969 ce->ce_namelen = len;
ea82b2a0 970 oidcpy(&ce->oid, &n->oid);
5aa02f98
JK
971 /* len+1 because the cache_entry allocates space for NUL */
972 make_traverse_path(ce->name, len + 1, info, n->path, n->pathlen);
01904572
LT
973
974 return ce;
975}
976
b4da3738
NTND
977/*
978 * Note that traverse_by_cache_tree() duplicates some logic in this function
979 * without actually calling it. If you change the logic here you may need to
980 * check and change there as well.
981 */
c7cddc1a
RS
982static int unpack_nondirectories(int n, unsigned long mask,
983 unsigned long dirmask,
984 struct cache_entry **src,
985 const struct name_entry *names,
986 const struct traverse_info *info)
01904572
LT
987{
988 int i;
989 struct unpack_trees_options *o = info->data;
603d2498 990 unsigned long conflicts = info->df_conflicts | dirmask;
01904572
LT
991
992 /* Do we have *only* directories? Nothing to do */
993 if (mask == dirmask && !src[0])
994 return 0;
995
01904572
LT
996 /*
997 * Ok, we've filled in up to any potential index entry in src[0],
998 * now do the rest.
999 */
1000 for (i = 0; i < n; i++) {
1001 int stage;
1002 unsigned int bit = 1ul << i;
1003 if (conflicts & bit) {
1004 src[i + o->merge] = o->df_conflict_entry;
1005 continue;
1006 }
1007 if (!(mask & bit))
1008 continue;
1009 if (!o->merge)
1010 stage = 0;
1011 else if (i + 1 < o->head_idx)
1012 stage = 1;
1013 else if (i + 1 > o->head_idx)
1014 stage = 3;
1015 else
1016 stage = 2;
a849735b
JM
1017
1018 /*
1019 * If the merge bit is set, then the cache entries are
1020 * discarded in the following block. In this case,
1021 * construct "transient" cache_entries, as they are
1022 * not stored in the index. otherwise construct the
1023 * cache entry from the index aware logic.
1024 */
1025 src[i + o->merge] = create_ce_entry(info, names + i, stage, &o->result, o->merge);
01904572
LT
1026 }
1027
5d80ef5a
RS
1028 if (o->merge) {
1029 int rc = call_unpack_fn((const struct cache_entry * const *)src,
1030 o);
1031 for (i = 0; i < n; i++) {
1032 struct cache_entry *ce = src[i + o->merge];
1033 if (ce != o->df_conflict_entry)
a849735b 1034 discard_cache_entry(ce);
5d80ef5a
RS
1035 }
1036 return rc;
1037 }
01904572 1038
01904572 1039 for (i = 0; i < n; i++)
aab3b9a1 1040 if (src[i] && src[i] != o->df_conflict_entry)
46169180
JK
1041 if (do_add_entry(o, src[i], 0, 0))
1042 return -1;
1043
01904572
LT
1044 return 0;
1045}
1046
353c5eeb
JH
1047static int unpack_failed(struct unpack_trees_options *o, const char *message)
1048{
1049 discard_index(&o->result);
b165fac8 1050 if (!o->quiet && !o->exiting_early) {
353c5eeb
JH
1051 if (message)
1052 return error("%s", message);
1053 return -1;
1054 }
1055 return -1;
1056}
1057
730f7284
JH
1058/*
1059 * The tree traversal is looking at name p. If we have a matching entry,
1060 * return it. If name p is a directory in the index, do not return
1061 * anything, as we will want to match it when the traversal descends into
1062 * the directory.
1063 */
1064static int find_cache_pos(struct traverse_info *info,
90553847 1065 const char *p, size_t p_len)
730f7284
JH
1066{
1067 int pos;
1068 struct unpack_trees_options *o = info->data;
1069 struct index_state *index = o->src_index;
1070 int pfxlen = info->pathlen;
730f7284
JH
1071
1072 for (pos = o->cache_bottom; pos < index->cache_nr; pos++) {
9c5e6c80 1073 const struct cache_entry *ce = index->cache[pos];
730f7284
JH
1074 const char *ce_name, *ce_slash;
1075 int cmp, ce_len;
1076
e53e6b44
BD
1077 if (ce->ce_flags & CE_UNPACKED) {
1078 /*
1079 * cache_bottom entry is already unpacked, so
1080 * we can never match it; don't check it
1081 * again.
1082 */
1083 if (pos == o->cache_bottom)
1084 ++o->cache_bottom;
730f7284 1085 continue;
e53e6b44 1086 }
a6720955
DT
1087 if (!ce_in_traverse_path(ce, info)) {
1088 /*
1089 * Check if we can skip future cache checks
1090 * (because we're already past all possible
1091 * entries in the traverse path).
1092 */
1093 if (info->traverse_path) {
1094 if (strncmp(ce->name, info->traverse_path,
1095 info->pathlen) > 0)
1096 break;
1097 }
730f7284 1098 continue;
a6720955 1099 }
730f7284
JH
1100 ce_name = ce->name + pfxlen;
1101 ce_slash = strchr(ce_name, '/');
1102 if (ce_slash)
1103 ce_len = ce_slash - ce_name;
1104 else
1105 ce_len = ce_namelen(ce) - pfxlen;
90553847 1106 cmp = name_compare(p, p_len, ce_name, ce_len);
730f7284
JH
1107 /*
1108 * Exact match; if we have a directory we need to
1109 * delay returning it.
1110 */
1111 if (!cmp)
1112 return ce_slash ? -2 - pos : pos;
1113 if (0 < cmp)
1114 continue; /* keep looking */
1115 /*
1116 * ce_name sorts after p->path; could it be that we
1117 * have files under p->path directory in the index?
1118 * E.g. ce_name == "t-i", and p->path == "t"; we may
1119 * have "t/a" in the index.
1120 */
90553847 1121 if (p_len < ce_len && !memcmp(ce_name, p, p_len) &&
730f7284
JH
1122 ce_name[p_len] < '/')
1123 continue; /* keep looking */
1124 break;
1125 }
1126 return -1;
1127}
1128
1129static struct cache_entry *find_cache_entry(struct traverse_info *info,
1130 const struct name_entry *p)
1131{
90553847 1132 int pos = find_cache_pos(info, p->path, p->pathlen);
730f7284
JH
1133 struct unpack_trees_options *o = info->data;
1134
1135 if (0 <= pos)
1136 return o->src_index->cache[pos];
1137 else
1138 return NULL;
1139}
1140
ba655da5
JH
1141static void debug_path(struct traverse_info *info)
1142{
1143 if (info->prev) {
1144 debug_path(info->prev);
90553847 1145 if (*info->prev->name)
ba655da5
JH
1146 putchar('/');
1147 }
90553847 1148 printf("%s", info->name);
ba655da5
JH
1149}
1150
1151static void debug_name_entry(int i, struct name_entry *n)
1152{
1153 printf("ent#%d %06o %s\n", i,
1154 n->path ? n->mode : 0,
1155 n->path ? n->path : "(missing)");
1156}
1157
1158static void debug_unpack_callback(int n,
1159 unsigned long mask,
1160 unsigned long dirmask,
1161 struct name_entry *names,
1162 struct traverse_info *info)
1163{
1164 int i;
1165 printf("* unpack mask %lu, dirmask %lu, cnt %d ",
1166 mask, dirmask, n);
1167 debug_path(info);
1168 putchar('\n');
1169 for (i = 0; i < n; i++)
1170 debug_name_entry(i, names + i);
1171}
1172
b4da3738
NTND
1173/*
1174 * Note that traverse_by_cache_tree() duplicates some logic in this function
1175 * without actually calling it. If you change the logic here you may need to
1176 * check and change there as well.
1177 */
01904572
LT
1178static int unpack_callback(int n, unsigned long mask, unsigned long dirmask, struct name_entry *names, struct traverse_info *info)
1179{
c7cddc1a 1180 struct cache_entry *src[MAX_UNPACK_TREES + 1] = { NULL, };
01904572 1181 struct unpack_trees_options *o = info->data;
01904572
LT
1182 const struct name_entry *p = names;
1183
1184 /* Find first entry with a real name (we could use "mask" too) */
1185 while (!p->mode)
1186 p++;
1187
ba655da5
JH
1188 if (o->debug_unpack)
1189 debug_unpack_callback(n, mask, dirmask, names, info);
1190
01904572
LT
1191 /* Are we supposed to look at the index too? */
1192 if (o->merge) {
da165f47 1193 while (1) {
da165f47 1194 int cmp;
730f7284
JH
1195 struct cache_entry *ce;
1196
1197 if (o->diff_index_cached)
1198 ce = next_cache_entry(o);
1199 else
1200 ce = find_cache_entry(info, p);
1201
da165f47
JH
1202 if (!ce)
1203 break;
1204 cmp = compare_entry(ce, info, p);
01904572
LT
1205 if (cmp < 0) {
1206 if (unpack_index_entry(ce, o) < 0)
353c5eeb 1207 return unpack_failed(o, NULL);
01904572
LT
1208 continue;
1209 }
1210 if (!cmp) {
1211 if (ce_stage(ce)) {
1212 /*
da165f47
JH
1213 * If we skip unmerged index
1214 * entries, we'll skip this
1215 * entry *and* the tree
1216 * entries associated with it!
01904572 1217 */
34110cd4 1218 if (o->skip_unmerged) {
da165f47 1219 add_same_unmerged(ce, o);
01904572 1220 return mask;
34110cd4 1221 }
01904572
LT
1222 }
1223 src[0] = ce;
01904572
LT
1224 }
1225 break;
1226 }
1227 }
1228
34110cd4 1229 if (unpack_nondirectories(n, mask, dirmask, src, names, info) < 0)
01904572
LT
1230 return -1;
1231
97e5954b 1232 if (o->merge && src[0]) {
da165f47
JH
1233 if (ce_stage(src[0]))
1234 mark_ce_used_same_name(src[0], o);
1235 else
1236 mark_ce_used(src[0], o);
1237 }
1238
01904572
LT
1239 /* Now handle any directories.. */
1240 if (dirmask) {
b65982b6
JH
1241 /* special case: "diff-index --cached" looking at a tree */
1242 if (o->diff_index_cached &&
1243 n == 1 && dirmask == 1 && S_ISDIR(names->mode)) {
1244 int matches;
1245 matches = cache_tree_matches_traversal(o->src_index->cache_tree,
1246 names, info);
1247 /*
da165f47
JH
1248 * Everything under the name matches; skip the
1249 * entire hierarchy. diff_index_cached codepath
1250 * special cases D/F conflicts in such a way that
1251 * it does not do any look-ahead, so this is safe.
b65982b6
JH
1252 */
1253 if (matches) {
da165f47 1254 o->cache_bottom += matches;
b65982b6
JH
1255 return mask;
1256 }
1257 }
1258
603d2498 1259 if (traverse_trees_recursive(n, dirmask, mask & ~dirmask,
542c264b
JH
1260 names, info) < 0)
1261 return -1;
01904572
LT
1262 return mask;
1263 }
1264
1265 return mask;
1266}
1267
27c82fb3
NTND
1268static int clear_ce_flags_1(struct index_state *istate,
1269 struct cache_entry **cache, int nr,
fc2b6214 1270 struct strbuf *prefix,
28911091
NTND
1271 int select_mask, int clear_mask,
1272 struct exclude_list *el, int defval);
1273
9037026d 1274/* Whole directory matching */
27c82fb3
NTND
1275static int clear_ce_flags_dir(struct index_state *istate,
1276 struct cache_entry **cache, int nr,
fc2b6214 1277 struct strbuf *prefix,
9037026d
NTND
1278 char *basename,
1279 int select_mask, int clear_mask,
28911091 1280 struct exclude_list *el, int defval)
9037026d 1281{
28911091 1282 struct cache_entry **cache_end;
9037026d 1283 int dtype = DT_DIR;
fc2b6214 1284 int ret = is_excluded_from_list(prefix->buf, prefix->len,
27c82fb3 1285 basename, &dtype, el, istate);
fc2b6214 1286 int rc;
9037026d 1287
fc2b6214 1288 strbuf_addch(prefix, '/');
9037026d 1289
28911091
NTND
1290 /* If undecided, use matching result of parent dir in defval */
1291 if (ret < 0)
1292 ret = defval;
9037026d 1293
28911091
NTND
1294 for (cache_end = cache; cache_end != cache + nr; cache_end++) {
1295 struct cache_entry *ce = *cache_end;
fc2b6214 1296 if (strncmp(ce->name, prefix->buf, prefix->len))
28911091 1297 break;
9037026d
NTND
1298 }
1299
28911091
NTND
1300 /*
1301 * TODO: check el, if there are no patterns that may conflict
1302 * with ret (iow, we know in advance the incl/excl
1303 * decision for the entire directory), clear flag here without
1304 * calling clear_ce_flags_1(). That function will call
07958050 1305 * the expensive is_excluded_from_list() on every entry.
28911091 1306 */
27c82fb3 1307 rc = clear_ce_flags_1(istate, cache, cache_end - cache,
fc2b6214
AP
1308 prefix,
1309 select_mask, clear_mask,
1310 el, ret);
1311 strbuf_setlen(prefix, prefix->len - 1);
1312 return rc;
9037026d
NTND
1313}
1314
1315/*
1316 * Traverse the index, find every entry that matches according to
1317 * o->el. Do "ce_flags &= ~clear_mask" on those entries. Return the
1318 * number of traversed entries.
1319 *
1320 * If select_mask is non-zero, only entries whose ce_flags has on of
1321 * those bits enabled are traversed.
1322 *
1323 * cache : pointer to an index entry
1324 * prefix_len : an offset to its path
1325 *
1326 * The current path ("prefix") including the trailing '/' is
1327 * cache[0]->name[0..(prefix_len-1)]
1328 * Top level path has prefix_len zero.
1329 */
27c82fb3
NTND
1330static int clear_ce_flags_1(struct index_state *istate,
1331 struct cache_entry **cache, int nr,
fc2b6214 1332 struct strbuf *prefix,
9037026d 1333 int select_mask, int clear_mask,
28911091 1334 struct exclude_list *el, int defval)
9037026d
NTND
1335{
1336 struct cache_entry **cache_end = cache + nr;
1337
1338 /*
1339 * Process all entries that have the given prefix and meet
1340 * select_mask condition
1341 */
1342 while(cache != cache_end) {
1343 struct cache_entry *ce = *cache;
1344 const char *name, *slash;
28911091 1345 int len, dtype, ret;
9037026d
NTND
1346
1347 if (select_mask && !(ce->ce_flags & select_mask)) {
1348 cache++;
1349 continue;
1350 }
1351
fc2b6214 1352 if (prefix->len && strncmp(ce->name, prefix->buf, prefix->len))
9037026d
NTND
1353 break;
1354
fc2b6214 1355 name = ce->name + prefix->len;
9037026d
NTND
1356 slash = strchr(name, '/');
1357
1358 /* If it's a directory, try whole directory match first */
1359 if (slash) {
1360 int processed;
1361
1362 len = slash - name;
fc2b6214 1363 strbuf_add(prefix, name, len);
9037026d 1364
27c82fb3 1365 processed = clear_ce_flags_dir(istate, cache, cache_end - cache,
fc2b6214
AP
1366 prefix,
1367 prefix->buf + prefix->len - len,
9037026d 1368 select_mask, clear_mask,
28911091 1369 el, defval);
9037026d
NTND
1370
1371 /* clear_c_f_dir eats a whole dir already? */
1372 if (processed) {
1373 cache += processed;
fc2b6214 1374 strbuf_setlen(prefix, prefix->len - len);
9037026d
NTND
1375 continue;
1376 }
1377
fc2b6214 1378 strbuf_addch(prefix, '/');
27c82fb3 1379 cache += clear_ce_flags_1(istate, cache, cache_end - cache,
fc2b6214 1380 prefix,
28911091 1381 select_mask, clear_mask, el, defval);
fc2b6214 1382 strbuf_setlen(prefix, prefix->len - len - 1);
9037026d
NTND
1383 continue;
1384 }
1385
1386 /* Non-directory */
1387 dtype = ce_to_dtype(ce);
07958050 1388 ret = is_excluded_from_list(ce->name, ce_namelen(ce),
27c82fb3 1389 name, &dtype, el, istate);
28911091
NTND
1390 if (ret < 0)
1391 ret = defval;
1392 if (ret > 0)
9037026d
NTND
1393 ce->ce_flags &= ~clear_mask;
1394 cache++;
1395 }
1396 return nr - (cache_end - cache);
1397}
1398
27c82fb3
NTND
1399static int clear_ce_flags(struct index_state *istate,
1400 int select_mask, int clear_mask,
1401 struct exclude_list *el)
9037026d 1402{
fc2b6214
AP
1403 static struct strbuf prefix = STRBUF_INIT;
1404
1405 strbuf_reset(&prefix);
1406
27c82fb3
NTND
1407 return clear_ce_flags_1(istate,
1408 istate->cache,
1409 istate->cache_nr,
fc2b6214 1410 &prefix,
9037026d 1411 select_mask, clear_mask,
28911091 1412 el, 0);
9037026d
NTND
1413}
1414
2431afbf
NTND
1415/*
1416 * Set/Clear CE_NEW_SKIP_WORKTREE according to $GIT_DIR/info/sparse-checkout
1417 */
1418static void mark_new_skip_worktree(struct exclude_list *el,
86016ec3 1419 struct index_state *istate,
2431afbf
NTND
1420 int select_flag, int skip_wt_flag)
1421{
1422 int i;
1423
9037026d
NTND
1424 /*
1425 * 1. Pretend the narrowest worktree: only unmerged entries
1426 * are checked out
1427 */
86016ec3
NTND
1428 for (i = 0; i < istate->cache_nr; i++) {
1429 struct cache_entry *ce = istate->cache[i];
2431afbf
NTND
1430
1431 if (select_flag && !(ce->ce_flags & select_flag))
1432 continue;
1433
b33fdfc3 1434 if (!ce_stage(ce) && !(ce->ce_flags & CE_CONFLICTED))
2431afbf
NTND
1435 ce->ce_flags |= skip_wt_flag;
1436 else
1437 ce->ce_flags &= ~skip_wt_flag;
1438 }
9037026d
NTND
1439
1440 /*
1441 * 2. Widen worktree according to sparse-checkout file.
1442 * Matched entries will have skip_wt_flag cleared (i.e. "in")
1443 */
27c82fb3 1444 clear_ce_flags(istate, select_flag, skip_wt_flag, el);
2431afbf
NTND
1445}
1446
eb9ae4b5
RS
1447static int verify_absent(const struct cache_entry *,
1448 enum unpack_trees_error_types,
1449 struct unpack_trees_options *);
2e2b887d
JH
1450/*
1451 * N-way merge "len" trees. Returns 0 on success, -1 on failure to manipulate the
1452 * resulting index, -2 on failure to reflect the changes to the work tree.
2431afbf
NTND
1453 *
1454 * CE_ADDED, CE_UNPACKED and CE_NEW_SKIP_WORKTREE are used internally
2e2b887d 1455 */
01904572
LT
1456int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options *o)
1457{
e800ec9d 1458 int i, ret;
0fb1eaa8 1459 static struct cache_entry *dfc;
08aefc9e 1460 struct exclude_list el;
16da134b 1461
ca885a4f
JH
1462 if (len > MAX_UNPACK_TREES)
1463 die("unpack_trees takes at most %d trees", MAX_UNPACK_TREES);
16da134b 1464
0d1ed596 1465 trace_performance_enter();
08aefc9e
NTND
1466 memset(&el, 0, sizeof(el));
1467 if (!core_apply_sparse_checkout || !o->update)
1468 o->skip_sparse_checkout = 1;
1469 if (!o->skip_sparse_checkout) {
fcd12db6 1470 char *sparse = git_pathdup("info/sparse-checkout");
473e3930 1471 if (add_excludes_from_file_to_list(sparse, "", 0, &el, NULL) < 0)
08aefc9e
NTND
1472 o->skip_sparse_checkout = 1;
1473 else
1474 o->el = &el;
fcd12db6 1475 free(sparse);
08aefc9e
NTND
1476 }
1477
34110cd4 1478 memset(&o->result, 0, sizeof(o->result));
913e0e99 1479 o->result.initialized = 1;
da165f47
JH
1480 o->result.timestamp.sec = o->src_index->timestamp.sec;
1481 o->result.timestamp.nsec = o->src_index->timestamp.nsec;
9170c7ab 1482 o->result.version = o->src_index->version;
7db11830
EN
1483 if (!o->src_index->split_index) {
1484 o->result.split_index = NULL;
1485 } else if (o->src_index == o->dst_index) {
1486 /*
1487 * o->dst_index (and thus o->src_index) will be discarded
1488 * and overwritten with o->result at the end of this function,
1489 * so just use src_index's split_index to avoid having to
1490 * create a new one.
1491 */
1492 o->result.split_index = o->src_index->split_index;
5fc2fc8f 1493 o->result.split_index->refcount++;
7db11830
EN
1494 } else {
1495 o->result.split_index = init_split_index(&o->result);
1496 }
75691ea3 1497 oidcpy(&o->result.oid, &o->src_index->oid);
16da134b 1498 o->merge_size = len;
da165f47 1499 mark_all_ce_unused(o->src_index);
0fb1eaa8 1500
2431afbf
NTND
1501 /*
1502 * Sparse checkout loop #1: set NEW_SKIP_WORKTREE on existing entries
1503 */
1504 if (!o->skip_sparse_checkout)
1505 mark_new_skip_worktree(o->el, o->src_index, 0, CE_NEW_SKIP_WORKTREE);
1506
0fb1eaa8 1507 if (!dfc)
13494ed1 1508 dfc = xcalloc(1, cache_entry_size(0));
0fb1eaa8 1509 o->df_conflict_entry = dfc;
16da134b
JS
1510
1511 if (len) {
01904572
LT
1512 const char *prefix = o->prefix ? o->prefix : "";
1513 struct traverse_info info;
1514
1515 setup_traverse_info(&info, prefix);
1516 info.fn = unpack_callback;
1517 info.data = o;
e6c111b4 1518 info.show_all_errors = o->show_all_errors;
40e37256 1519 info.pathspec = o->pathspec;
01904572 1520
da165f47
JH
1521 if (o->prefix) {
1522 /*
1523 * Unpack existing index entries that sort before the
1524 * prefix the tree is spliced into. Note that o->merge
1525 * is always true in this case.
1526 */
1527 while (1) {
1528 struct cache_entry *ce = next_cache_entry(o);
1529 if (!ce)
1530 break;
1531 if (ce_in_traverse_path(ce, &info))
1532 break;
1533 if (unpack_index_entry(ce, o) < 0)
1534 goto return_failed;
1535 }
08aefc9e 1536 }
da165f47 1537
0d1ed596 1538 trace_performance_enter();
67022e02 1539 ret = traverse_trees(o->src_index, len, t, &info);
0d1ed596
NTND
1540 trace_performance_leave("traverse_trees");
1541 if (ret < 0)
da165f47 1542 goto return_failed;
16da134b
JS
1543 }
1544
01904572
LT
1545 /* Any left-over entries in the index? */
1546 if (o->merge) {
da165f47
JH
1547 while (1) {
1548 struct cache_entry *ce = next_cache_entry(o);
1549 if (!ce)
1550 break;
01904572 1551 if (unpack_index_entry(ce, o) < 0)
da165f47 1552 goto return_failed;
17e46426 1553 }
17e46426 1554 }
da165f47 1555 mark_all_ce_unused(o->src_index);
16da134b 1556
08aefc9e
NTND
1557 if (o->trivial_merges_only && o->nontrivial_merge) {
1558 ret = unpack_failed(o, "Merge requires file-level merging");
1559 goto done;
1560 }
01904572 1561
e800ec9d 1562 if (!o->skip_sparse_checkout) {
9e1afb16 1563 int empty_worktree = 1;
2431afbf
NTND
1564
1565 /*
1566 * Sparse checkout loop #2: set NEW_SKIP_WORKTREE on entries not in loop #1
1567 * If the will have NEW_SKIP_WORKTREE, also set CE_SKIP_WORKTREE
1568 * so apply_sparse_checkout() won't attempt to remove it from worktree
1569 */
1570 mark_new_skip_worktree(o->el, &o->result, CE_ADDED, CE_SKIP_WORKTREE | CE_NEW_SKIP_WORKTREE);
1571
17d26a4d 1572 ret = 0;
2431afbf 1573 for (i = 0; i < o->result.cache_nr; i++) {
e800ec9d
NTND
1574 struct cache_entry *ce = o->result.cache[i];
1575
2431afbf
NTND
1576 /*
1577 * Entries marked with CE_ADDED in merged_entry() do not have
1578 * verify_absent() check (the check is effectively disabled
1579 * because CE_NEW_SKIP_WORKTREE is set unconditionally).
1580 *
1581 * Do the real check now because we have had
1582 * correct CE_NEW_SKIP_WORKTREE
1583 */
1584 if (ce->ce_flags & CE_ADDED &&
17d26a4d
NTND
1585 verify_absent(ce, ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN, o)) {
1586 if (!o->show_all_errors)
1587 goto return_failed;
1588 ret = -1;
1589 }
2431afbf 1590
a5c446f1 1591 if (apply_sparse_checkout(&o->result, ce, o)) {
17d26a4d
NTND
1592 if (!o->show_all_errors)
1593 goto return_failed;
e800ec9d 1594 ret = -1;
e800ec9d 1595 }
eec3fc03 1596 if (!ce_skip_worktree(ce))
9e1afb16 1597 empty_worktree = 0;
f1f523ea 1598
e800ec9d 1599 }
17d26a4d
NTND
1600 if (ret < 0)
1601 goto return_failed;
a7bc906f
NTND
1602 /*
1603 * Sparse checkout is meant to narrow down checkout area
1604 * but it does not make sense to narrow down to empty working
1605 * tree. This is usually a mistake in sparse checkout rules.
1606 * Do not allow users to do that.
1607 */
9e1afb16
NTND
1608 if (o->result.cache_nr && empty_worktree) {
1609 ret = unpack_failed(o, "Sparse checkout leaves no entry on working directory");
1610 goto done;
1611 }
e800ec9d 1612 }
01904572 1613
30ac275b 1614 ret = check_updates(o) ? (-2) : 0;
e28f7641 1615 if (o->dst_index) {
836ef2b6 1616 move_index_extensions(&o->result, o->src_index);
52fca218 1617 if (!ret) {
4592e608 1618 if (git_env_bool("GIT_TEST_CHECK_CACHE_TREE", 0))
c207e9e1 1619 cache_tree_verify(the_repository, &o->result);
52fca218
BD
1620 if (!o->result.cache_tree)
1621 o->result.cache_tree = cache_tree();
1622 if (!cache_tree_fully_valid(o->result.cache_tree))
1623 cache_tree_update(&o->result,
1624 WRITE_TREE_SILENT |
1625 WRITE_TREE_REPAIR);
1626 }
1956ecd0
BP
1627
1628 o->result.updated_workdir = 1;
e28f7641 1629 discard_index(o->dst_index);
34110cd4 1630 *o->dst_index = o->result;
a16cc8b2
JH
1631 } else {
1632 discard_index(&o->result);
e28f7641 1633 }
7db11830 1634 o->src_index = NULL;
08aefc9e
NTND
1635
1636done:
0d1ed596 1637 trace_performance_leave("unpack_trees");
f6198812 1638 clear_exclude_list(&el);
2e2b887d 1639 return ret;
da165f47
JH
1640
1641return_failed:
e6c111b4
MM
1642 if (o->show_all_errors)
1643 display_error_msgs(o);
da165f47 1644 mark_all_ce_unused(o->src_index);
026680f8 1645 ret = unpack_failed(o, NULL);
b4194828
JH
1646 if (o->exiting_early)
1647 ret = 0;
026680f8 1648 goto done;
16da134b 1649}
076b0adc
JS
1650
1651/* Here come the merge functions */
1652
eb9ae4b5
RS
1653static int reject_merge(const struct cache_entry *ce,
1654 struct unpack_trees_options *o)
076b0adc 1655{
191e9d2c 1656 return add_rejected_path(o, ERROR_WOULD_OVERWRITE, ce->name);
076b0adc
JS
1657}
1658
eb9ae4b5 1659static int same(const struct cache_entry *a, const struct cache_entry *b)
076b0adc
JS
1660{
1661 if (!!a != !!b)
1662 return 0;
1663 if (!a && !b)
1664 return 1;
e11d7b59
JH
1665 if ((a->ce_flags | b->ce_flags) & CE_CONFLICTED)
1666 return 0;
076b0adc 1667 return a->ce_mode == b->ce_mode &&
4a7e27e9 1668 oideq(&a->oid, &b->oid);
076b0adc
JS
1669}
1670
1671
1672/*
1673 * When a CE gets turned into an unmerged entry, we
1674 * want it to be up-to-date
1675 */
eb9ae4b5
RS
1676static int verify_uptodate_1(const struct cache_entry *ce,
1677 struct unpack_trees_options *o,
1678 enum unpack_trees_error_types error_type)
076b0adc
JS
1679{
1680 struct stat st;
1681
d5b66299
NTND
1682 if (o->index_only)
1683 return 0;
1684
1685 /*
1686 * CE_VALID and CE_SKIP_WORKTREE cheat, we better check again
1687 * if this entry is truly up-to-date because this file may be
1688 * overwritten.
1689 */
1690 if ((ce->ce_flags & CE_VALID) || ce_skip_worktree(ce))
1691 ; /* keep checking */
1692 else if (o->reset || ce_uptodate(ce))
203a2fe1 1693 return 0;
076b0adc
JS
1694
1695 if (!lstat(ce->name, &st)) {
d5b66299
NTND
1696 int flags = CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE;
1697 unsigned changed = ie_match_stat(o->src_index, ce, &st, flags);
a7bc845a
SB
1698
1699 if (submodule_from_ce(ce)) {
1700 int r = check_submodule_move_head(ce,
1701 "HEAD", oid_to_hex(&ce->oid), o);
1702 if (r)
191e9d2c 1703 return add_rejected_path(o, error_type, ce->name);
a7bc845a
SB
1704 return 0;
1705 }
1706
076b0adc 1707 if (!changed)
203a2fe1 1708 return 0;
936492d3 1709 /*
a7bc845a
SB
1710 * Historic default policy was to allow submodule to be out
1711 * of sync wrt the superproject index. If the submodule was
1712 * not considered interesting above, we don't care here.
936492d3 1713 */
7a51ed66 1714 if (S_ISGITLINK(ce->ce_mode))
203a2fe1 1715 return 0;
a7bc845a 1716
076b0adc
JS
1717 errno = 0;
1718 }
076b0adc 1719 if (errno == ENOENT)
203a2fe1 1720 return 0;
191e9d2c 1721 return add_rejected_path(o, error_type, ce->name);
35a5aa79
NTND
1722}
1723
64b1abe9
EN
1724int verify_uptodate(const struct cache_entry *ce,
1725 struct unpack_trees_options *o)
35a5aa79 1726{
2431afbf 1727 if (!o->skip_sparse_checkout && (ce->ce_flags & CE_NEW_SKIP_WORKTREE))
f1f523ea 1728 return 0;
08402b04 1729 return verify_uptodate_1(ce, o, ERROR_NOT_UPTODATE_FILE);
076b0adc
JS
1730}
1731
eb9ae4b5 1732static int verify_uptodate_sparse(const struct cache_entry *ce,
e800ec9d
NTND
1733 struct unpack_trees_options *o)
1734{
08402b04 1735 return verify_uptodate_1(ce, o, ERROR_SPARSE_NOT_UPTODATE_FILE);
076b0adc
JS
1736}
1737
383480ba
NTND
1738/*
1739 * TODO: We should actually invalidate o->result, not src_index [1].
1740 * But since cache tree and untracked cache both are not copied to
1741 * o->result until unpacking is complete, we invalidate them on
1742 * src_index instead with the assumption that they will be copied to
1743 * dst_index at the end.
1744 *
1745 * [1] src_index->cache_tree is also used in unpack_callback() so if
1746 * we invalidate o->result, we need to update it to use
1747 * o->result.cache_tree as well.
1748 */
eb9ae4b5
RS
1749static void invalidate_ce_path(const struct cache_entry *ce,
1750 struct unpack_trees_options *o)
076b0adc 1751{
e931371a
NTND
1752 if (!ce)
1753 return;
1754 cache_tree_invalidate_path(o->src_index, ce->name);
0cacebf0 1755 untracked_cache_invalidate_path(o->src_index, ce->name, 1);
076b0adc
JS
1756}
1757
0cf73755
SV
1758/*
1759 * Check that checking out ce->sha1 in subdir ce->name is not
1760 * going to overwrite any working files.
1761 *
1762 * Currently, git does not checkout subprojects during a superproject
1763 * checkout, so it is not going to overwrite anything.
1764 */
d6b12300
SB
1765static int verify_clean_submodule(const char *old_sha1,
1766 const struct cache_entry *ce,
eb9ae4b5 1767 struct unpack_trees_options *o)
0cf73755 1768{
a7bc845a
SB
1769 if (!submodule_from_ce(ce))
1770 return 0;
1771
1772 return check_submodule_move_head(ce, old_sha1,
1773 oid_to_hex(&ce->oid), o);
0cf73755
SV
1774}
1775
eb9ae4b5 1776static int verify_clean_subdirectory(const struct cache_entry *ce,
eb9ae4b5 1777 struct unpack_trees_options *o)
c8193534
JH
1778{
1779 /*
0cf73755 1780 * we are about to extract "ce->name"; we would not want to lose
c8193534
JH
1781 * anything in the existing directory there.
1782 */
1783 int namelen;
7b9e3ce0 1784 int i;
c8193534
JH
1785 struct dir_struct d;
1786 char *pathbuf;
1787 int cnt = 0;
0cf73755 1788
d6b12300 1789 if (S_ISGITLINK(ce->ce_mode)) {
1053fe82 1790 struct object_id oid;
a98e6101 1791 int sub_head = resolve_gitlink_ref(ce->name, "HEAD", &oid);
d6b12300
SB
1792 /*
1793 * If we are not going to update the submodule, then
0cf73755
SV
1794 * we don't care.
1795 */
4a7e27e9 1796 if (!sub_head && oideq(&oid, &ce->oid))
0cf73755 1797 return 0;
1053fe82 1798 return verify_clean_submodule(sub_head ? NULL : oid_to_hex(&oid),
df351c6e 1799 ce, o);
0cf73755 1800 }
c8193534
JH
1801
1802 /*
1803 * First let's make sure we do not have a local modification
1804 * in that directory.
1805 */
68c4f6a5 1806 namelen = ce_namelen(ce);
da165f47
JH
1807 for (i = locate_in_src_index(ce, o);
1808 i < o->src_index->cache_nr;
1809 i++) {
837e5fe9
CB
1810 struct cache_entry *ce2 = o->src_index->cache[i];
1811 int len = ce_namelen(ce2);
c8193534 1812 if (len < namelen ||
837e5fe9
CB
1813 strncmp(ce->name, ce2->name, namelen) ||
1814 ce2->name[namelen] != '/')
c8193534
JH
1815 break;
1816 /*
da165f47
JH
1817 * ce2->name is an entry in the subdirectory to be
1818 * removed.
c8193534 1819 */
837e5fe9
CB
1820 if (!ce_stage(ce2)) {
1821 if (verify_uptodate(ce2, o))
203a2fe1 1822 return -1;
837e5fe9 1823 add_entry(o, ce2, CE_REMOVE, 0);
5697ca9a 1824 invalidate_ce_path(ce, o);
da165f47 1825 mark_ce_used(ce2, o);
c8193534
JH
1826 }
1827 cnt++;
1828 }
1829
1830 /*
1831 * Then we need to make sure that we do not lose a locally
1832 * present file that is not ignored.
1833 */
75faa45a 1834 pathbuf = xstrfmt("%.*s/", namelen, ce->name);
c8193534
JH
1835
1836 memset(&d, 0, sizeof(d));
1837 if (o->dir)
1838 d.exclude_per_dir = o->dir->exclude_per_dir;
c7f3259d 1839 i = read_directory(&d, o->src_index, pathbuf, namelen+1, NULL);
c8193534 1840 if (i)
191e9d2c 1841 return add_rejected_path(o, ERROR_NOT_UPTODATE_DIR, ce->name);
c8193534
JH
1842 free(pathbuf);
1843 return cnt;
1844}
1845
32260ad5
LT
1846/*
1847 * This gets called when there was no index entry for the tree entry 'dst',
1848 * but we found a file in the working tree that 'lstat()' said was fine,
1849 * and we're on a case-insensitive filesystem.
1850 *
1851 * See if we can find a case-insensitive match in the index that also
1852 * matches the stat information, and assume it's that other file!
1853 */
a9307f5a 1854static int icase_exists(struct unpack_trees_options *o, const char *name, int len, struct stat *st)
32260ad5 1855{
9c5e6c80 1856 const struct cache_entry *src;
32260ad5 1857
ebbd7439 1858 src = index_file_exists(o->src_index, name, len, 1);
56cac48c 1859 return src && !ie_match_stat(o->src_index, src, st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE);
32260ad5
LT
1860}
1861
a9307f5a 1862static int check_ok_to_remove(const char *name, int len, int dtype,
eb9ae4b5 1863 const struct cache_entry *ce, struct stat *st,
a9307f5a
CB
1864 enum unpack_trees_error_types error_type,
1865 struct unpack_trees_options *o)
1866{
9c5e6c80 1867 const struct cache_entry *result;
a9307f5a
CB
1868
1869 /*
1870 * It may be that the 'lstat()' succeeded even though
1871 * target 'ce' was absent, because there is an old
1872 * entry that is different only in case..
1873 *
1874 * Ignore that lstat() if it matches.
1875 */
1876 if (ignore_case && icase_exists(o, name, len, st))
1877 return 0;
1878
589570db 1879 if (o->dir &&
c7f3259d 1880 is_excluded(o->dir, o->src_index, name, &dtype))
a9307f5a
CB
1881 /*
1882 * ce->name is explicitly excluded, so it is Ok to
1883 * overwrite it.
1884 */
1885 return 0;
1886 if (S_ISDIR(st->st_mode)) {
1887 /*
1888 * We are checking out path "foo" and
1889 * found "foo/." in the working tree.
1890 * This is tricky -- if we have modified
1891 * files that are in "foo/" we would lose
1892 * them.
1893 */
df351c6e 1894 if (verify_clean_subdirectory(ce, o) < 0)
a9307f5a
CB
1895 return -1;
1896 return 0;
1897 }
1898
1899 /*
1900 * The previous round may already have decided to
1901 * delete this path, which is in a subdirectory that
1902 * is being replaced with a blob.
1903 */
ebbd7439 1904 result = index_file_exists(&o->result, name, len, 0);
a9307f5a
CB
1905 if (result) {
1906 if (result->ce_flags & CE_REMOVE)
1907 return 0;
1908 }
1909
191e9d2c 1910 return add_rejected_path(o, error_type, name);
a9307f5a
CB
1911}
1912
076b0adc
JS
1913/*
1914 * We do not want to remove or overwrite a working tree file that
f8a9d428 1915 * is not tracked, unless it is ignored.
076b0adc 1916 */
eb9ae4b5
RS
1917static int verify_absent_1(const struct cache_entry *ce,
1918 enum unpack_trees_error_types error_type,
1919 struct unpack_trees_options *o)
076b0adc 1920{
f66caaf9 1921 int len;
076b0adc
JS
1922 struct stat st;
1923
1924 if (o->index_only || o->reset || !o->update)
203a2fe1 1925 return 0;
c8193534 1926
f66caaf9
CB
1927 len = check_leading_path(ce->name, ce_namelen(ce));
1928 if (!len)
203a2fe1 1929 return 0;
f66caaf9 1930 else if (len > 0) {
f514ef97
JK
1931 char *path;
1932 int ret;
1933
1934 path = xmemdupz(ce->name, len);
a93e5301 1935 if (lstat(path, &st))
43c728e2 1936 ret = error_errno("cannot stat '%s'", path);
a7bc845a
SB
1937 else {
1938 if (submodule_from_ce(ce))
1939 ret = check_submodule_move_head(ce,
1940 oid_to_hex(&ce->oid),
1941 NULL, o);
1942 else
1943 ret = check_ok_to_remove(path, len, DT_UNKNOWN, NULL,
1944 &st, error_type, o);
1945 }
f514ef97
JK
1946 free(path);
1947 return ret;
92fda79e
JN
1948 } else if (lstat(ce->name, &st)) {
1949 if (errno != ENOENT)
43c728e2 1950 return error_errno("cannot stat '%s'", ce->name);
92fda79e
JN
1951 return 0;
1952 } else {
a7bc845a
SB
1953 if (submodule_from_ce(ce))
1954 return check_submodule_move_head(ce, oid_to_hex(&ce->oid),
1955 NULL, o);
1956
a9307f5a 1957 return check_ok_to_remove(ce->name, ce_namelen(ce),
92fda79e
JN
1958 ce_to_dtype(ce), ce, &st,
1959 error_type, o);
1960 }
076b0adc 1961}
a9307f5a 1962
eb9ae4b5 1963static int verify_absent(const struct cache_entry *ce,
08402b04 1964 enum unpack_trees_error_types error_type,
35a5aa79
NTND
1965 struct unpack_trees_options *o)
1966{
2431afbf 1967 if (!o->skip_sparse_checkout && (ce->ce_flags & CE_NEW_SKIP_WORKTREE))
f1f523ea 1968 return 0;
08402b04 1969 return verify_absent_1(ce, error_type, o);
35a5aa79 1970}
076b0adc 1971
eb9ae4b5
RS
1972static int verify_absent_sparse(const struct cache_entry *ce,
1973 enum unpack_trees_error_types error_type,
1974 struct unpack_trees_options *o)
e800ec9d 1975{
08402b04
MM
1976 enum unpack_trees_error_types orphaned_error = error_type;
1977 if (orphaned_error == ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN)
1978 orphaned_error = ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN;
1979
1980 return verify_absent_1(ce, orphaned_error, o);
e800ec9d 1981}
076b0adc 1982
f2fa3542 1983static int merged_entry(const struct cache_entry *ce,
eb9ae4b5 1984 const struct cache_entry *old,
f2fa3542 1985 struct unpack_trees_options *o)
076b0adc 1986{
7f8ab8dc 1987 int update = CE_UPDATE;
8e72d675 1988 struct cache_entry *merge = dup_cache_entry(ce, &o->result);
7f8ab8dc 1989
e11d7b59 1990 if (!old) {
2431afbf
NTND
1991 /*
1992 * New index entries. In sparse checkout, the following
1993 * verify_absent() will be delayed until after
1994 * traverse_trees() finishes in unpack_trees(), then:
1995 *
1996 * - CE_NEW_SKIP_WORKTREE will be computed correctly
1997 * - verify_absent() be called again, this time with
1998 * correct CE_NEW_SKIP_WORKTREE
1999 *
2000 * verify_absent() call here does nothing in sparse
2001 * checkout (i.e. o->skip_sparse_checkout == 0)
2002 */
2003 update |= CE_ADDED;
2004 merge->ce_flags |= CE_NEW_SKIP_WORKTREE;
2005
f2fa3542
RS
2006 if (verify_absent(merge,
2007 ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN, o)) {
a849735b 2008 discard_cache_entry(merge);
e11d7b59 2009 return -1;
f2fa3542 2010 }
e11d7b59 2011 invalidate_ce_path(merge, o);
a7bc845a
SB
2012
2013 if (submodule_from_ce(ce)) {
2014 int ret = check_submodule_move_head(ce, NULL,
2015 oid_to_hex(&ce->oid),
2016 o);
2017 if (ret)
2018 return ret;
2019 }
2020
e11d7b59 2021 } else if (!(old->ce_flags & CE_CONFLICTED)) {
076b0adc
JS
2022 /*
2023 * See if we can re-use the old CE directly?
2024 * That way we get the uptodate stat info.
2025 *
7f8ab8dc
LT
2026 * This also removes the UPDATE flag on a match; otherwise
2027 * we will end up overwriting local changes in the work tree.
076b0adc
JS
2028 */
2029 if (same(old, merge)) {
eb7a2f1d 2030 copy_cache_entry(merge, old);
7f8ab8dc 2031 update = 0;
076b0adc 2032 } else {
f2fa3542 2033 if (verify_uptodate(old, o)) {
a849735b 2034 discard_cache_entry(merge);
203a2fe1 2035 return -1;
f2fa3542 2036 }
2431afbf
NTND
2037 /* Migrate old flags over */
2038 update |= old->ce_flags & (CE_SKIP_WORKTREE | CE_NEW_SKIP_WORKTREE);
bc052d7f 2039 invalidate_ce_path(old, o);
076b0adc 2040 }
a7bc845a
SB
2041
2042 if (submodule_from_ce(ce)) {
2043 int ret = check_submodule_move_head(ce, oid_to_hex(&old->oid),
2044 oid_to_hex(&ce->oid),
2045 o);
2046 if (ret)
2047 return ret;
2048 }
e11d7b59
JH
2049 } else {
2050 /*
2051 * Previously unmerged entry left as an existence
2052 * marker by read_index_unmerged();
2053 */
2054 invalidate_ce_path(old, o);
076b0adc
JS
2055 }
2056
f2fa3542 2057 do_add_entry(o, merge, update, CE_STAGEMASK);
076b0adc
JS
2058 return 1;
2059}
2060
eb9ae4b5
RS
2061static int deleted_entry(const struct cache_entry *ce,
2062 const struct cache_entry *old,
2063 struct unpack_trees_options *o)
076b0adc 2064{
34110cd4
LT
2065 /* Did it exist in the index? */
2066 if (!old) {
08402b04 2067 if (verify_absent(ce, ERROR_WOULD_LOSE_UNTRACKED_REMOVED, o))
203a2fe1 2068 return -1;
34110cd4
LT
2069 return 0;
2070 }
e11d7b59 2071 if (!(old->ce_flags & CE_CONFLICTED) && verify_uptodate(old, o))
34110cd4
LT
2072 return -1;
2073 add_entry(o, ce, CE_REMOVE, 0);
bc052d7f 2074 invalidate_ce_path(ce, o);
076b0adc
JS
2075 return 1;
2076}
2077
eb9ae4b5
RS
2078static int keep_entry(const struct cache_entry *ce,
2079 struct unpack_trees_options *o)
076b0adc 2080{
34110cd4 2081 add_entry(o, ce, 0, 0);
5697ca9a
NTND
2082 if (ce_stage(ce))
2083 invalidate_ce_path(ce, o);
076b0adc
JS
2084 return 1;
2085}
2086
2087#if DBRT_DEBUG
2088static void show_stage_entry(FILE *o,
2089 const char *label, const struct cache_entry *ce)
2090{
2091 if (!ce)
2092 fprintf(o, "%s (missing)\n", label);
2093 else
2094 fprintf(o, "%s%06o %s %d\t%s\n",
2095 label,
7a51ed66 2096 ce->ce_mode,
99d1a986 2097 oid_to_hex(&ce->oid),
076b0adc
JS
2098 ce_stage(ce),
2099 ce->name);
2100}
2101#endif
2102
5828e835
RS
2103int threeway_merge(const struct cache_entry * const *stages,
2104 struct unpack_trees_options *o)
076b0adc 2105{
eb9ae4b5
RS
2106 const struct cache_entry *index;
2107 const struct cache_entry *head;
2108 const struct cache_entry *remote = stages[o->head_idx + 1];
076b0adc
JS
2109 int count;
2110 int head_match = 0;
2111 int remote_match = 0;
076b0adc
JS
2112
2113 int df_conflict_head = 0;
2114 int df_conflict_remote = 0;
2115
2116 int any_anc_missing = 0;
2117 int no_anc_exists = 1;
2118 int i;
2119
2120 for (i = 1; i < o->head_idx; i++) {
4c4caafc 2121 if (!stages[i] || stages[i] == o->df_conflict_entry)
076b0adc 2122 any_anc_missing = 1;
4c4caafc 2123 else
076b0adc 2124 no_anc_exists = 0;
076b0adc
JS
2125 }
2126
2127 index = stages[0];
2128 head = stages[o->head_idx];
2129
2130 if (head == o->df_conflict_entry) {
2131 df_conflict_head = 1;
2132 head = NULL;
2133 }
2134
2135 if (remote == o->df_conflict_entry) {
2136 df_conflict_remote = 1;
2137 remote = NULL;
2138 }
2139
cee2d6ae
JH
2140 /*
2141 * First, if there's a #16 situation, note that to prevent #13
076b0adc
JS
2142 * and #14.
2143 */
2144 if (!same(remote, head)) {
2145 for (i = 1; i < o->head_idx; i++) {
2146 if (same(stages[i], head)) {
2147 head_match = i;
2148 }
2149 if (same(stages[i], remote)) {
2150 remote_match = i;
2151 }
2152 }
2153 }
2154
cee2d6ae
JH
2155 /*
2156 * We start with cases where the index is allowed to match
076b0adc
JS
2157 * something other than the head: #14(ALT) and #2ALT, where it
2158 * is permitted to match the result instead.
2159 */
2160 /* #14, #14ALT, #2ALT */
2161 if (remote && !df_conflict_head && head_match && !remote_match) {
2162 if (index && !same(index, remote) && !same(index, head))
6a143aa2 2163 return reject_merge(index, o);
076b0adc
JS
2164 return merged_entry(remote, index, o);
2165 }
2166 /*
2167 * If we have an entry in the index cache, then we want to
2168 * make sure that it matches head.
2169 */
4e7c4571 2170 if (index && !same(index, head))
6a143aa2 2171 return reject_merge(index, o);
076b0adc
JS
2172
2173 if (head) {
2174 /* #5ALT, #15 */
2175 if (same(head, remote))
2176 return merged_entry(head, index, o);
2177 /* #13, #3ALT */
2178 if (!df_conflict_remote && remote_match && !head_match)
2179 return merged_entry(head, index, o);
2180 }
2181
2182 /* #1 */
34110cd4 2183 if (!head && !remote && any_anc_missing)
076b0adc
JS
2184 return 0;
2185
cee2d6ae
JH
2186 /*
2187 * Under the "aggressive" rule, we resolve mostly trivial
076b0adc
JS
2188 * cases that we historically had git-merge-one-file resolve.
2189 */
2190 if (o->aggressive) {
cee2d6ae
JH
2191 int head_deleted = !head;
2192 int remote_deleted = !remote;
eb9ae4b5 2193 const struct cache_entry *ce = NULL;
4c4caafc
JH
2194
2195 if (index)
0cf73755 2196 ce = index;
4c4caafc 2197 else if (head)
0cf73755 2198 ce = head;
4c4caafc 2199 else if (remote)
0cf73755 2200 ce = remote;
4c4caafc
JH
2201 else {
2202 for (i = 1; i < o->head_idx; i++) {
2203 if (stages[i] && stages[i] != o->df_conflict_entry) {
0cf73755 2204 ce = stages[i];
4c4caafc
JH
2205 break;
2206 }
2207 }
2208 }
2209
076b0adc
JS
2210 /*
2211 * Deleted in both.
2212 * Deleted in one and unchanged in the other.
2213 */
2214 if ((head_deleted && remote_deleted) ||
2215 (head_deleted && remote && remote_match) ||
2216 (remote_deleted && head && head_match)) {
2217 if (index)
2218 return deleted_entry(index, index, o);
34110cd4 2219 if (ce && !head_deleted) {
08402b04 2220 if (verify_absent(ce, ERROR_WOULD_LOSE_UNTRACKED_REMOVED, o))
203a2fe1
DB
2221 return -1;
2222 }
076b0adc
JS
2223 return 0;
2224 }
2225 /*
2226 * Added in both, identically.
2227 */
2228 if (no_anc_exists && head && remote && same(head, remote))
2229 return merged_entry(head, index, o);
2230
2231 }
2232
2233 /* Below are "no merge" cases, which require that the index be
2234 * up-to-date to avoid the files getting overwritten with
2235 * conflict resolution files.
2236 */
2237 if (index) {
203a2fe1
DB
2238 if (verify_uptodate(index, o))
2239 return -1;
076b0adc 2240 }
076b0adc
JS
2241
2242 o->nontrivial_merge = 1;
2243
ea4b52a8 2244 /* #2, #3, #4, #6, #7, #9, #10, #11. */
076b0adc
JS
2245 count = 0;
2246 if (!head_match || !remote_match) {
2247 for (i = 1; i < o->head_idx; i++) {
4c4caafc 2248 if (stages[i] && stages[i] != o->df_conflict_entry) {
7f7932ab 2249 keep_entry(stages[i], o);
076b0adc
JS
2250 count++;
2251 break;
2252 }
2253 }
2254 }
2255#if DBRT_DEBUG
2256 else {
2257 fprintf(stderr, "read-tree: warning #16 detected\n");
2258 show_stage_entry(stderr, "head ", stages[head_match]);
2259 show_stage_entry(stderr, "remote ", stages[remote_match]);
2260 }
2261#endif
7f7932ab
JH
2262 if (head) { count += keep_entry(head, o); }
2263 if (remote) { count += keep_entry(remote, o); }
076b0adc
JS
2264 return count;
2265}
2266
2267/*
2268 * Two-way merge.
2269 *
2270 * The rule is to "carry forward" what is in the index without losing
a75d7b54 2271 * information across a "fast-forward", favoring a successful merge
076b0adc
JS
2272 * over a merge failure when it makes sense. For details of the
2273 * "carry forward" rule, please see <Documentation/git-read-tree.txt>.
2274 *
2275 */
5828e835
RS
2276int twoway_merge(const struct cache_entry * const *src,
2277 struct unpack_trees_options *o)
076b0adc 2278{
eb9ae4b5
RS
2279 const struct cache_entry *current = src[0];
2280 const struct cache_entry *oldtree = src[1];
2281 const struct cache_entry *newtree = src[2];
076b0adc
JS
2282
2283 if (o->merge_size != 2)
2284 return error("Cannot do a twoway merge of %d trees",
2285 o->merge_size);
2286
b8ba1535
JH
2287 if (oldtree == o->df_conflict_entry)
2288 oldtree = NULL;
2289 if (newtree == o->df_conflict_entry)
2290 newtree = NULL;
2291
076b0adc 2292 if (current) {
b018ff60
JK
2293 if (current->ce_flags & CE_CONFLICTED) {
2294 if (same(oldtree, newtree) || o->reset) {
2295 if (!newtree)
2296 return deleted_entry(current, current, o);
2297 else
2298 return merged_entry(newtree, current, o);
2299 }
6a143aa2 2300 return reject_merge(current, o);
6c1db1b3 2301 } else if ((!oldtree && !newtree) || /* 4 and 5 */
b018ff60
JK
2302 (!oldtree && newtree &&
2303 same(current, newtree)) || /* 6 and 7 */
2304 (oldtree && newtree &&
2305 same(oldtree, newtree)) || /* 14 and 15 */
2306 (oldtree && newtree &&
2307 !same(oldtree, newtree) && /* 18 and 19 */
2308 same(current, newtree))) {
7f7932ab 2309 return keep_entry(current, o);
6c1db1b3 2310 } else if (oldtree && !newtree && same(current, oldtree)) {
076b0adc
JS
2311 /* 10 or 11 */
2312 return deleted_entry(oldtree, current, o);
6c1db1b3 2313 } else if (oldtree && newtree &&
076b0adc
JS
2314 same(current, oldtree) && !same(current, newtree)) {
2315 /* 20 or 21 */
2316 return merged_entry(newtree, current, o);
6c1db1b3 2317 } else
6a143aa2 2318 return reject_merge(current, o);
076b0adc 2319 }
55218834
JH
2320 else if (newtree) {
2321 if (oldtree && !o->initial_checkout) {
2322 /*
2323 * deletion of the path was staged;
2324 */
2325 if (same(oldtree, newtree))
2326 return 1;
2327 return reject_merge(oldtree, o);
2328 }
076b0adc 2329 return merged_entry(newtree, current, o);
55218834 2330 }
d699676d 2331 return deleted_entry(oldtree, current, o);
076b0adc
JS
2332}
2333
2334/*
2335 * Bind merge.
2336 *
2337 * Keep the index entries at stage0, collapse stage1 but make sure
2338 * stage0 does not have anything there.
2339 */
5828e835
RS
2340int bind_merge(const struct cache_entry * const *src,
2341 struct unpack_trees_options *o)
076b0adc 2342{
eb9ae4b5
RS
2343 const struct cache_entry *old = src[0];
2344 const struct cache_entry *a = src[1];
076b0adc
JS
2345
2346 if (o->merge_size != 1)
82247e9b 2347 return error("Cannot do a bind merge of %d trees",
076b0adc
JS
2348 o->merge_size);
2349 if (a && old)
b165fac8 2350 return o->quiet ? -1 :
3d415425
SB
2351 error(ERRORMSG(o, ERROR_BIND_OVERLAP),
2352 super_prefixed(a->name),
2353 super_prefixed(old->name));
076b0adc 2354 if (!a)
7f7932ab 2355 return keep_entry(old, o);
076b0adc
JS
2356 else
2357 return merged_entry(a, NULL, o);
2358}
2359
2360/*
2361 * One-way merge.
2362 *
2363 * The rule is:
2364 * - take the stat information from stage0, take the data from stage1
2365 */
5828e835
RS
2366int oneway_merge(const struct cache_entry * const *src,
2367 struct unpack_trees_options *o)
076b0adc 2368{
eb9ae4b5
RS
2369 const struct cache_entry *old = src[0];
2370 const struct cache_entry *a = src[1];
076b0adc
JS
2371
2372 if (o->merge_size != 1)
2373 return error("Cannot do a oneway merge of %d trees",
2374 o->merge_size);
2375
78d3b06e 2376 if (!a || a == o->df_conflict_entry)
076b0adc 2377 return deleted_entry(old, old, o);
34110cd4 2378
076b0adc 2379 if (old && same(old, a)) {
34110cd4 2380 int update = 0;
686b2de0 2381 if (o->reset && o->update && !ce_uptodate(old) && !ce_skip_worktree(old)) {
076b0adc
JS
2382 struct stat st;
2383 if (lstat(old->name, &st) ||
56cac48c 2384 ie_match_stat(o->src_index, old, &st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE))
34110cd4 2385 update |= CE_UPDATE;
076b0adc 2386 }
ad17312e
SB
2387 if (o->update && S_ISGITLINK(old->ce_mode) &&
2388 should_update_submodules() && !verify_uptodate(old, o))
2389 update |= CE_UPDATE;
ab5af825 2390 add_entry(o, old, update, CE_STAGEMASK);
34110cd4 2391 return 0;
076b0adc
JS
2392 }
2393 return merged_entry(a, old, o);
2394}