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