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