do_compare_entry: use already-computed path
[git/git.git] / unpack-trees.c
CommitLineData
bc052d7f 1#define NO_THE_INDEX_COMPATIBILITY_MACROS
16da134b 2#include "cache.h"
f8a9d428 3#include "dir.h"
16da134b
JS
4#include "tree.h"
5#include "tree-walk.h"
076b0adc 6#include "cache-tree.h"
16da134b 7#include "unpack-trees.h"
96a02f8f 8#include "progress.h"
0cf73755 9#include "refs.h"
06f33c17 10#include "attr.h"
5fc2fc8f 11#include "split-index.h"
e931371a 12#include "dir.h"
16da134b 13
8ccba008
JH
14/*
15 * Error messages expected by scripts out of plumbing commands such as
16 * read-tree. Non-scripted Porcelain is not required to use these messages
17 * and in fact are encouraged to reword them to better suit their particular
23cbf11b 18 * situation better. See how "git checkout" and "git merge" replaces
dc1166e6 19 * them using setup_unpack_trees_porcelain(), for example.
8ccba008 20 */
c2e86add 21static const char *unpack_plumbing_errors[NB_UNPACK_TREES_ERROR_TYPES] = {
08353ebb 22 /* ERROR_WOULD_OVERWRITE */
8ccba008
JH
23 "Entry '%s' would be overwritten by merge. Cannot merge.",
24
08353ebb 25 /* ERROR_NOT_UPTODATE_FILE */
8ccba008
JH
26 "Entry '%s' not uptodate. Cannot merge.",
27
08353ebb 28 /* ERROR_NOT_UPTODATE_DIR */
8ccba008
JH
29 "Updating '%s' would lose untracked files in it",
30
08402b04
MM
31 /* ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN */
32 "Untracked working tree file '%s' would be overwritten by merge.",
8ccba008 33
08402b04
MM
34 /* ERROR_WOULD_LOSE_UNTRACKED_REMOVED */
35 "Untracked working tree file '%s' would be removed by merge.",
8ccba008 36
08353ebb 37 /* ERROR_BIND_OVERLAP */
8ccba008 38 "Entry '%s' overlaps with '%s'. Cannot bind.",
e800ec9d 39
08353ebb 40 /* ERROR_SPARSE_NOT_UPTODATE_FILE */
e800ec9d
NTND
41 "Entry '%s' not uptodate. Cannot update sparse checkout.",
42
08402b04
MM
43 /* ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN */
44 "Working tree file '%s' would be overwritten by sparse checkout update.",
45
46 /* ERROR_WOULD_LOSE_ORPHANED_REMOVED */
47 "Working tree file '%s' would be removed by sparse checkout update.",
8ccba008
JH
48};
49
08353ebb
MM
50#define ERRORMSG(o,type) \
51 ( ((o) && (o)->msgs[(type)]) \
52 ? ((o)->msgs[(type)]) \
53 : (unpack_plumbing_errors[(type)]) )
8ccba008 54
e294030f
MM
55void setup_unpack_trees_porcelain(struct unpack_trees_options *opts,
56 const char *cmd)
dc1166e6 57{
7980872d 58 int i;
e294030f 59 const char **msgs = opts->msgs;
dc1166e6 60 const char *msg;
dc1166e6 61 const char *cmd2 = strcmp(cmd, "checkout") ? cmd : "switch branches";
fa3f60b7 62
dc1166e6
MM
63 if (advice_commit_before_merge)
64 msg = "Your local changes to the following files would be overwritten by %s:\n%%s"
65 "Please, commit your changes or stash them before you can %s.";
66 else
67 msg = "Your local changes to the following files would be overwritten by %s:\n%%s";
fa3f60b7
JK
68 msgs[ERROR_WOULD_OVERWRITE] = msgs[ERROR_NOT_UPTODATE_FILE] =
69 xstrfmt(msg, cmd, cmd2);
dc1166e6
MM
70
71 msgs[ERROR_NOT_UPTODATE_DIR] =
72 "Updating the following directories would lose untracked files in it:\n%s";
73
74 if (advice_commit_before_merge)
75 msg = "The following untracked working tree files would be %s by %s:\n%%s"
76 "Please move or remove them before you can %s.";
77 else
78 msg = "The following untracked working tree files would be %s by %s:\n%%s";
fa3f60b7
JK
79
80 msgs[ERROR_WOULD_LOSE_UNTRACKED_REMOVED] = xstrfmt(msg, "removed", cmd, cmd2);
81 msgs[ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN] = xstrfmt(msg, "overwritten", cmd, cmd2);
dc1166e6
MM
82
83 /*
84 * Special case: ERROR_BIND_OVERLAP refers to a pair of paths, we
85 * cannot easily display it as a list.
86 */
87 msgs[ERROR_BIND_OVERLAP] = "Entry '%s' overlaps with '%s'. Cannot bind.";
88
89 msgs[ERROR_SPARSE_NOT_UPTODATE_FILE] =
90 "Cannot update sparse checkout: the following entries are not up-to-date:\n%s";
91 msgs[ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN] =
92 "The following Working tree files would be overwritten by sparse checkout update:\n%s";
93 msgs[ERROR_WOULD_LOSE_ORPHANED_REMOVED] =
94 "The following Working tree files would be removed by sparse checkout update:\n%s";
5e65ee35
MM
95
96 opts->show_all_errors = 1;
7980872d
CB
97 /* rejected paths may not have a static buffer */
98 for (i = 0; i < ARRAY_SIZE(opts->unpack_rejects); i++)
99 opts->unpack_rejects[i].strdup_strings = 1;
dc1166e6
MM
100}
101
46169180 102static int do_add_entry(struct unpack_trees_options *o, struct cache_entry *ce,
6ff264ee 103 unsigned int set, unsigned int clear)
b48d5a05 104{
419a597f 105 clear |= CE_HASHED;
34110cd4 106
700e66d6
NTND
107 if (set & CE_REMOVE)
108 set |= CE_WT_REMOVE;
109
6ff264ee 110 ce->ce_flags = (ce->ce_flags & ~clear) | set;
46169180
JK
111 return add_index_entry(&o->result, ce,
112 ADD_CACHE_OK_TO_ADD | ADD_CACHE_OK_TO_REPLACE);
6ff264ee
RS
113}
114
a33bd4d3 115static struct cache_entry *dup_entry(const struct cache_entry *ce)
6ff264ee
RS
116{
117 unsigned int size = ce_size(ce);
118 struct cache_entry *new = xmalloc(size);
119
34110cd4 120 memcpy(new, ce, size);
a33bd4d3
RS
121 return new;
122}
123
124static void add_entry(struct unpack_trees_options *o,
125 const struct cache_entry *ce,
126 unsigned int set, unsigned int clear)
127{
128 do_add_entry(o, dup_entry(ce), set, clear);
b48d5a05
LT
129}
130
e6c111b4
MM
131/*
132 * add error messages on path <path>
133 * corresponding to the type <e> with the message <msg>
134 * indicating if it should be display in porcelain or not
135 */
136static int add_rejected_path(struct unpack_trees_options *o,
137 enum unpack_trees_error_types e,
138 const char *path)
139{
e6c111b4
MM
140 if (!o->show_all_errors)
141 return error(ERRORMSG(o, e), path);
142
143 /*
144 * Otherwise, insert in a list for future display by
145 * display_error_msgs()
146 */
7980872d 147 string_list_append(&o->unpack_rejects[e], path);
e6c111b4
MM
148 return -1;
149}
150
e6c111b4
MM
151/*
152 * display all the error messages stored in a nice way
153 */
154static void display_error_msgs(struct unpack_trees_options *o)
155{
7980872d 156 int e, i;
e6c111b4
MM
157 int something_displayed = 0;
158 for (e = 0; e < NB_UNPACK_TREES_ERROR_TYPES; e++) {
7980872d
CB
159 struct string_list *rejects = &o->unpack_rejects[e];
160 if (rejects->nr > 0) {
e6c111b4
MM
161 struct strbuf path = STRBUF_INIT;
162 something_displayed = 1;
7980872d
CB
163 for (i = 0; i < rejects->nr; i++)
164 strbuf_addf(&path, "\t%s\n", rejects->items[i].string);
e6c111b4
MM
165 error(ERRORMSG(o, e), path.buf);
166 strbuf_release(&path);
e6c111b4 167 }
7980872d 168 string_list_clear(rejects, 0);
e6c111b4
MM
169 }
170 if (something_displayed)
6f90969b 171 fprintf(stderr, "Aborting\n");
e6c111b4
MM
172}
173
78478927
KB
174/*
175 * Unlink the last component and schedule the leading directories for
176 * removal, such that empty directories get removed.
16da134b 177 */
9c5e6c80 178static void unlink_entry(const struct cache_entry *ce)
16da134b 179{
f66caaf9 180 if (!check_leading_path(ce->name, ce_namelen(ce)))
16a4c617 181 return;
80d706af
PC
182 if (remove_or_warn(ce->ce_mode, ce->name))
183 return;
78478927 184 schedule_dir_for_removal(ce->name, ce_namelen(ce));
16da134b
JS
185}
186
16da134b 187static struct checkout state;
c4758d3c 188static int check_updates(struct unpack_trees_options *o)
16da134b 189{
96a02f8f 190 unsigned cnt = 0, total = 0;
dc6a0757 191 struct progress *progress = NULL;
34110cd4 192 struct index_state *index = &o->result;
33ecf7eb 193 int i;
c4758d3c 194 int errs = 0;
16da134b
JS
195
196 if (o->update && o->verbose_update) {
34110cd4 197 for (total = cnt = 0; cnt < index->cache_nr; cnt++) {
9c5e6c80 198 const struct cache_entry *ce = index->cache[cnt];
700e66d6 199 if (ce->ce_flags & (CE_UPDATE | CE_WT_REMOVE))
16da134b
JS
200 total++;
201 }
202
754dbc43 203 progress = start_progress_delay(_("Checking out files"),
e8548645 204 total, 50, 1);
16da134b
JS
205 cnt = 0;
206 }
207
66985e66
JH
208 if (o->update)
209 git_attr_set_direction(GIT_ATTR_CHECKOUT, &o->result);
34110cd4 210 for (i = 0; i < index->cache_nr; i++) {
9c5e6c80 211 const struct cache_entry *ce = index->cache[i];
16da134b 212
e663db2f
NTND
213 if (ce->ce_flags & CE_WT_REMOVE) {
214 display_progress(progress, ++cnt);
2c9078d0 215 if (o->update && !o->dry_run)
e663db2f
NTND
216 unlink_entry(ce);
217 continue;
218 }
1fa6ead4 219 }
36419c8e 220 remove_marked_cache_entries(&o->result);
78478927 221 remove_scheduled_dirs();
1fa6ead4
LT
222
223 for (i = 0; i < index->cache_nr; i++) {
224 struct cache_entry *ce = index->cache[i];
225
7a51ed66 226 if (ce->ce_flags & CE_UPDATE) {
7d782416
DT
227 if (ce->ce_flags & CE_WT_REMOVE)
228 die("BUG: both update and delete flags are set on %s",
229 ce->name);
1fa6ead4 230 display_progress(progress, ++cnt);
7a51ed66 231 ce->ce_flags &= ~CE_UPDATE;
2c9078d0 232 if (o->update && !o->dry_run) {
c4758d3c 233 errs |= checkout_entry(ce, &state, NULL);
16a4c617 234 }
16da134b
JS
235 }
236 }
4d4fcc54 237 stop_progress(&progress);
66985e66
JH
238 if (o->update)
239 git_attr_set_direction(GIT_ATTR_CHECKIN, NULL);
c4758d3c 240 return errs != 0;
16da134b
JS
241}
242
eb9ae4b5
RS
243static int verify_uptodate_sparse(const struct cache_entry *ce,
244 struct unpack_trees_options *o);
245static int verify_absent_sparse(const struct cache_entry *ce,
246 enum unpack_trees_error_types,
247 struct unpack_trees_options *o);
e800ec9d 248
a5c446f1
NTND
249static int apply_sparse_checkout(struct index_state *istate,
250 struct cache_entry *ce,
251 struct unpack_trees_options *o)
e800ec9d
NTND
252{
253 int was_skip_worktree = ce_skip_worktree(ce);
254
2431afbf 255 if (ce->ce_flags & CE_NEW_SKIP_WORKTREE)
e800ec9d
NTND
256 ce->ce_flags |= CE_SKIP_WORKTREE;
257 else
258 ce->ce_flags &= ~CE_SKIP_WORKTREE;
078a58e8
NTND
259 if (was_skip_worktree != ce_skip_worktree(ce)) {
260 ce->ce_flags |= CE_UPDATE_IN_BASE;
a5c446f1 261 istate->cache_changed |= CE_ENTRY_CHANGED;
078a58e8 262 }
e800ec9d
NTND
263
264 /*
eec3fc03
NTND
265 * if (!was_skip_worktree && !ce_skip_worktree()) {
266 * This is perfectly normal. Move on;
267 * }
e800ec9d 268 */
eec3fc03
NTND
269
270 /*
271 * Merge strategies may set CE_UPDATE|CE_REMOVE outside checkout
272 * area as a result of ce_skip_worktree() shortcuts in
700e66d6
NTND
273 * verify_absent() and verify_uptodate().
274 * Make sure they don't modify worktree if they are already
275 * outside checkout area
eec3fc03 276 */
700e66d6
NTND
277 if (was_skip_worktree && ce_skip_worktree(ce)) {
278 ce->ce_flags &= ~CE_UPDATE;
279
280 /*
281 * By default, when CE_REMOVE is on, CE_WT_REMOVE is also
282 * on to get that file removed from both index and worktree.
283 * If that file is already outside worktree area, don't
284 * bother remove it.
285 */
286 if (ce->ce_flags & CE_REMOVE)
287 ce->ce_flags &= ~CE_WT_REMOVE;
288 }
e800ec9d
NTND
289
290 if (!was_skip_worktree && ce_skip_worktree(ce)) {
291 /*
292 * If CE_UPDATE is set, verify_uptodate() must be called already
293 * also stat info may have lost after merged_entry() so calling
294 * verify_uptodate() again may fail
295 */
296 if (!(ce->ce_flags & CE_UPDATE) && verify_uptodate_sparse(ce, o))
297 return -1;
298 ce->ce_flags |= CE_WT_REMOVE;
7d782416 299 ce->ce_flags &= ~CE_UPDATE;
e800ec9d
NTND
300 }
301 if (was_skip_worktree && !ce_skip_worktree(ce)) {
08402b04 302 if (verify_absent_sparse(ce, ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN, o))
e800ec9d
NTND
303 return -1;
304 ce->ce_flags |= CE_UPDATE;
305 }
306 return 0;
307}
308
5828e835
RS
309static inline int call_unpack_fn(const struct cache_entry * const *src,
310 struct unpack_trees_options *o)
01904572 311{
34110cd4
LT
312 int ret = o->fn(src, o);
313 if (ret > 0)
01904572 314 ret = 0;
01904572
LT
315 return ret;
316}
317
da165f47
JH
318static void mark_ce_used(struct cache_entry *ce, struct unpack_trees_options *o)
319{
320 ce->ce_flags |= CE_UNPACKED;
321
322 if (o->cache_bottom < o->src_index->cache_nr &&
323 o->src_index->cache[o->cache_bottom] == ce) {
324 int bottom = o->cache_bottom;
325 while (bottom < o->src_index->cache_nr &&
326 o->src_index->cache[bottom]->ce_flags & CE_UNPACKED)
327 bottom++;
328 o->cache_bottom = bottom;
329 }
330}
331
332static void mark_all_ce_unused(struct index_state *index)
333{
334 int i;
335 for (i = 0; i < index->cache_nr; i++)
2431afbf 336 index->cache[i]->ce_flags &= ~(CE_UNPACKED | CE_ADDED | CE_NEW_SKIP_WORKTREE);
da165f47
JH
337}
338
eb9ae4b5 339static int locate_in_src_index(const struct cache_entry *ce,
da165f47
JH
340 struct unpack_trees_options *o)
341{
342 struct index_state *index = o->src_index;
343 int len = ce_namelen(ce);
344 int pos = index_name_pos(index, ce->name, len);
345 if (pos < 0)
346 pos = -1 - pos;
347 return pos;
348}
349
350/*
351 * We call unpack_index_entry() with an unmerged cache entry
352 * only in diff-index, and it wants a single callback. Skip
353 * the other unmerged entry with the same name.
354 */
355static void mark_ce_used_same_name(struct cache_entry *ce,
356 struct unpack_trees_options *o)
357{
358 struct index_state *index = o->src_index;
359 int len = ce_namelen(ce);
360 int pos;
361
362 for (pos = locate_in_src_index(ce, o); pos < index->cache_nr; pos++) {
363 struct cache_entry *next = index->cache[pos];
364 if (len != ce_namelen(next) ||
365 memcmp(ce->name, next->name, len))
366 break;
367 mark_ce_used(next, o);
368 }
369}
370
371static struct cache_entry *next_cache_entry(struct unpack_trees_options *o)
372{
373 const struct index_state *index = o->src_index;
374 int pos = o->cache_bottom;
375
376 while (pos < index->cache_nr) {
377 struct cache_entry *ce = index->cache[pos];
378 if (!(ce->ce_flags & CE_UNPACKED))
379 return ce;
380 pos++;
381 }
382 return NULL;
383}
384
9c5e6c80 385static void add_same_unmerged(const struct cache_entry *ce,
da165f47
JH
386 struct unpack_trees_options *o)
387{
388 struct index_state *index = o->src_index;
389 int len = ce_namelen(ce);
390 int pos = index_name_pos(index, ce->name, len);
391
392 if (0 <= pos)
393 die("programming error in a caller of mark_ce_used_same_name");
394 for (pos = -pos - 1; pos < index->cache_nr; pos++) {
395 struct cache_entry *next = index->cache[pos];
396 if (len != ce_namelen(next) ||
397 memcmp(ce->name, next->name, len))
398 break;
399 add_entry(o, next, 0, 0);
400 mark_ce_used(next, o);
401 }
402}
403
404static int unpack_index_entry(struct cache_entry *ce,
405 struct unpack_trees_options *o)
01904572 406{
5828e835 407 const struct cache_entry *src[MAX_UNPACK_TREES + 1] = { NULL, };
da165f47 408 int ret;
34110cd4 409
66dbfd55
GV
410 src[0] = ce;
411
da165f47 412 mark_ce_used(ce, o);
01904572
LT
413 if (ce_stage(ce)) {
414 if (o->skip_unmerged) {
34110cd4
LT
415 add_entry(o, ce, 0, 0);
416 return 0;
01904572 417 }
01904572 418 }
da165f47
JH
419 ret = call_unpack_fn(src, o);
420 if (ce_stage(ce))
421 mark_ce_used_same_name(ce, o);
422 return ret;
01904572
LT
423}
424
730f7284
JH
425static int find_cache_pos(struct traverse_info *, const struct name_entry *);
426
427static void restore_cache_bottom(struct traverse_info *info, int bottom)
428{
429 struct unpack_trees_options *o = info->data;
430
431 if (o->diff_index_cached)
432 return;
433 o->cache_bottom = bottom;
434}
435
436static int switch_cache_bottom(struct traverse_info *info)
437{
438 struct unpack_trees_options *o = info->data;
439 int ret, pos;
440
441 if (o->diff_index_cached)
442 return 0;
443 ret = o->cache_bottom;
444 pos = find_cache_pos(info->prev, &info->name);
445
446 if (pos < -1)
447 o->cache_bottom = -2 - pos;
448 else if (pos < 0)
449 o->cache_bottom = o->src_index->cache_nr;
450 return ret;
01904572
LT
451}
452
84563a62
JH
453static int traverse_trees_recursive(int n, unsigned long dirmask,
454 unsigned long df_conflicts,
455 struct name_entry *names,
456 struct traverse_info *info)
16da134b 457{
730f7284 458 int i, ret, bottom;
ca885a4f 459 struct tree_desc t[MAX_UNPACK_TREES];
1ce584b0 460 void *buf[MAX_UNPACK_TREES];
01904572
LT
461 struct traverse_info newinfo;
462 struct name_entry *p;
463
464 p = names;
465 while (!p->mode)
466 p++;
467
468 newinfo = *info;
469 newinfo.prev = info;
40e37256 470 newinfo.pathspec = info->pathspec;
01904572 471 newinfo.name = *p;
0de16337 472 newinfo.pathlen += tree_entry_len(p) + 1;
603d2498 473 newinfo.df_conflicts |= df_conflicts;
01904572
LT
474
475 for (i = 0; i < n; i++, dirmask >>= 1) {
476 const unsigned char *sha1 = NULL;
477 if (dirmask & 1)
478 sha1 = names[i].sha1;
1ce584b0 479 buf[i] = fill_tree_descriptor(t+i, sha1);
01904572 480 }
730f7284
JH
481
482 bottom = switch_cache_bottom(&newinfo);
483 ret = traverse_trees(n, t, &newinfo);
484 restore_cache_bottom(&newinfo, bottom);
1ce584b0
JN
485
486 for (i = 0; i < n; i++)
487 free(buf[i]);
488
730f7284 489 return ret;
01904572
LT
490}
491
492/*
493 * Compare the traverse-path to the cache entry without actually
494 * having to generate the textual representation of the traverse
495 * path.
496 *
497 * NOTE! This *only* compares up to the size of the traverse path
498 * itself - the caller needs to do the final check for the cache
499 * entry having more data at the end!
500 */
d9c2bd56 501static int do_compare_entry_piecewise(const struct cache_entry *ce, const struct traverse_info *info, const struct name_entry *n)
01904572
LT
502{
503 int len, pathlen, ce_len;
504 const char *ce_name;
505
506 if (info->prev) {
d9c2bd56
DT
507 int cmp = do_compare_entry_piecewise(ce, info->prev,
508 &info->name);
01904572
LT
509 if (cmp)
510 return cmp;
511 }
512 pathlen = info->pathlen;
513 ce_len = ce_namelen(ce);
514
515 /* If ce_len < pathlen then we must have previously hit "name == directory" entry */
516 if (ce_len < pathlen)
517 return -1;
518
519 ce_len -= pathlen;
520 ce_name = ce->name + pathlen;
521
0de16337 522 len = tree_entry_len(n);
01904572
LT
523 return df_name_compare(ce_name, ce_len, S_IFREG, n->path, len, n->mode);
524}
525
d9c2bd56
DT
526static int do_compare_entry(const struct cache_entry *ce,
527 const struct traverse_info *info,
528 const struct name_entry *n)
529{
530 int len, pathlen, ce_len;
531 const char *ce_name;
532 int cmp;
533
534 /*
535 * If we have not precomputed the traverse path, it is quicker
536 * to avoid doing so. But if we have precomputed it,
537 * it is quicker to use the precomputed version.
538 */
539 if (!info->traverse_path)
540 return do_compare_entry_piecewise(ce, info, n);
541
542 cmp = strncmp(ce->name, info->traverse_path, info->pathlen);
543 if (cmp)
544 return cmp;
545
546 pathlen = info->pathlen;
547 ce_len = ce_namelen(ce);
548
549 if (ce_len < pathlen)
550 return -1;
551
552 ce_len -= pathlen;
553 ce_name = ce->name + pathlen;
554
555 len = tree_entry_len(n);
556 return df_name_compare(ce_name, ce_len, S_IFREG, n->path, len, n->mode);
557}
558
01904572
LT
559static int compare_entry(const struct cache_entry *ce, const struct traverse_info *info, const struct name_entry *n)
560{
561 int cmp = do_compare_entry(ce, info, n);
562 if (cmp)
563 return cmp;
564
565 /*
566 * Even if the beginning compared identically, the ce should
567 * compare as bigger than a directory leading up to it!
568 */
569 return ce_namelen(ce) > traverse_path_len(info, n);
570}
571
da165f47
JH
572static int ce_in_traverse_path(const struct cache_entry *ce,
573 const struct traverse_info *info)
574{
575 if (!info->prev)
576 return 1;
577 if (do_compare_entry(ce, info->prev, &info->name))
578 return 0;
579 /*
580 * If ce (blob) is the same name as the path (which is a tree
581 * we will be descending into), it won't be inside it.
582 */
583 return (info->pathlen < ce_namelen(ce));
584}
585
01904572
LT
586static struct cache_entry *create_ce_entry(const struct traverse_info *info, const struct name_entry *n, int stage)
587{
588 int len = traverse_path_len(info, n);
589 struct cache_entry *ce = xcalloc(1, cache_entry_size(len));
590
591 ce->ce_mode = create_ce_mode(n->mode);
b60e188c
TG
592 ce->ce_flags = create_ce_flags(stage);
593 ce->ce_namelen = len;
01904572
LT
594 hashcpy(ce->sha1, n->sha1);
595 make_traverse_path(ce->name, info, n);
596
597 return ce;
598}
599
c7cddc1a
RS
600static int unpack_nondirectories(int n, unsigned long mask,
601 unsigned long dirmask,
602 struct cache_entry **src,
603 const struct name_entry *names,
604 const struct traverse_info *info)
01904572
LT
605{
606 int i;
607 struct unpack_trees_options *o = info->data;
603d2498 608 unsigned long conflicts = info->df_conflicts | dirmask;
01904572
LT
609
610 /* Do we have *only* directories? Nothing to do */
611 if (mask == dirmask && !src[0])
612 return 0;
613
01904572
LT
614 /*
615 * Ok, we've filled in up to any potential index entry in src[0],
616 * now do the rest.
617 */
618 for (i = 0; i < n; i++) {
619 int stage;
620 unsigned int bit = 1ul << i;
621 if (conflicts & bit) {
622 src[i + o->merge] = o->df_conflict_entry;
623 continue;
624 }
625 if (!(mask & bit))
626 continue;
627 if (!o->merge)
628 stage = 0;
629 else if (i + 1 < o->head_idx)
630 stage = 1;
631 else if (i + 1 > o->head_idx)
632 stage = 3;
633 else
634 stage = 2;
635 src[i + o->merge] = create_ce_entry(info, names + i, stage);
636 }
637
5d80ef5a
RS
638 if (o->merge) {
639 int rc = call_unpack_fn((const struct cache_entry * const *)src,
640 o);
641 for (i = 0; i < n; i++) {
642 struct cache_entry *ce = src[i + o->merge];
643 if (ce != o->df_conflict_entry)
644 free(ce);
645 }
646 return rc;
647 }
01904572 648
01904572 649 for (i = 0; i < n; i++)
aab3b9a1 650 if (src[i] && src[i] != o->df_conflict_entry)
46169180
JK
651 if (do_add_entry(o, src[i], 0, 0))
652 return -1;
653
01904572
LT
654 return 0;
655}
656
353c5eeb
JH
657static int unpack_failed(struct unpack_trees_options *o, const char *message)
658{
659 discard_index(&o->result);
b4194828 660 if (!o->gently && !o->exiting_early) {
353c5eeb
JH
661 if (message)
662 return error("%s", message);
663 return -1;
664 }
665 return -1;
666}
667
730f7284
JH
668/*
669 * The tree traversal is looking at name p. If we have a matching entry,
670 * return it. If name p is a directory in the index, do not return
671 * anything, as we will want to match it when the traversal descends into
672 * the directory.
673 */
674static int find_cache_pos(struct traverse_info *info,
675 const struct name_entry *p)
676{
677 int pos;
678 struct unpack_trees_options *o = info->data;
679 struct index_state *index = o->src_index;
680 int pfxlen = info->pathlen;
0de16337 681 int p_len = tree_entry_len(p);
730f7284
JH
682
683 for (pos = o->cache_bottom; pos < index->cache_nr; pos++) {
9c5e6c80 684 const struct cache_entry *ce = index->cache[pos];
730f7284
JH
685 const char *ce_name, *ce_slash;
686 int cmp, ce_len;
687
e53e6b44
BD
688 if (ce->ce_flags & CE_UNPACKED) {
689 /*
690 * cache_bottom entry is already unpacked, so
691 * we can never match it; don't check it
692 * again.
693 */
694 if (pos == o->cache_bottom)
695 ++o->cache_bottom;
730f7284 696 continue;
e53e6b44
BD
697 }
698 if (!ce_in_traverse_path(ce, info))
730f7284
JH
699 continue;
700 ce_name = ce->name + pfxlen;
701 ce_slash = strchr(ce_name, '/');
702 if (ce_slash)
703 ce_len = ce_slash - ce_name;
704 else
705 ce_len = ce_namelen(ce) - pfxlen;
706 cmp = name_compare(p->path, p_len, ce_name, ce_len);
707 /*
708 * Exact match; if we have a directory we need to
709 * delay returning it.
710 */
711 if (!cmp)
712 return ce_slash ? -2 - pos : pos;
713 if (0 < cmp)
714 continue; /* keep looking */
715 /*
716 * ce_name sorts after p->path; could it be that we
717 * have files under p->path directory in the index?
718 * E.g. ce_name == "t-i", and p->path == "t"; we may
719 * have "t/a" in the index.
720 */
721 if (p_len < ce_len && !memcmp(ce_name, p->path, p_len) &&
722 ce_name[p_len] < '/')
723 continue; /* keep looking */
724 break;
725 }
726 return -1;
727}
728
729static struct cache_entry *find_cache_entry(struct traverse_info *info,
730 const struct name_entry *p)
731{
732 int pos = find_cache_pos(info, p);
733 struct unpack_trees_options *o = info->data;
734
735 if (0 <= pos)
736 return o->src_index->cache[pos];
737 else
738 return NULL;
739}
740
ba655da5
JH
741static void debug_path(struct traverse_info *info)
742{
743 if (info->prev) {
744 debug_path(info->prev);
745 if (*info->prev->name.path)
746 putchar('/');
747 }
748 printf("%s", info->name.path);
749}
750
751static void debug_name_entry(int i, struct name_entry *n)
752{
753 printf("ent#%d %06o %s\n", i,
754 n->path ? n->mode : 0,
755 n->path ? n->path : "(missing)");
756}
757
758static void debug_unpack_callback(int n,
759 unsigned long mask,
760 unsigned long dirmask,
761 struct name_entry *names,
762 struct traverse_info *info)
763{
764 int i;
765 printf("* unpack mask %lu, dirmask %lu, cnt %d ",
766 mask, dirmask, n);
767 debug_path(info);
768 putchar('\n');
769 for (i = 0; i < n; i++)
770 debug_name_entry(i, names + i);
771}
772
01904572
LT
773static int unpack_callback(int n, unsigned long mask, unsigned long dirmask, struct name_entry *names, struct traverse_info *info)
774{
c7cddc1a 775 struct cache_entry *src[MAX_UNPACK_TREES + 1] = { NULL, };
01904572 776 struct unpack_trees_options *o = info->data;
01904572
LT
777 const struct name_entry *p = names;
778
779 /* Find first entry with a real name (we could use "mask" too) */
780 while (!p->mode)
781 p++;
782
ba655da5
JH
783 if (o->debug_unpack)
784 debug_unpack_callback(n, mask, dirmask, names, info);
785
01904572
LT
786 /* Are we supposed to look at the index too? */
787 if (o->merge) {
da165f47 788 while (1) {
da165f47 789 int cmp;
730f7284
JH
790 struct cache_entry *ce;
791
792 if (o->diff_index_cached)
793 ce = next_cache_entry(o);
794 else
795 ce = find_cache_entry(info, p);
796
da165f47
JH
797 if (!ce)
798 break;
799 cmp = compare_entry(ce, info, p);
01904572
LT
800 if (cmp < 0) {
801 if (unpack_index_entry(ce, o) < 0)
353c5eeb 802 return unpack_failed(o, NULL);
01904572
LT
803 continue;
804 }
805 if (!cmp) {
806 if (ce_stage(ce)) {
807 /*
da165f47
JH
808 * If we skip unmerged index
809 * entries, we'll skip this
810 * entry *and* the tree
811 * entries associated with it!
01904572 812 */
34110cd4 813 if (o->skip_unmerged) {
da165f47 814 add_same_unmerged(ce, o);
01904572 815 return mask;
34110cd4 816 }
01904572
LT
817 }
818 src[0] = ce;
01904572
LT
819 }
820 break;
821 }
822 }
823
34110cd4 824 if (unpack_nondirectories(n, mask, dirmask, src, names, info) < 0)
01904572
LT
825 return -1;
826
97e5954b 827 if (o->merge && src[0]) {
da165f47
JH
828 if (ce_stage(src[0]))
829 mark_ce_used_same_name(src[0], o);
830 else
831 mark_ce_used(src[0], o);
832 }
833
01904572
LT
834 /* Now handle any directories.. */
835 if (dirmask) {
b65982b6
JH
836 /* special case: "diff-index --cached" looking at a tree */
837 if (o->diff_index_cached &&
838 n == 1 && dirmask == 1 && S_ISDIR(names->mode)) {
839 int matches;
840 matches = cache_tree_matches_traversal(o->src_index->cache_tree,
841 names, info);
842 /*
da165f47
JH
843 * Everything under the name matches; skip the
844 * entire hierarchy. diff_index_cached codepath
845 * special cases D/F conflicts in such a way that
846 * it does not do any look-ahead, so this is safe.
b65982b6
JH
847 */
848 if (matches) {
da165f47 849 o->cache_bottom += matches;
b65982b6
JH
850 return mask;
851 }
852 }
853
603d2498 854 if (traverse_trees_recursive(n, dirmask, mask & ~dirmask,
542c264b
JH
855 names, info) < 0)
856 return -1;
01904572
LT
857 return mask;
858 }
859
860 return mask;
861}
862
28911091 863static int clear_ce_flags_1(struct cache_entry **cache, int nr,
fc2b6214 864 struct strbuf *prefix,
28911091
NTND
865 int select_mask, int clear_mask,
866 struct exclude_list *el, int defval);
867
9037026d
NTND
868/* Whole directory matching */
869static int clear_ce_flags_dir(struct cache_entry **cache, int nr,
fc2b6214 870 struct strbuf *prefix,
9037026d
NTND
871 char *basename,
872 int select_mask, int clear_mask,
28911091 873 struct exclude_list *el, int defval)
9037026d 874{
28911091 875 struct cache_entry **cache_end;
9037026d 876 int dtype = DT_DIR;
fc2b6214 877 int ret = is_excluded_from_list(prefix->buf, prefix->len,
07958050 878 basename, &dtype, el);
fc2b6214 879 int rc;
9037026d 880
fc2b6214 881 strbuf_addch(prefix, '/');
9037026d 882
28911091
NTND
883 /* If undecided, use matching result of parent dir in defval */
884 if (ret < 0)
885 ret = defval;
9037026d 886
28911091
NTND
887 for (cache_end = cache; cache_end != cache + nr; cache_end++) {
888 struct cache_entry *ce = *cache_end;
fc2b6214 889 if (strncmp(ce->name, prefix->buf, prefix->len))
28911091 890 break;
9037026d
NTND
891 }
892
28911091
NTND
893 /*
894 * TODO: check el, if there are no patterns that may conflict
895 * with ret (iow, we know in advance the incl/excl
896 * decision for the entire directory), clear flag here without
897 * calling clear_ce_flags_1(). That function will call
07958050 898 * the expensive is_excluded_from_list() on every entry.
28911091 899 */
fc2b6214
AP
900 rc = clear_ce_flags_1(cache, cache_end - cache,
901 prefix,
902 select_mask, clear_mask,
903 el, ret);
904 strbuf_setlen(prefix, prefix->len - 1);
905 return rc;
9037026d
NTND
906}
907
908/*
909 * Traverse the index, find every entry that matches according to
910 * o->el. Do "ce_flags &= ~clear_mask" on those entries. Return the
911 * number of traversed entries.
912 *
913 * If select_mask is non-zero, only entries whose ce_flags has on of
914 * those bits enabled are traversed.
915 *
916 * cache : pointer to an index entry
917 * prefix_len : an offset to its path
918 *
919 * The current path ("prefix") including the trailing '/' is
920 * cache[0]->name[0..(prefix_len-1)]
921 * Top level path has prefix_len zero.
922 */
923static int clear_ce_flags_1(struct cache_entry **cache, int nr,
fc2b6214 924 struct strbuf *prefix,
9037026d 925 int select_mask, int clear_mask,
28911091 926 struct exclude_list *el, int defval)
9037026d
NTND
927{
928 struct cache_entry **cache_end = cache + nr;
929
930 /*
931 * Process all entries that have the given prefix and meet
932 * select_mask condition
933 */
934 while(cache != cache_end) {
935 struct cache_entry *ce = *cache;
936 const char *name, *slash;
28911091 937 int len, dtype, ret;
9037026d
NTND
938
939 if (select_mask && !(ce->ce_flags & select_mask)) {
940 cache++;
941 continue;
942 }
943
fc2b6214 944 if (prefix->len && strncmp(ce->name, prefix->buf, prefix->len))
9037026d
NTND
945 break;
946
fc2b6214 947 name = ce->name + prefix->len;
9037026d
NTND
948 slash = strchr(name, '/');
949
950 /* If it's a directory, try whole directory match first */
951 if (slash) {
952 int processed;
953
954 len = slash - name;
fc2b6214 955 strbuf_add(prefix, name, len);
9037026d 956
9037026d 957 processed = clear_ce_flags_dir(cache, cache_end - cache,
fc2b6214
AP
958 prefix,
959 prefix->buf + prefix->len - len,
9037026d 960 select_mask, clear_mask,
28911091 961 el, defval);
9037026d
NTND
962
963 /* clear_c_f_dir eats a whole dir already? */
964 if (processed) {
965 cache += processed;
fc2b6214 966 strbuf_setlen(prefix, prefix->len - len);
9037026d
NTND
967 continue;
968 }
969
fc2b6214 970 strbuf_addch(prefix, '/');
9037026d 971 cache += clear_ce_flags_1(cache, cache_end - cache,
fc2b6214 972 prefix,
28911091 973 select_mask, clear_mask, el, defval);
fc2b6214 974 strbuf_setlen(prefix, prefix->len - len - 1);
9037026d
NTND
975 continue;
976 }
977
978 /* Non-directory */
979 dtype = ce_to_dtype(ce);
07958050
AS
980 ret = is_excluded_from_list(ce->name, ce_namelen(ce),
981 name, &dtype, el);
28911091
NTND
982 if (ret < 0)
983 ret = defval;
984 if (ret > 0)
9037026d
NTND
985 ce->ce_flags &= ~clear_mask;
986 cache++;
987 }
988 return nr - (cache_end - cache);
989}
990
991static int clear_ce_flags(struct cache_entry **cache, int nr,
992 int select_mask, int clear_mask,
993 struct exclude_list *el)
994{
fc2b6214
AP
995 static struct strbuf prefix = STRBUF_INIT;
996
997 strbuf_reset(&prefix);
998
9037026d 999 return clear_ce_flags_1(cache, nr,
fc2b6214 1000 &prefix,
9037026d 1001 select_mask, clear_mask,
28911091 1002 el, 0);
9037026d
NTND
1003}
1004
2431afbf
NTND
1005/*
1006 * Set/Clear CE_NEW_SKIP_WORKTREE according to $GIT_DIR/info/sparse-checkout
1007 */
1008static void mark_new_skip_worktree(struct exclude_list *el,
1009 struct index_state *the_index,
1010 int select_flag, int skip_wt_flag)
1011{
1012 int i;
1013
9037026d
NTND
1014 /*
1015 * 1. Pretend the narrowest worktree: only unmerged entries
1016 * are checked out
1017 */
2431afbf
NTND
1018 for (i = 0; i < the_index->cache_nr; i++) {
1019 struct cache_entry *ce = the_index->cache[i];
1020
1021 if (select_flag && !(ce->ce_flags & select_flag))
1022 continue;
1023
9037026d 1024 if (!ce_stage(ce))
2431afbf
NTND
1025 ce->ce_flags |= skip_wt_flag;
1026 else
1027 ce->ce_flags &= ~skip_wt_flag;
1028 }
9037026d
NTND
1029
1030 /*
1031 * 2. Widen worktree according to sparse-checkout file.
1032 * Matched entries will have skip_wt_flag cleared (i.e. "in")
1033 */
1034 clear_ce_flags(the_index->cache, the_index->cache_nr,
1035 select_flag, skip_wt_flag, el);
2431afbf
NTND
1036}
1037
eb9ae4b5
RS
1038static int verify_absent(const struct cache_entry *,
1039 enum unpack_trees_error_types,
1040 struct unpack_trees_options *);
2e2b887d
JH
1041/*
1042 * N-way merge "len" trees. Returns 0 on success, -1 on failure to manipulate the
1043 * resulting index, -2 on failure to reflect the changes to the work tree.
2431afbf
NTND
1044 *
1045 * CE_ADDED, CE_UNPACKED and CE_NEW_SKIP_WORKTREE are used internally
2e2b887d 1046 */
01904572
LT
1047int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options *o)
1048{
e800ec9d 1049 int i, ret;
0fb1eaa8 1050 static struct cache_entry *dfc;
08aefc9e 1051 struct exclude_list el;
16da134b 1052
ca885a4f
JH
1053 if (len > MAX_UNPACK_TREES)
1054 die("unpack_trees takes at most %d trees", MAX_UNPACK_TREES);
076b0adc 1055 memset(&state, 0, sizeof(state));
16da134b
JS
1056 state.base_dir = "";
1057 state.force = 1;
1058 state.quiet = 1;
1059 state.refresh_cache = 1;
d4a2024a 1060 state.istate = &o->result;
16da134b 1061
08aefc9e
NTND
1062 memset(&el, 0, sizeof(el));
1063 if (!core_apply_sparse_checkout || !o->update)
1064 o->skip_sparse_checkout = 1;
1065 if (!o->skip_sparse_checkout) {
fcd12db6
JK
1066 char *sparse = git_pathdup("info/sparse-checkout");
1067 if (add_excludes_from_file_to_list(sparse, "", 0, &el, 0) < 0)
08aefc9e
NTND
1068 o->skip_sparse_checkout = 1;
1069 else
1070 o->el = &el;
fcd12db6 1071 free(sparse);
08aefc9e
NTND
1072 }
1073
34110cd4 1074 memset(&o->result, 0, sizeof(o->result));
913e0e99 1075 o->result.initialized = 1;
da165f47
JH
1076 o->result.timestamp.sec = o->src_index->timestamp.sec;
1077 o->result.timestamp.nsec = o->src_index->timestamp.nsec;
9170c7ab 1078 o->result.version = o->src_index->version;
5fc2fc8f
NTND
1079 o->result.split_index = o->src_index->split_index;
1080 if (o->result.split_index)
1081 o->result.split_index->refcount++;
e93021b2 1082 hashcpy(o->result.sha1, o->src_index->sha1);
16da134b 1083 o->merge_size = len;
da165f47 1084 mark_all_ce_unused(o->src_index);
0fb1eaa8 1085
2431afbf
NTND
1086 /*
1087 * Sparse checkout loop #1: set NEW_SKIP_WORKTREE on existing entries
1088 */
1089 if (!o->skip_sparse_checkout)
1090 mark_new_skip_worktree(o->el, o->src_index, 0, CE_NEW_SKIP_WORKTREE);
1091
0fb1eaa8 1092 if (!dfc)
13494ed1 1093 dfc = xcalloc(1, cache_entry_size(0));
0fb1eaa8 1094 o->df_conflict_entry = dfc;
16da134b
JS
1095
1096 if (len) {
01904572
LT
1097 const char *prefix = o->prefix ? o->prefix : "";
1098 struct traverse_info info;
1099
1100 setup_traverse_info(&info, prefix);
1101 info.fn = unpack_callback;
1102 info.data = o;
e6c111b4 1103 info.show_all_errors = o->show_all_errors;
40e37256 1104 info.pathspec = o->pathspec;
01904572 1105
da165f47
JH
1106 if (o->prefix) {
1107 /*
1108 * Unpack existing index entries that sort before the
1109 * prefix the tree is spliced into. Note that o->merge
1110 * is always true in this case.
1111 */
1112 while (1) {
1113 struct cache_entry *ce = next_cache_entry(o);
1114 if (!ce)
1115 break;
1116 if (ce_in_traverse_path(ce, &info))
1117 break;
1118 if (unpack_index_entry(ce, o) < 0)
1119 goto return_failed;
1120 }
08aefc9e 1121 }
da165f47 1122
01904572 1123 if (traverse_trees(len, t, &info) < 0)
da165f47 1124 goto return_failed;
16da134b
JS
1125 }
1126
01904572
LT
1127 /* Any left-over entries in the index? */
1128 if (o->merge) {
da165f47
JH
1129 while (1) {
1130 struct cache_entry *ce = next_cache_entry(o);
1131 if (!ce)
1132 break;
01904572 1133 if (unpack_index_entry(ce, o) < 0)
da165f47 1134 goto return_failed;
17e46426 1135 }
17e46426 1136 }
da165f47 1137 mark_all_ce_unused(o->src_index);
16da134b 1138
08aefc9e
NTND
1139 if (o->trivial_merges_only && o->nontrivial_merge) {
1140 ret = unpack_failed(o, "Merge requires file-level merging");
1141 goto done;
1142 }
01904572 1143
e800ec9d 1144 if (!o->skip_sparse_checkout) {
9e1afb16 1145 int empty_worktree = 1;
2431afbf
NTND
1146
1147 /*
1148 * Sparse checkout loop #2: set NEW_SKIP_WORKTREE on entries not in loop #1
1149 * If the will have NEW_SKIP_WORKTREE, also set CE_SKIP_WORKTREE
1150 * so apply_sparse_checkout() won't attempt to remove it from worktree
1151 */
1152 mark_new_skip_worktree(o->el, &o->result, CE_ADDED, CE_SKIP_WORKTREE | CE_NEW_SKIP_WORKTREE);
1153
17d26a4d 1154 ret = 0;
2431afbf 1155 for (i = 0; i < o->result.cache_nr; i++) {
e800ec9d
NTND
1156 struct cache_entry *ce = o->result.cache[i];
1157
2431afbf
NTND
1158 /*
1159 * Entries marked with CE_ADDED in merged_entry() do not have
1160 * verify_absent() check (the check is effectively disabled
1161 * because CE_NEW_SKIP_WORKTREE is set unconditionally).
1162 *
1163 * Do the real check now because we have had
1164 * correct CE_NEW_SKIP_WORKTREE
1165 */
1166 if (ce->ce_flags & CE_ADDED &&
17d26a4d
NTND
1167 verify_absent(ce, ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN, o)) {
1168 if (!o->show_all_errors)
1169 goto return_failed;
1170 ret = -1;
1171 }
2431afbf 1172
a5c446f1 1173 if (apply_sparse_checkout(&o->result, ce, o)) {
17d26a4d
NTND
1174 if (!o->show_all_errors)
1175 goto return_failed;
e800ec9d 1176 ret = -1;
e800ec9d 1177 }
eec3fc03 1178 if (!ce_skip_worktree(ce))
9e1afb16 1179 empty_worktree = 0;
f1f523ea 1180
e800ec9d 1181 }
17d26a4d
NTND
1182 if (ret < 0)
1183 goto return_failed;
a7bc906f
NTND
1184 /*
1185 * Sparse checkout is meant to narrow down checkout area
1186 * but it does not make sense to narrow down to empty working
1187 * tree. This is usually a mistake in sparse checkout rules.
1188 * Do not allow users to do that.
1189 */
9e1afb16
NTND
1190 if (o->result.cache_nr && empty_worktree) {
1191 ret = unpack_failed(o, "Sparse checkout leaves no entry on working directory");
1192 goto done;
1193 }
e800ec9d 1194 }
01904572 1195
34110cd4 1196 o->src_index = NULL;
2e2b887d 1197 ret = check_updates(o) ? (-2) : 0;
e28f7641 1198 if (o->dst_index) {
52fca218
BD
1199 if (!ret) {
1200 if (!o->result.cache_tree)
1201 o->result.cache_tree = cache_tree();
1202 if (!cache_tree_fully_valid(o->result.cache_tree))
1203 cache_tree_update(&o->result,
1204 WRITE_TREE_SILENT |
1205 WRITE_TREE_REPAIR);
1206 }
e28f7641 1207 discard_index(o->dst_index);
34110cd4 1208 *o->dst_index = o->result;
a16cc8b2
JH
1209 } else {
1210 discard_index(&o->result);
e28f7641 1211 }
08aefc9e
NTND
1212
1213done:
f6198812 1214 clear_exclude_list(&el);
2e2b887d 1215 return ret;
da165f47
JH
1216
1217return_failed:
e6c111b4
MM
1218 if (o->show_all_errors)
1219 display_error_msgs(o);
da165f47 1220 mark_all_ce_unused(o->src_index);
026680f8 1221 ret = unpack_failed(o, NULL);
b4194828
JH
1222 if (o->exiting_early)
1223 ret = 0;
026680f8 1224 goto done;
16da134b 1225}
076b0adc
JS
1226
1227/* Here come the merge functions */
1228
eb9ae4b5
RS
1229static int reject_merge(const struct cache_entry *ce,
1230 struct unpack_trees_options *o)
076b0adc 1231{
6a143aa2
JN
1232 return o->gently ? -1 :
1233 add_rejected_path(o, ERROR_WOULD_OVERWRITE, ce->name);
076b0adc
JS
1234}
1235
eb9ae4b5 1236static int same(const struct cache_entry *a, const struct cache_entry *b)
076b0adc
JS
1237{
1238 if (!!a != !!b)
1239 return 0;
1240 if (!a && !b)
1241 return 1;
e11d7b59
JH
1242 if ((a->ce_flags | b->ce_flags) & CE_CONFLICTED)
1243 return 0;
076b0adc 1244 return a->ce_mode == b->ce_mode &&
a89fccd2 1245 !hashcmp(a->sha1, b->sha1);
076b0adc
JS
1246}
1247
1248
1249/*
1250 * When a CE gets turned into an unmerged entry, we
1251 * want it to be up-to-date
1252 */
eb9ae4b5
RS
1253static int verify_uptodate_1(const struct cache_entry *ce,
1254 struct unpack_trees_options *o,
1255 enum unpack_trees_error_types error_type)
076b0adc
JS
1256{
1257 struct stat st;
1258
d5b66299
NTND
1259 if (o->index_only)
1260 return 0;
1261
1262 /*
1263 * CE_VALID and CE_SKIP_WORKTREE cheat, we better check again
1264 * if this entry is truly up-to-date because this file may be
1265 * overwritten.
1266 */
1267 if ((ce->ce_flags & CE_VALID) || ce_skip_worktree(ce))
1268 ; /* keep checking */
1269 else if (o->reset || ce_uptodate(ce))
203a2fe1 1270 return 0;
076b0adc
JS
1271
1272 if (!lstat(ce->name, &st)) {
d5b66299
NTND
1273 int flags = CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE;
1274 unsigned changed = ie_match_stat(o->src_index, ce, &st, flags);
076b0adc 1275 if (!changed)
203a2fe1 1276 return 0;
936492d3
JH
1277 /*
1278 * NEEDSWORK: the current default policy is to allow
cb8ad289 1279 * submodule to be out of sync wrt the superproject
936492d3
JH
1280 * index. This needs to be tightened later for
1281 * submodules that are marked to be automatically
1282 * checked out.
1283 */
7a51ed66 1284 if (S_ISGITLINK(ce->ce_mode))
203a2fe1 1285 return 0;
076b0adc
JS
1286 errno = 0;
1287 }
076b0adc 1288 if (errno == ENOENT)
203a2fe1 1289 return 0;
17e46426 1290 return o->gently ? -1 :
e6c111b4 1291 add_rejected_path(o, error_type, ce->name);
35a5aa79
NTND
1292}
1293
eb9ae4b5 1294static int verify_uptodate(const struct cache_entry *ce,
35a5aa79
NTND
1295 struct unpack_trees_options *o)
1296{
2431afbf 1297 if (!o->skip_sparse_checkout && (ce->ce_flags & CE_NEW_SKIP_WORKTREE))
f1f523ea 1298 return 0;
08402b04 1299 return verify_uptodate_1(ce, o, ERROR_NOT_UPTODATE_FILE);
076b0adc
JS
1300}
1301
eb9ae4b5 1302static int verify_uptodate_sparse(const struct cache_entry *ce,
e800ec9d
NTND
1303 struct unpack_trees_options *o)
1304{
08402b04 1305 return verify_uptodate_1(ce, o, ERROR_SPARSE_NOT_UPTODATE_FILE);
076b0adc
JS
1306}
1307
eb9ae4b5
RS
1308static void invalidate_ce_path(const struct cache_entry *ce,
1309 struct unpack_trees_options *o)
076b0adc 1310{
e931371a
NTND
1311 if (!ce)
1312 return;
1313 cache_tree_invalidate_path(o->src_index, ce->name);
1314 untracked_cache_invalidate_path(o->src_index, ce->name);
076b0adc
JS
1315}
1316
0cf73755
SV
1317/*
1318 * Check that checking out ce->sha1 in subdir ce->name is not
1319 * going to overwrite any working files.
1320 *
1321 * Currently, git does not checkout subprojects during a superproject
1322 * checkout, so it is not going to overwrite anything.
1323 */
eb9ae4b5
RS
1324static int verify_clean_submodule(const struct cache_entry *ce,
1325 enum unpack_trees_error_types error_type,
1326 struct unpack_trees_options *o)
0cf73755
SV
1327{
1328 return 0;
1329}
1330
eb9ae4b5
RS
1331static int verify_clean_subdirectory(const struct cache_entry *ce,
1332 enum unpack_trees_error_types error_type,
1333 struct unpack_trees_options *o)
c8193534
JH
1334{
1335 /*
0cf73755 1336 * we are about to extract "ce->name"; we would not want to lose
c8193534
JH
1337 * anything in the existing directory there.
1338 */
1339 int namelen;
7b9e3ce0 1340 int i;
c8193534
JH
1341 struct dir_struct d;
1342 char *pathbuf;
1343 int cnt = 0;
0cf73755
SV
1344 unsigned char sha1[20];
1345
7a51ed66 1346 if (S_ISGITLINK(ce->ce_mode) &&
0cf73755
SV
1347 resolve_gitlink_ref(ce->name, "HEAD", sha1) == 0) {
1348 /* If we are not going to update the submodule, then
1349 * we don't care.
1350 */
1351 if (!hashcmp(sha1, ce->sha1))
1352 return 0;
08402b04 1353 return verify_clean_submodule(ce, error_type, o);
0cf73755 1354 }
c8193534
JH
1355
1356 /*
1357 * First let's make sure we do not have a local modification
1358 * in that directory.
1359 */
68c4f6a5 1360 namelen = ce_namelen(ce);
da165f47
JH
1361 for (i = locate_in_src_index(ce, o);
1362 i < o->src_index->cache_nr;
1363 i++) {
837e5fe9
CB
1364 struct cache_entry *ce2 = o->src_index->cache[i];
1365 int len = ce_namelen(ce2);
c8193534 1366 if (len < namelen ||
837e5fe9
CB
1367 strncmp(ce->name, ce2->name, namelen) ||
1368 ce2->name[namelen] != '/')
c8193534
JH
1369 break;
1370 /*
da165f47
JH
1371 * ce2->name is an entry in the subdirectory to be
1372 * removed.
c8193534 1373 */
837e5fe9
CB
1374 if (!ce_stage(ce2)) {
1375 if (verify_uptodate(ce2, o))
203a2fe1 1376 return -1;
837e5fe9 1377 add_entry(o, ce2, CE_REMOVE, 0);
da165f47 1378 mark_ce_used(ce2, o);
c8193534
JH
1379 }
1380 cnt++;
1381 }
1382
1383 /*
1384 * Then we need to make sure that we do not lose a locally
1385 * present file that is not ignored.
1386 */
75faa45a 1387 pathbuf = xstrfmt("%.*s/", namelen, ce->name);
c8193534
JH
1388
1389 memset(&d, 0, sizeof(d));
1390 if (o->dir)
1391 d.exclude_per_dir = o->dir->exclude_per_dir;
dba2e203 1392 i = read_directory(&d, pathbuf, namelen+1, NULL);
c8193534 1393 if (i)
17e46426 1394 return o->gently ? -1 :
e6c111b4 1395 add_rejected_path(o, ERROR_NOT_UPTODATE_DIR, ce->name);
c8193534
JH
1396 free(pathbuf);
1397 return cnt;
1398}
1399
32260ad5
LT
1400/*
1401 * This gets called when there was no index entry for the tree entry 'dst',
1402 * but we found a file in the working tree that 'lstat()' said was fine,
1403 * and we're on a case-insensitive filesystem.
1404 *
1405 * See if we can find a case-insensitive match in the index that also
1406 * matches the stat information, and assume it's that other file!
1407 */
a9307f5a 1408static int icase_exists(struct unpack_trees_options *o, const char *name, int len, struct stat *st)
32260ad5 1409{
9c5e6c80 1410 const struct cache_entry *src;
32260ad5 1411
ebbd7439 1412 src = index_file_exists(o->src_index, name, len, 1);
56cac48c 1413 return src && !ie_match_stat(o->src_index, src, st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE);
32260ad5
LT
1414}
1415
a9307f5a 1416static int check_ok_to_remove(const char *name, int len, int dtype,
eb9ae4b5 1417 const struct cache_entry *ce, struct stat *st,
a9307f5a
CB
1418 enum unpack_trees_error_types error_type,
1419 struct unpack_trees_options *o)
1420{
9c5e6c80 1421 const struct cache_entry *result;
a9307f5a
CB
1422
1423 /*
1424 * It may be that the 'lstat()' succeeded even though
1425 * target 'ce' was absent, because there is an old
1426 * entry that is different only in case..
1427 *
1428 * Ignore that lstat() if it matches.
1429 */
1430 if (ignore_case && icase_exists(o, name, len, st))
1431 return 0;
1432
589570db 1433 if (o->dir &&
b07bc8c8 1434 is_excluded(o->dir, name, &dtype))
a9307f5a
CB
1435 /*
1436 * ce->name is explicitly excluded, so it is Ok to
1437 * overwrite it.
1438 */
1439 return 0;
1440 if (S_ISDIR(st->st_mode)) {
1441 /*
1442 * We are checking out path "foo" and
1443 * found "foo/." in the working tree.
1444 * This is tricky -- if we have modified
1445 * files that are in "foo/" we would lose
1446 * them.
1447 */
1448 if (verify_clean_subdirectory(ce, error_type, o) < 0)
1449 return -1;
1450 return 0;
1451 }
1452
1453 /*
1454 * The previous round may already have decided to
1455 * delete this path, which is in a subdirectory that
1456 * is being replaced with a blob.
1457 */
ebbd7439 1458 result = index_file_exists(&o->result, name, len, 0);
a9307f5a
CB
1459 if (result) {
1460 if (result->ce_flags & CE_REMOVE)
1461 return 0;
1462 }
1463
1464 return o->gently ? -1 :
1465 add_rejected_path(o, error_type, name);
1466}
1467
076b0adc
JS
1468/*
1469 * We do not want to remove or overwrite a working tree file that
f8a9d428 1470 * is not tracked, unless it is ignored.
076b0adc 1471 */
eb9ae4b5
RS
1472static int verify_absent_1(const struct cache_entry *ce,
1473 enum unpack_trees_error_types error_type,
1474 struct unpack_trees_options *o)
076b0adc 1475{
f66caaf9 1476 int len;
076b0adc
JS
1477 struct stat st;
1478
1479 if (o->index_only || o->reset || !o->update)
203a2fe1 1480 return 0;
c8193534 1481
f66caaf9
CB
1482 len = check_leading_path(ce->name, ce_namelen(ce));
1483 if (!len)
203a2fe1 1484 return 0;
f66caaf9 1485 else if (len > 0) {
f514ef97
JK
1486 char *path;
1487 int ret;
1488
1489 path = xmemdupz(ce->name, len);
a93e5301 1490 if (lstat(path, &st))
f514ef97 1491 ret = error("cannot stat '%s': %s", path,
a93e5301 1492 strerror(errno));
f514ef97
JK
1493 else
1494 ret = check_ok_to_remove(path, len, DT_UNKNOWN, NULL,
1495 &st, error_type, o);
1496 free(path);
1497 return ret;
92fda79e
JN
1498 } else if (lstat(ce->name, &st)) {
1499 if (errno != ENOENT)
1500 return error("cannot stat '%s': %s", ce->name,
1501 strerror(errno));
1502 return 0;
1503 } else {
a9307f5a 1504 return check_ok_to_remove(ce->name, ce_namelen(ce),
92fda79e
JN
1505 ce_to_dtype(ce), ce, &st,
1506 error_type, o);
1507 }
076b0adc 1508}
a9307f5a 1509
eb9ae4b5 1510static int verify_absent(const struct cache_entry *ce,
08402b04 1511 enum unpack_trees_error_types error_type,
35a5aa79
NTND
1512 struct unpack_trees_options *o)
1513{
2431afbf 1514 if (!o->skip_sparse_checkout && (ce->ce_flags & CE_NEW_SKIP_WORKTREE))
f1f523ea 1515 return 0;
08402b04 1516 return verify_absent_1(ce, error_type, o);
35a5aa79 1517}
076b0adc 1518
eb9ae4b5
RS
1519static int verify_absent_sparse(const struct cache_entry *ce,
1520 enum unpack_trees_error_types error_type,
1521 struct unpack_trees_options *o)
e800ec9d 1522{
08402b04
MM
1523 enum unpack_trees_error_types orphaned_error = error_type;
1524 if (orphaned_error == ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN)
1525 orphaned_error = ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN;
1526
1527 return verify_absent_1(ce, orphaned_error, o);
e800ec9d 1528}
076b0adc 1529
f2fa3542 1530static int merged_entry(const struct cache_entry *ce,
eb9ae4b5 1531 const struct cache_entry *old,
f2fa3542 1532 struct unpack_trees_options *o)
076b0adc 1533{
7f8ab8dc 1534 int update = CE_UPDATE;
f2fa3542 1535 struct cache_entry *merge = dup_entry(ce);
7f8ab8dc 1536
e11d7b59 1537 if (!old) {
2431afbf
NTND
1538 /*
1539 * New index entries. In sparse checkout, the following
1540 * verify_absent() will be delayed until after
1541 * traverse_trees() finishes in unpack_trees(), then:
1542 *
1543 * - CE_NEW_SKIP_WORKTREE will be computed correctly
1544 * - verify_absent() be called again, this time with
1545 * correct CE_NEW_SKIP_WORKTREE
1546 *
1547 * verify_absent() call here does nothing in sparse
1548 * checkout (i.e. o->skip_sparse_checkout == 0)
1549 */
1550 update |= CE_ADDED;
1551 merge->ce_flags |= CE_NEW_SKIP_WORKTREE;
1552
f2fa3542
RS
1553 if (verify_absent(merge,
1554 ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN, o)) {
1555 free(merge);
e11d7b59 1556 return -1;
f2fa3542 1557 }
e11d7b59
JH
1558 invalidate_ce_path(merge, o);
1559 } else if (!(old->ce_flags & CE_CONFLICTED)) {
076b0adc
JS
1560 /*
1561 * See if we can re-use the old CE directly?
1562 * That way we get the uptodate stat info.
1563 *
7f8ab8dc
LT
1564 * This also removes the UPDATE flag on a match; otherwise
1565 * we will end up overwriting local changes in the work tree.
076b0adc
JS
1566 */
1567 if (same(old, merge)) {
eb7a2f1d 1568 copy_cache_entry(merge, old);
7f8ab8dc 1569 update = 0;
076b0adc 1570 } else {
f2fa3542
RS
1571 if (verify_uptodate(old, o)) {
1572 free(merge);
203a2fe1 1573 return -1;
f2fa3542 1574 }
2431afbf
NTND
1575 /* Migrate old flags over */
1576 update |= old->ce_flags & (CE_SKIP_WORKTREE | CE_NEW_SKIP_WORKTREE);
bc052d7f 1577 invalidate_ce_path(old, o);
076b0adc 1578 }
e11d7b59
JH
1579 } else {
1580 /*
1581 * Previously unmerged entry left as an existence
1582 * marker by read_index_unmerged();
1583 */
1584 invalidate_ce_path(old, o);
076b0adc
JS
1585 }
1586
f2fa3542 1587 do_add_entry(o, merge, update, CE_STAGEMASK);
076b0adc
JS
1588 return 1;
1589}
1590
eb9ae4b5
RS
1591static int deleted_entry(const struct cache_entry *ce,
1592 const struct cache_entry *old,
1593 struct unpack_trees_options *o)
076b0adc 1594{
34110cd4
LT
1595 /* Did it exist in the index? */
1596 if (!old) {
08402b04 1597 if (verify_absent(ce, ERROR_WOULD_LOSE_UNTRACKED_REMOVED, o))
203a2fe1 1598 return -1;
34110cd4
LT
1599 return 0;
1600 }
e11d7b59 1601 if (!(old->ce_flags & CE_CONFLICTED) && verify_uptodate(old, o))
34110cd4
LT
1602 return -1;
1603 add_entry(o, ce, CE_REMOVE, 0);
bc052d7f 1604 invalidate_ce_path(ce, o);
076b0adc
JS
1605 return 1;
1606}
1607
eb9ae4b5
RS
1608static int keep_entry(const struct cache_entry *ce,
1609 struct unpack_trees_options *o)
076b0adc 1610{
34110cd4 1611 add_entry(o, ce, 0, 0);
076b0adc
JS
1612 return 1;
1613}
1614
1615#if DBRT_DEBUG
1616static void show_stage_entry(FILE *o,
1617 const char *label, const struct cache_entry *ce)
1618{
1619 if (!ce)
1620 fprintf(o, "%s (missing)\n", label);
1621 else
1622 fprintf(o, "%s%06o %s %d\t%s\n",
1623 label,
7a51ed66 1624 ce->ce_mode,
076b0adc
JS
1625 sha1_to_hex(ce->sha1),
1626 ce_stage(ce),
1627 ce->name);
1628}
1629#endif
1630
5828e835
RS
1631int threeway_merge(const struct cache_entry * const *stages,
1632 struct unpack_trees_options *o)
076b0adc 1633{
eb9ae4b5
RS
1634 const struct cache_entry *index;
1635 const struct cache_entry *head;
1636 const struct cache_entry *remote = stages[o->head_idx + 1];
076b0adc
JS
1637 int count;
1638 int head_match = 0;
1639 int remote_match = 0;
076b0adc
JS
1640
1641 int df_conflict_head = 0;
1642 int df_conflict_remote = 0;
1643
1644 int any_anc_missing = 0;
1645 int no_anc_exists = 1;
1646 int i;
1647
1648 for (i = 1; i < o->head_idx; i++) {
4c4caafc 1649 if (!stages[i] || stages[i] == o->df_conflict_entry)
076b0adc 1650 any_anc_missing = 1;
4c4caafc 1651 else
076b0adc 1652 no_anc_exists = 0;
076b0adc
JS
1653 }
1654
1655 index = stages[0];
1656 head = stages[o->head_idx];
1657
1658 if (head == o->df_conflict_entry) {
1659 df_conflict_head = 1;
1660 head = NULL;
1661 }
1662
1663 if (remote == o->df_conflict_entry) {
1664 df_conflict_remote = 1;
1665 remote = NULL;
1666 }
1667
cee2d6ae
JH
1668 /*
1669 * First, if there's a #16 situation, note that to prevent #13
076b0adc
JS
1670 * and #14.
1671 */
1672 if (!same(remote, head)) {
1673 for (i = 1; i < o->head_idx; i++) {
1674 if (same(stages[i], head)) {
1675 head_match = i;
1676 }
1677 if (same(stages[i], remote)) {
1678 remote_match = i;
1679 }
1680 }
1681 }
1682
cee2d6ae
JH
1683 /*
1684 * We start with cases where the index is allowed to match
076b0adc
JS
1685 * something other than the head: #14(ALT) and #2ALT, where it
1686 * is permitted to match the result instead.
1687 */
1688 /* #14, #14ALT, #2ALT */
1689 if (remote && !df_conflict_head && head_match && !remote_match) {
1690 if (index && !same(index, remote) && !same(index, head))
6a143aa2 1691 return reject_merge(index, o);
076b0adc
JS
1692 return merged_entry(remote, index, o);
1693 }
1694 /*
1695 * If we have an entry in the index cache, then we want to
1696 * make sure that it matches head.
1697 */
4e7c4571 1698 if (index && !same(index, head))
6a143aa2 1699 return reject_merge(index, o);
076b0adc
JS
1700
1701 if (head) {
1702 /* #5ALT, #15 */
1703 if (same(head, remote))
1704 return merged_entry(head, index, o);
1705 /* #13, #3ALT */
1706 if (!df_conflict_remote && remote_match && !head_match)
1707 return merged_entry(head, index, o);
1708 }
1709
1710 /* #1 */
34110cd4 1711 if (!head && !remote && any_anc_missing)
076b0adc
JS
1712 return 0;
1713
cee2d6ae
JH
1714 /*
1715 * Under the "aggressive" rule, we resolve mostly trivial
076b0adc
JS
1716 * cases that we historically had git-merge-one-file resolve.
1717 */
1718 if (o->aggressive) {
cee2d6ae
JH
1719 int head_deleted = !head;
1720 int remote_deleted = !remote;
eb9ae4b5 1721 const struct cache_entry *ce = NULL;
4c4caafc
JH
1722
1723 if (index)
0cf73755 1724 ce = index;
4c4caafc 1725 else if (head)
0cf73755 1726 ce = head;
4c4caafc 1727 else if (remote)
0cf73755 1728 ce = remote;
4c4caafc
JH
1729 else {
1730 for (i = 1; i < o->head_idx; i++) {
1731 if (stages[i] && stages[i] != o->df_conflict_entry) {
0cf73755 1732 ce = stages[i];
4c4caafc
JH
1733 break;
1734 }
1735 }
1736 }
1737
076b0adc
JS
1738 /*
1739 * Deleted in both.
1740 * Deleted in one and unchanged in the other.
1741 */
1742 if ((head_deleted && remote_deleted) ||
1743 (head_deleted && remote && remote_match) ||
1744 (remote_deleted && head && head_match)) {
1745 if (index)
1746 return deleted_entry(index, index, o);
34110cd4 1747 if (ce && !head_deleted) {
08402b04 1748 if (verify_absent(ce, ERROR_WOULD_LOSE_UNTRACKED_REMOVED, o))
203a2fe1
DB
1749 return -1;
1750 }
076b0adc
JS
1751 return 0;
1752 }
1753 /*
1754 * Added in both, identically.
1755 */
1756 if (no_anc_exists && head && remote && same(head, remote))
1757 return merged_entry(head, index, o);
1758
1759 }
1760
1761 /* Below are "no merge" cases, which require that the index be
1762 * up-to-date to avoid the files getting overwritten with
1763 * conflict resolution files.
1764 */
1765 if (index) {
203a2fe1
DB
1766 if (verify_uptodate(index, o))
1767 return -1;
076b0adc 1768 }
076b0adc
JS
1769
1770 o->nontrivial_merge = 1;
1771
ea4b52a8 1772 /* #2, #3, #4, #6, #7, #9, #10, #11. */
076b0adc
JS
1773 count = 0;
1774 if (!head_match || !remote_match) {
1775 for (i = 1; i < o->head_idx; i++) {
4c4caafc 1776 if (stages[i] && stages[i] != o->df_conflict_entry) {
7f7932ab 1777 keep_entry(stages[i], o);
076b0adc
JS
1778 count++;
1779 break;
1780 }
1781 }
1782 }
1783#if DBRT_DEBUG
1784 else {
1785 fprintf(stderr, "read-tree: warning #16 detected\n");
1786 show_stage_entry(stderr, "head ", stages[head_match]);
1787 show_stage_entry(stderr, "remote ", stages[remote_match]);
1788 }
1789#endif
7f7932ab
JH
1790 if (head) { count += keep_entry(head, o); }
1791 if (remote) { count += keep_entry(remote, o); }
076b0adc
JS
1792 return count;
1793}
1794
1795/*
1796 * Two-way merge.
1797 *
1798 * The rule is to "carry forward" what is in the index without losing
a75d7b54 1799 * information across a "fast-forward", favoring a successful merge
076b0adc
JS
1800 * over a merge failure when it makes sense. For details of the
1801 * "carry forward" rule, please see <Documentation/git-read-tree.txt>.
1802 *
1803 */
5828e835
RS
1804int twoway_merge(const struct cache_entry * const *src,
1805 struct unpack_trees_options *o)
076b0adc 1806{
eb9ae4b5
RS
1807 const struct cache_entry *current = src[0];
1808 const struct cache_entry *oldtree = src[1];
1809 const struct cache_entry *newtree = src[2];
076b0adc
JS
1810
1811 if (o->merge_size != 2)
1812 return error("Cannot do a twoway merge of %d trees",
1813 o->merge_size);
1814
b8ba1535
JH
1815 if (oldtree == o->df_conflict_entry)
1816 oldtree = NULL;
1817 if (newtree == o->df_conflict_entry)
1818 newtree = NULL;
1819
076b0adc 1820 if (current) {
b018ff60
JK
1821 if (current->ce_flags & CE_CONFLICTED) {
1822 if (same(oldtree, newtree) || o->reset) {
1823 if (!newtree)
1824 return deleted_entry(current, current, o);
1825 else
1826 return merged_entry(newtree, current, o);
1827 }
6a143aa2 1828 return reject_merge(current, o);
6c1db1b3 1829 } else if ((!oldtree && !newtree) || /* 4 and 5 */
b018ff60
JK
1830 (!oldtree && newtree &&
1831 same(current, newtree)) || /* 6 and 7 */
1832 (oldtree && newtree &&
1833 same(oldtree, newtree)) || /* 14 and 15 */
1834 (oldtree && newtree &&
1835 !same(oldtree, newtree) && /* 18 and 19 */
1836 same(current, newtree))) {
7f7932ab 1837 return keep_entry(current, o);
6c1db1b3 1838 } else if (oldtree && !newtree && same(current, oldtree)) {
076b0adc
JS
1839 /* 10 or 11 */
1840 return deleted_entry(oldtree, current, o);
6c1db1b3 1841 } else if (oldtree && newtree &&
076b0adc
JS
1842 same(current, oldtree) && !same(current, newtree)) {
1843 /* 20 or 21 */
1844 return merged_entry(newtree, current, o);
6c1db1b3 1845 } else
6a143aa2 1846 return reject_merge(current, o);
076b0adc 1847 }
55218834
JH
1848 else if (newtree) {
1849 if (oldtree && !o->initial_checkout) {
1850 /*
1851 * deletion of the path was staged;
1852 */
1853 if (same(oldtree, newtree))
1854 return 1;
1855 return reject_merge(oldtree, o);
1856 }
076b0adc 1857 return merged_entry(newtree, current, o);
55218834 1858 }
d699676d 1859 return deleted_entry(oldtree, current, o);
076b0adc
JS
1860}
1861
1862/*
1863 * Bind merge.
1864 *
1865 * Keep the index entries at stage0, collapse stage1 but make sure
1866 * stage0 does not have anything there.
1867 */
5828e835
RS
1868int bind_merge(const struct cache_entry * const *src,
1869 struct unpack_trees_options *o)
076b0adc 1870{
eb9ae4b5
RS
1871 const struct cache_entry *old = src[0];
1872 const struct cache_entry *a = src[1];
076b0adc
JS
1873
1874 if (o->merge_size != 1)
82247e9b 1875 return error("Cannot do a bind merge of %d trees",
076b0adc
JS
1876 o->merge_size);
1877 if (a && old)
17e46426 1878 return o->gently ? -1 :
08353ebb 1879 error(ERRORMSG(o, ERROR_BIND_OVERLAP), a->name, old->name);
076b0adc 1880 if (!a)
7f7932ab 1881 return keep_entry(old, o);
076b0adc
JS
1882 else
1883 return merged_entry(a, NULL, o);
1884}
1885
1886/*
1887 * One-way merge.
1888 *
1889 * The rule is:
1890 * - take the stat information from stage0, take the data from stage1
1891 */
5828e835
RS
1892int oneway_merge(const struct cache_entry * const *src,
1893 struct unpack_trees_options *o)
076b0adc 1894{
eb9ae4b5
RS
1895 const struct cache_entry *old = src[0];
1896 const struct cache_entry *a = src[1];
076b0adc
JS
1897
1898 if (o->merge_size != 1)
1899 return error("Cannot do a oneway merge of %d trees",
1900 o->merge_size);
1901
78d3b06e 1902 if (!a || a == o->df_conflict_entry)
076b0adc 1903 return deleted_entry(old, old, o);
34110cd4 1904
076b0adc 1905 if (old && same(old, a)) {
34110cd4 1906 int update = 0;
686b2de0 1907 if (o->reset && o->update && !ce_uptodate(old) && !ce_skip_worktree(old)) {
076b0adc
JS
1908 struct stat st;
1909 if (lstat(old->name, &st) ||
56cac48c 1910 ie_match_stat(o->src_index, old, &st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE))
34110cd4 1911 update |= CE_UPDATE;
076b0adc 1912 }
34110cd4
LT
1913 add_entry(o, old, update, 0);
1914 return 0;
076b0adc
JS
1915 }
1916 return merged_entry(a, old, o);
1917}