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