]>
Commit | Line | Data |
---|---|---|
16da134b | 1 | #include "cache.h" |
dbbcd44f | 2 | #include "strvec.h" |
33028713 | 3 | #include "repository.h" |
b2141fc1 | 4 | #include "config.h" |
f8a9d428 | 5 | #include "dir.h" |
16da134b JS |
6 | #include "tree.h" |
7 | #include "tree-walk.h" | |
076b0adc | 8 | #include "cache-tree.h" |
16da134b | 9 | #include "unpack-trees.h" |
96a02f8f | 10 | #include "progress.h" |
0cf73755 | 11 | #include "refs.h" |
06f33c17 | 12 | #include "attr.h" |
5fc2fc8f | 13 | #include "split-index.h" |
a7bc845a SB |
14 | #include "submodule.h" |
15 | #include "submodule-config.h" | |
883e248b | 16 | #include "fsmonitor.h" |
cbd53a21 | 17 | #include "object-store.h" |
b14ed5ad | 18 | #include "promisor-remote.h" |
d052cc03 | 19 | #include "entry.h" |
04155bda | 20 | #include "parallel-checkout.h" |
16da134b | 21 | |
8ccba008 JH |
22 | /* |
23 | * Error messages expected by scripts out of plumbing commands such as | |
24 | * read-tree. Non-scripted Porcelain is not required to use these messages | |
25 | * and in fact are encouraged to reword them to better suit their particular | |
23cbf11b | 26 | * situation better. See how "git checkout" and "git merge" replaces |
dc1166e6 | 27 | * them using setup_unpack_trees_porcelain(), for example. |
8ccba008 | 28 | */ |
6271d77c | 29 | static const char *unpack_plumbing_errors[NB_UNPACK_TREES_WARNING_TYPES] = { |
08353ebb | 30 | /* ERROR_WOULD_OVERWRITE */ |
8ccba008 JH |
31 | "Entry '%s' would be overwritten by merge. Cannot merge.", |
32 | ||
08353ebb | 33 | /* ERROR_NOT_UPTODATE_FILE */ |
8ccba008 JH |
34 | "Entry '%s' not uptodate. Cannot merge.", |
35 | ||
08353ebb | 36 | /* ERROR_NOT_UPTODATE_DIR */ |
8ccba008 JH |
37 | "Updating '%s' would lose untracked files in it", |
38 | ||
b817e545 EN |
39 | /* ERROR_CWD_IN_THE_WAY */ |
40 | "Refusing to remove '%s' since it is the current working directory.", | |
41 | ||
08402b04 MM |
42 | /* ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN */ |
43 | "Untracked working tree file '%s' would be overwritten by merge.", | |
8ccba008 | 44 | |
08402b04 MM |
45 | /* ERROR_WOULD_LOSE_UNTRACKED_REMOVED */ |
46 | "Untracked working tree file '%s' would be removed by merge.", | |
8ccba008 | 47 | |
08353ebb | 48 | /* ERROR_BIND_OVERLAP */ |
8ccba008 | 49 | "Entry '%s' overlaps with '%s'. Cannot bind.", |
e800ec9d | 50 | |
cd002c15 EN |
51 | /* ERROR_WOULD_LOSE_SUBMODULE */ |
52 | "Submodule '%s' cannot checkout new HEAD.", | |
e800ec9d | 53 | |
6271d77c EN |
54 | /* NB_UNPACK_TREES_ERROR_TYPES; just a meta value */ |
55 | "", | |
08402b04 | 56 | |
1ac83f42 | 57 | /* WARNING_SPARSE_NOT_UPTODATE_FILE */ |
22ab0b37 | 58 | "Path '%s' not uptodate; will not remove from working tree.", |
a7bc845a | 59 | |
ebb568b9 EN |
60 | /* WARNING_SPARSE_UNMERGED_FILE */ |
61 | "Path '%s' unmerged; will not remove from working tree.", | |
62 | ||
1ac83f42 | 63 | /* WARNING_SPARSE_ORPHANED_NOT_OVERWRITTEN */ |
22ab0b37 | 64 | "Path '%s' already present; will not overwrite with sparse update.", |
8ccba008 JH |
65 | }; |
66 | ||
08353ebb MM |
67 | #define ERRORMSG(o,type) \ |
68 | ( ((o) && (o)->msgs[(type)]) \ | |
69 | ? ((o)->msgs[(type)]) \ | |
70 | : (unpack_plumbing_errors[(type)]) ) | |
8ccba008 | 71 | |
3d415425 SB |
72 | static const char *super_prefixed(const char *path) |
73 | { | |
74 | /* | |
75 | * It is necessary and sufficient to have two static buffers | |
76 | * here, as the return value of this function is fed to | |
77 | * error() using the unpack_*_errors[] templates we see above. | |
78 | */ | |
79 | static struct strbuf buf[2] = {STRBUF_INIT, STRBUF_INIT}; | |
80 | static int super_prefix_len = -1; | |
81 | static unsigned idx = ARRAY_SIZE(buf) - 1; | |
82 | ||
83 | if (super_prefix_len < 0) { | |
84 | const char *super_prefix = get_super_prefix(); | |
85 | if (!super_prefix) { | |
86 | super_prefix_len = 0; | |
87 | } else { | |
88 | int i; | |
89 | for (i = 0; i < ARRAY_SIZE(buf); i++) | |
90 | strbuf_addstr(&buf[i], super_prefix); | |
91 | super_prefix_len = buf[0].len; | |
92 | } | |
93 | } | |
94 | ||
95 | if (!super_prefix_len) | |
96 | return path; | |
97 | ||
98 | if (++idx >= ARRAY_SIZE(buf)) | |
99 | idx = 0; | |
100 | ||
101 | strbuf_setlen(&buf[idx], super_prefix_len); | |
102 | strbuf_addstr(&buf[idx], path); | |
103 | ||
104 | return buf[idx].buf; | |
105 | } | |
106 | ||
e294030f MM |
107 | void setup_unpack_trees_porcelain(struct unpack_trees_options *opts, |
108 | const char *cmd) | |
dc1166e6 | 109 | { |
7980872d | 110 | int i; |
e294030f | 111 | const char **msgs = opts->msgs; |
dc1166e6 | 112 | const char *msg; |
fa3f60b7 | 113 | |
c972bf4c | 114 | strvec_init(&opts->msgs_to_free); |
1c41d280 | 115 | |
2e3926b9 | 116 | if (!strcmp(cmd, "checkout")) |
ed9bff08 | 117 | msg = advice_enabled(ADVICE_COMMIT_BEFORE_MERGE) |
2e3926b9 | 118 | ? _("Your local changes to the following files would be overwritten by checkout:\n%%s" |
c2691e2a | 119 | "Please commit your changes or stash them before you switch branches.") |
2e3926b9 VA |
120 | : _("Your local changes to the following files would be overwritten by checkout:\n%%s"); |
121 | else if (!strcmp(cmd, "merge")) | |
ed9bff08 | 122 | msg = advice_enabled(ADVICE_COMMIT_BEFORE_MERGE) |
2e3926b9 | 123 | ? _("Your local changes to the following files would be overwritten by merge:\n%%s" |
c2691e2a | 124 | "Please commit your changes or stash them before you merge.") |
2e3926b9 | 125 | : _("Your local changes to the following files would be overwritten by merge:\n%%s"); |
dc1166e6 | 126 | else |
ed9bff08 | 127 | msg = advice_enabled(ADVICE_COMMIT_BEFORE_MERGE) |
2e3926b9 | 128 | ? _("Your local changes to the following files would be overwritten by %s:\n%%s" |
c2691e2a | 129 | "Please commit your changes or stash them before you %s.") |
2e3926b9 | 130 | : _("Your local changes to the following files would be overwritten by %s:\n%%s"); |
fa3f60b7 | 131 | msgs[ERROR_WOULD_OVERWRITE] = msgs[ERROR_NOT_UPTODATE_FILE] = |
c972bf4c | 132 | strvec_pushf(&opts->msgs_to_free, msg, cmd, cmd); |
dc1166e6 MM |
133 | |
134 | msgs[ERROR_NOT_UPTODATE_DIR] = | |
584f99c8 | 135 | _("Updating the following directories would lose untracked files in them:\n%s"); |
dc1166e6 | 136 | |
b817e545 EN |
137 | msgs[ERROR_CWD_IN_THE_WAY] = |
138 | _("Refusing to remove the current working directory:\n%s"); | |
139 | ||
2e3926b9 | 140 | if (!strcmp(cmd, "checkout")) |
ed9bff08 | 141 | msg = advice_enabled(ADVICE_COMMIT_BEFORE_MERGE) |
2e3926b9 | 142 | ? _("The following untracked working tree files would be removed by checkout:\n%%s" |
c2691e2a | 143 | "Please move or remove them before you switch branches.") |
2e3926b9 VA |
144 | : _("The following untracked working tree files would be removed by checkout:\n%%s"); |
145 | else if (!strcmp(cmd, "merge")) | |
ed9bff08 | 146 | msg = advice_enabled(ADVICE_COMMIT_BEFORE_MERGE) |
2e3926b9 | 147 | ? _("The following untracked working tree files would be removed by merge:\n%%s" |
c2691e2a | 148 | "Please move or remove them before you merge.") |
2e3926b9 | 149 | : _("The following untracked working tree files would be removed by merge:\n%%s"); |
dc1166e6 | 150 | else |
ed9bff08 | 151 | msg = advice_enabled(ADVICE_COMMIT_BEFORE_MERGE) |
2e3926b9 | 152 | ? _("The following untracked working tree files would be removed by %s:\n%%s" |
c2691e2a | 153 | "Please move or remove them before you %s.") |
2e3926b9 | 154 | : _("The following untracked working tree files would be removed by %s:\n%%s"); |
1c41d280 | 155 | msgs[ERROR_WOULD_LOSE_UNTRACKED_REMOVED] = |
c972bf4c | 156 | strvec_pushf(&opts->msgs_to_free, msg, cmd, cmd); |
2e3926b9 VA |
157 | |
158 | if (!strcmp(cmd, "checkout")) | |
ed9bff08 | 159 | msg = advice_enabled(ADVICE_COMMIT_BEFORE_MERGE) |
2e3926b9 | 160 | ? _("The following untracked working tree files would be overwritten by checkout:\n%%s" |
c2691e2a | 161 | "Please move or remove them before you switch branches.") |
2e3926b9 VA |
162 | : _("The following untracked working tree files would be overwritten by checkout:\n%%s"); |
163 | else if (!strcmp(cmd, "merge")) | |
ed9bff08 | 164 | msg = advice_enabled(ADVICE_COMMIT_BEFORE_MERGE) |
2e3926b9 | 165 | ? _("The following untracked working tree files would be overwritten by merge:\n%%s" |
c2691e2a | 166 | "Please move or remove them before you merge.") |
2e3926b9 VA |
167 | : _("The following untracked working tree files would be overwritten by merge:\n%%s"); |
168 | else | |
ed9bff08 | 169 | msg = advice_enabled(ADVICE_COMMIT_BEFORE_MERGE) |
2e3926b9 | 170 | ? _("The following untracked working tree files would be overwritten by %s:\n%%s" |
c2691e2a | 171 | "Please move or remove them before you %s.") |
2e3926b9 | 172 | : _("The following untracked working tree files would be overwritten by %s:\n%%s"); |
1c41d280 | 173 | msgs[ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN] = |
c972bf4c | 174 | strvec_pushf(&opts->msgs_to_free, msg, cmd, cmd); |
dc1166e6 MM |
175 | |
176 | /* | |
177 | * Special case: ERROR_BIND_OVERLAP refers to a pair of paths, we | |
178 | * cannot easily display it as a list. | |
179 | */ | |
ed47fdf7 | 180 | msgs[ERROR_BIND_OVERLAP] = _("Entry '%s' overlaps with '%s'. Cannot bind."); |
dc1166e6 | 181 | |
a7bc845a | 182 | msgs[ERROR_WOULD_LOSE_SUBMODULE] = |
6362ed0b | 183 | _("Cannot update submodule:\n%s"); |
5e65ee35 | 184 | |
1ac83f42 | 185 | msgs[WARNING_SPARSE_NOT_UPTODATE_FILE] = |
22ab0b37 | 186 | _("The following paths are not up to date and were left despite sparse patterns:\n%s"); |
ebb568b9 EN |
187 | msgs[WARNING_SPARSE_UNMERGED_FILE] = |
188 | _("The following paths are unmerged and were left despite sparse patterns:\n%s"); | |
1ac83f42 | 189 | msgs[WARNING_SPARSE_ORPHANED_NOT_OVERWRITTEN] = |
22ab0b37 | 190 | _("The following paths were already present and thus not updated despite sparse patterns:\n%s"); |
5e65ee35 MM |
191 | |
192 | opts->show_all_errors = 1; | |
7980872d CB |
193 | /* rejected paths may not have a static buffer */ |
194 | for (i = 0; i < ARRAY_SIZE(opts->unpack_rejects); i++) | |
195 | opts->unpack_rejects[i].strdup_strings = 1; | |
dc1166e6 MM |
196 | } |
197 | ||
1c41d280 MÅ |
198 | void clear_unpack_trees_porcelain(struct unpack_trees_options *opts) |
199 | { | |
c972bf4c | 200 | strvec_clear(&opts->msgs_to_free); |
1c41d280 MÅ |
201 | memset(opts->msgs, 0, sizeof(opts->msgs)); |
202 | } | |
203 | ||
46169180 | 204 | static int do_add_entry(struct unpack_trees_options *o, struct cache_entry *ce, |
6ff264ee | 205 | unsigned int set, unsigned int clear) |
b48d5a05 | 206 | { |
419a597f | 207 | clear |= CE_HASHED; |
34110cd4 | 208 | |
700e66d6 NTND |
209 | if (set & CE_REMOVE) |
210 | set |= CE_WT_REMOVE; | |
211 | ||
6ff264ee | 212 | ce->ce_flags = (ce->ce_flags & ~clear) | set; |
46169180 JK |
213 | return add_index_entry(&o->result, ce, |
214 | ADD_CACHE_OK_TO_ADD | ADD_CACHE_OK_TO_REPLACE); | |
6ff264ee RS |
215 | } |
216 | ||
a33bd4d3 RS |
217 | static void add_entry(struct unpack_trees_options *o, |
218 | const struct cache_entry *ce, | |
219 | unsigned int set, unsigned int clear) | |
220 | { | |
8e72d675 | 221 | do_add_entry(o, dup_cache_entry(ce, &o->result), set, clear); |
b48d5a05 LT |
222 | } |
223 | ||
e6c111b4 MM |
224 | /* |
225 | * add error messages on path <path> | |
226 | * corresponding to the type <e> with the message <msg> | |
227 | * indicating if it should be display in porcelain or not | |
228 | */ | |
229 | static int add_rejected_path(struct unpack_trees_options *o, | |
230 | enum unpack_trees_error_types e, | |
231 | const char *path) | |
232 | { | |
b165fac8 | 233 | if (o->quiet) |
191e9d2c NTND |
234 | return -1; |
235 | ||
e6c111b4 | 236 | if (!o->show_all_errors) |
3d415425 | 237 | return error(ERRORMSG(o, e), super_prefixed(path)); |
e6c111b4 MM |
238 | |
239 | /* | |
240 | * Otherwise, insert in a list for future display by | |
6271d77c | 241 | * display_(error|warning)_msgs() |
e6c111b4 | 242 | */ |
7980872d | 243 | string_list_append(&o->unpack_rejects[e], path); |
e6c111b4 MM |
244 | return -1; |
245 | } | |
246 | ||
e6c111b4 MM |
247 | /* |
248 | * display all the error messages stored in a nice way | |
249 | */ | |
250 | static void display_error_msgs(struct unpack_trees_options *o) | |
251 | { | |
6271d77c EN |
252 | int e; |
253 | unsigned error_displayed = 0; | |
e6c111b4 | 254 | for (e = 0; e < NB_UNPACK_TREES_ERROR_TYPES; e++) { |
7980872d | 255 | struct string_list *rejects = &o->unpack_rejects[e]; |
6271d77c | 256 | |
7980872d | 257 | if (rejects->nr > 0) { |
6271d77c | 258 | int i; |
e6c111b4 | 259 | struct strbuf path = STRBUF_INIT; |
6271d77c EN |
260 | |
261 | error_displayed = 1; | |
7980872d CB |
262 | for (i = 0; i < rejects->nr; i++) |
263 | strbuf_addf(&path, "\t%s\n", rejects->items[i].string); | |
3d415425 | 264 | error(ERRORMSG(o, e), super_prefixed(path.buf)); |
e6c111b4 | 265 | strbuf_release(&path); |
e6c111b4 | 266 | } |
7980872d | 267 | string_list_clear(rejects, 0); |
e6c111b4 | 268 | } |
6271d77c | 269 | if (error_displayed) |
ed47fdf7 | 270 | fprintf(stderr, _("Aborting\n")); |
e6c111b4 MM |
271 | } |
272 | ||
6271d77c EN |
273 | /* |
274 | * display all the warning messages stored in a nice way | |
275 | */ | |
276 | static void display_warning_msgs(struct unpack_trees_options *o) | |
277 | { | |
278 | int e; | |
279 | unsigned warning_displayed = 0; | |
280 | for (e = NB_UNPACK_TREES_ERROR_TYPES + 1; | |
281 | e < NB_UNPACK_TREES_WARNING_TYPES; e++) { | |
282 | struct string_list *rejects = &o->unpack_rejects[e]; | |
283 | ||
284 | if (rejects->nr > 0) { | |
285 | int i; | |
286 | struct strbuf path = STRBUF_INIT; | |
287 | ||
288 | warning_displayed = 1; | |
289 | for (i = 0; i < rejects->nr; i++) | |
290 | strbuf_addf(&path, "\t%s\n", rejects->items[i].string); | |
291 | warning(ERRORMSG(o, e), super_prefixed(path.buf)); | |
292 | strbuf_release(&path); | |
293 | } | |
294 | string_list_clear(rejects, 0); | |
295 | } | |
296 | if (warning_displayed) | |
297 | fprintf(stderr, _("After fixing the above paths, you may want to run `git sparse-checkout reapply`.\n")); | |
298 | } | |
a7bc845a SB |
299 | static int check_submodule_move_head(const struct cache_entry *ce, |
300 | const char *old_id, | |
301 | const char *new_id, | |
302 | struct unpack_trees_options *o) | |
303 | { | |
cd279e2e | 304 | unsigned flags = SUBMODULE_MOVE_HEAD_DRY_RUN; |
a7bc845a | 305 | const struct submodule *sub = submodule_from_ce(ce); |
7463e2ec | 306 | |
a7bc845a SB |
307 | if (!sub) |
308 | return 0; | |
309 | ||
cd279e2e SB |
310 | if (o->reset) |
311 | flags |= SUBMODULE_MOVE_HEAD_FORCE; | |
312 | ||
7463e2ec | 313 | if (submodule_move_head(ce->name, old_id, new_id, flags)) |
191e9d2c | 314 | return add_rejected_path(o, ERROR_WOULD_LOSE_SUBMODULE, ce->name); |
7463e2ec | 315 | return 0; |
a7bc845a SB |
316 | } |
317 | ||
33028713 | 318 | /* |
15beaaa3 | 319 | * Perform the loading of the repository's gitmodules file. This function is |
33028713 | 320 | * used by 'check_update()' to perform loading of the gitmodules file in two |
15beaaa3 | 321 | * different situations: |
33028713 BW |
322 | * (1) before removing entries from the working tree if the gitmodules file has |
323 | * been marked for removal. This situation is specified by 'state' == NULL. | |
324 | * (2) before checking out entries to the working tree if the gitmodules file | |
325 | * has been marked for update. This situation is specified by 'state' != NULL. | |
326 | */ | |
327 | static void load_gitmodules_file(struct index_state *index, | |
328 | struct checkout *state) | |
a7bc845a | 329 | { |
33028713 BW |
330 | int pos = index_name_pos(index, GITMODULES_FILE, strlen(GITMODULES_FILE)); |
331 | ||
332 | if (pos >= 0) { | |
333 | struct cache_entry *ce = index->cache[pos]; | |
334 | if (!state && ce->ce_flags & CE_WT_REMOVE) { | |
d7992421 | 335 | repo_read_gitmodules(the_repository, 0); |
33028713 | 336 | } else if (state && (ce->ce_flags & CE_UPDATE)) { |
f793b895 | 337 | submodule_free(the_repository); |
0f086e6d | 338 | checkout_entry(ce, state, NULL, NULL); |
d7992421 | 339 | repo_read_gitmodules(the_repository, 0); |
a7bc845a SB |
340 | } |
341 | } | |
342 | } | |
343 | ||
6c34239d EN |
344 | static struct progress *get_progress(struct unpack_trees_options *o, |
345 | struct index_state *index) | |
16da134b | 346 | { |
96a02f8f | 347 | unsigned cnt = 0, total = 0; |
384f1a16 SB |
348 | |
349 | if (!o->update || !o->verbose_update) | |
350 | return NULL; | |
351 | ||
352 | for (; cnt < index->cache_nr; cnt++) { | |
353 | const struct cache_entry *ce = index->cache[cnt]; | |
354 | if (ce->ce_flags & (CE_UPDATE | CE_WT_REMOVE)) | |
355 | total++; | |
356 | } | |
357 | ||
328c6cb8 | 358 | return start_delayed_progress(_("Updating files"), total); |
384f1a16 SB |
359 | } |
360 | ||
b878579a NTND |
361 | static void setup_collided_checkout_detection(struct checkout *state, |
362 | struct index_state *index) | |
363 | { | |
364 | int i; | |
365 | ||
366 | state->clone = 1; | |
367 | for (i = 0; i < index->cache_nr; i++) | |
368 | index->cache[i]->ce_flags &= ~CE_MATCHED; | |
369 | } | |
370 | ||
371 | static void report_collided_checkout(struct index_state *index) | |
372 | { | |
373 | struct string_list list = STRING_LIST_INIT_NODUP; | |
374 | int i; | |
375 | ||
376 | for (i = 0; i < index->cache_nr; i++) { | |
377 | struct cache_entry *ce = index->cache[i]; | |
378 | ||
379 | if (!(ce->ce_flags & CE_MATCHED)) | |
380 | continue; | |
381 | ||
382 | string_list_append(&list, ce->name); | |
383 | ce->ce_flags &= ~CE_MATCHED; | |
384 | } | |
385 | ||
386 | list.cmp = fspathcmp; | |
387 | string_list_sort(&list); | |
388 | ||
389 | if (list.nr) { | |
390 | warning(_("the following paths have collided (e.g. case-sensitive paths\n" | |
391 | "on a case-insensitive filesystem) and only one from the same\n" | |
392 | "colliding group is in the working tree:\n")); | |
393 | ||
394 | for (i = 0; i < list.nr; i++) | |
395 | fprintf(stderr, " '%s'\n", list.items[i].string); | |
396 | } | |
397 | ||
398 | string_list_clear(&list, 0); | |
399 | } | |
400 | ||
b2896d27 JT |
401 | static int must_checkout(const struct cache_entry *ce) |
402 | { | |
403 | return ce->ce_flags & CE_UPDATE; | |
404 | } | |
405 | ||
b0a5a12a EN |
406 | static int check_updates(struct unpack_trees_options *o, |
407 | struct index_state *index) | |
384f1a16 SB |
408 | { |
409 | unsigned cnt = 0; | |
30ac275b | 410 | int errs = 0; |
07f967ad | 411 | struct progress *progress; |
30ac275b | 412 | struct checkout state = CHECKOUT_INIT; |
7531e4b6 | 413 | int i, pc_workers, pc_threshold; |
16da134b | 414 | |
0d1ed596 | 415 | trace_performance_enter(); |
30ac275b SB |
416 | state.force = 1; |
417 | state.quiet = 1; | |
418 | state.refresh_cache = 1; | |
419 | state.istate = index; | |
13e7ed6a | 420 | clone_checkout_metadata(&state.meta, &o->meta, NULL); |
16da134b | 421 | |
26f924d5 EN |
422 | if (!o->update || o->dry_run) { |
423 | remove_marked_cache_entries(index, 0); | |
424 | trace_performance_leave("check_updates"); | |
425 | return 0; | |
426 | } | |
427 | ||
b878579a NTND |
428 | if (o->clone) |
429 | setup_collided_checkout_detection(&state, index); | |
430 | ||
6c34239d | 431 | progress = get_progress(o, index); |
16da134b | 432 | |
22539ec3 MT |
433 | /* Start with clean cache to avoid using any possibly outdated info. */ |
434 | invalidate_lstat_cache(); | |
435 | ||
26f924d5 | 436 | git_attr_set_direction(GIT_ATTR_CHECKOUT); |
33028713 | 437 | |
26f924d5 | 438 | if (should_update_submodules()) |
33028713 BW |
439 | load_gitmodules_file(index, NULL); |
440 | ||
34110cd4 | 441 | for (i = 0; i < index->cache_nr; i++) { |
9c5e6c80 | 442 | const struct cache_entry *ce = index->cache[i]; |
16da134b | 443 | |
e663db2f NTND |
444 | if (ce->ce_flags & CE_WT_REMOVE) { |
445 | display_progress(progress, ++cnt); | |
26f924d5 | 446 | unlink_entry(ce); |
e663db2f | 447 | } |
1fa6ead4 | 448 | } |
26f924d5 | 449 | |
6fdc2057 | 450 | remove_marked_cache_entries(index, 0); |
78478927 | 451 | remove_scheduled_dirs(); |
1fa6ead4 | 452 | |
26f924d5 | 453 | if (should_update_submodules()) |
33028713 | 454 | load_gitmodules_file(index, &state); |
a7bc845a | 455 | |
b2896d27 | 456 | if (has_promisor_remote()) |
c0c578b3 JT |
457 | /* |
458 | * Prefetch the objects that are to be checked out in the loop | |
459 | * below. | |
460 | */ | |
b2896d27 | 461 | prefetch_cache_entries(index, must_checkout); |
04155bda | 462 | |
7531e4b6 MT |
463 | get_parallel_checkout_configs(&pc_workers, &pc_threshold); |
464 | ||
04155bda | 465 | enable_delayed_checkout(&state); |
7531e4b6 MT |
466 | if (pc_workers > 1) |
467 | init_parallel_checkout(); | |
1fa6ead4 LT |
468 | for (i = 0; i < index->cache_nr; i++) { |
469 | struct cache_entry *ce = index->cache[i]; | |
470 | ||
b2896d27 | 471 | if (must_checkout(ce)) { |
1c4d6f46 MT |
472 | size_t last_pc_queue_size = pc_queue_size(); |
473 | ||
7d782416 | 474 | if (ce->ce_flags & CE_WT_REMOVE) |
033abf97 | 475 | BUG("both update and delete flags are set on %s", |
7d782416 | 476 | ce->name); |
7a51ed66 | 477 | ce->ce_flags &= ~CE_UPDATE; |
26f924d5 | 478 | errs |= checkout_entry(ce, &state, NULL, NULL); |
1c4d6f46 MT |
479 | |
480 | if (last_pc_queue_size == pc_queue_size()) | |
481 | display_progress(progress, ++cnt); | |
16da134b JS |
482 | } |
483 | } | |
7531e4b6 | 484 | if (pc_workers > 1) |
1c4d6f46 MT |
485 | errs |= run_parallel_checkout(&state, pc_workers, pc_threshold, |
486 | progress, &cnt); | |
4d4fcc54 | 487 | stop_progress(&progress); |
7a132c62 | 488 | errs |= finish_delayed_checkout(&state, NULL, o->verbose_update); |
26f924d5 | 489 | git_attr_set_direction(GIT_ATTR_CHECKIN); |
b878579a NTND |
490 | |
491 | if (o->clone) | |
492 | report_collided_checkout(index); | |
493 | ||
0d1ed596 | 494 | trace_performance_leave("check_updates"); |
c4758d3c | 495 | return errs != 0; |
16da134b JS |
496 | } |
497 | ||
eb9ae4b5 RS |
498 | static int verify_uptodate_sparse(const struct cache_entry *ce, |
499 | struct unpack_trees_options *o); | |
500 | static int verify_absent_sparse(const struct cache_entry *ce, | |
501 | enum unpack_trees_error_types, | |
502 | struct unpack_trees_options *o); | |
e800ec9d | 503 | |
a5c446f1 NTND |
504 | static int apply_sparse_checkout(struct index_state *istate, |
505 | struct cache_entry *ce, | |
506 | struct unpack_trees_options *o) | |
e800ec9d NTND |
507 | { |
508 | int was_skip_worktree = ce_skip_worktree(ce); | |
509 | ||
2431afbf | 510 | if (ce->ce_flags & CE_NEW_SKIP_WORKTREE) |
e800ec9d NTND |
511 | ce->ce_flags |= CE_SKIP_WORKTREE; |
512 | else | |
513 | ce->ce_flags &= ~CE_SKIP_WORKTREE; | |
078a58e8 NTND |
514 | if (was_skip_worktree != ce_skip_worktree(ce)) { |
515 | ce->ce_flags |= CE_UPDATE_IN_BASE; | |
883e248b | 516 | mark_fsmonitor_invalid(istate, ce); |
a5c446f1 | 517 | istate->cache_changed |= CE_ENTRY_CHANGED; |
078a58e8 | 518 | } |
e800ec9d NTND |
519 | |
520 | /* | |
eec3fc03 NTND |
521 | * if (!was_skip_worktree && !ce_skip_worktree()) { |
522 | * This is perfectly normal. Move on; | |
523 | * } | |
e800ec9d | 524 | */ |
eec3fc03 NTND |
525 | |
526 | /* | |
527 | * Merge strategies may set CE_UPDATE|CE_REMOVE outside checkout | |
528 | * area as a result of ce_skip_worktree() shortcuts in | |
700e66d6 NTND |
529 | * verify_absent() and verify_uptodate(). |
530 | * Make sure they don't modify worktree if they are already | |
531 | * outside checkout area | |
eec3fc03 | 532 | */ |
700e66d6 NTND |
533 | if (was_skip_worktree && ce_skip_worktree(ce)) { |
534 | ce->ce_flags &= ~CE_UPDATE; | |
535 | ||
536 | /* | |
537 | * By default, when CE_REMOVE is on, CE_WT_REMOVE is also | |
538 | * on to get that file removed from both index and worktree. | |
539 | * If that file is already outside worktree area, don't | |
540 | * bother remove it. | |
541 | */ | |
542 | if (ce->ce_flags & CE_REMOVE) | |
543 | ce->ce_flags &= ~CE_WT_REMOVE; | |
544 | } | |
e800ec9d NTND |
545 | |
546 | if (!was_skip_worktree && ce_skip_worktree(ce)) { | |
547 | /* | |
548 | * If CE_UPDATE is set, verify_uptodate() must be called already | |
549 | * also stat info may have lost after merged_entry() so calling | |
550 | * verify_uptodate() again may fail | |
551 | */ | |
3cc7c504 EN |
552 | if (!(ce->ce_flags & CE_UPDATE) && |
553 | verify_uptodate_sparse(ce, o)) { | |
554 | ce->ce_flags &= ~CE_SKIP_WORKTREE; | |
e800ec9d | 555 | return -1; |
3cc7c504 | 556 | } |
e800ec9d | 557 | ce->ce_flags |= CE_WT_REMOVE; |
7d782416 | 558 | ce->ce_flags &= ~CE_UPDATE; |
e800ec9d NTND |
559 | } |
560 | if (was_skip_worktree && !ce_skip_worktree(ce)) { | |
1ac83f42 | 561 | if (verify_absent_sparse(ce, WARNING_SPARSE_ORPHANED_NOT_OVERWRITTEN, o)) |
e800ec9d NTND |
562 | return -1; |
563 | ce->ce_flags |= CE_UPDATE; | |
564 | } | |
565 | return 0; | |
566 | } | |
567 | ||
ebb568b9 EN |
568 | static int warn_conflicted_path(struct index_state *istate, |
569 | int i, | |
570 | struct unpack_trees_options *o) | |
571 | { | |
572 | char *conflicting_path = istate->cache[i]->name; | |
573 | int count = 0; | |
574 | ||
575 | add_rejected_path(o, WARNING_SPARSE_UNMERGED_FILE, conflicting_path); | |
576 | ||
0eeb3be4 DS |
577 | /* Find out how many higher stage entries are at same path */ |
578 | while ((++count) + i < istate->cache_nr && | |
579 | !strcmp(conflicting_path, istate->cache[count + i]->name)) | |
580 | ; /* do nothing */ | |
581 | ||
ebb568b9 EN |
582 | return count; |
583 | } | |
584 | ||
5828e835 RS |
585 | static inline int call_unpack_fn(const struct cache_entry * const *src, |
586 | struct unpack_trees_options *o) | |
01904572 | 587 | { |
34110cd4 LT |
588 | int ret = o->fn(src, o); |
589 | if (ret > 0) | |
01904572 | 590 | ret = 0; |
01904572 LT |
591 | return ret; |
592 | } | |
593 | ||
da165f47 JH |
594 | static void mark_ce_used(struct cache_entry *ce, struct unpack_trees_options *o) |
595 | { | |
596 | ce->ce_flags |= CE_UNPACKED; | |
597 | ||
17a1bb57 DS |
598 | /* |
599 | * If this is a sparse directory, don't advance cache_bottom. | |
600 | * That will be advanced later using the cache-tree data. | |
601 | */ | |
602 | if (S_ISSPARSEDIR(ce->ce_mode)) | |
603 | return; | |
604 | ||
da165f47 JH |
605 | if (o->cache_bottom < o->src_index->cache_nr && |
606 | o->src_index->cache[o->cache_bottom] == ce) { | |
607 | int bottom = o->cache_bottom; | |
608 | while (bottom < o->src_index->cache_nr && | |
609 | o->src_index->cache[bottom]->ce_flags & CE_UNPACKED) | |
610 | bottom++; | |
611 | o->cache_bottom = bottom; | |
612 | } | |
613 | } | |
614 | ||
615 | static void mark_all_ce_unused(struct index_state *index) | |
616 | { | |
617 | int i; | |
618 | for (i = 0; i < index->cache_nr; i++) | |
2431afbf | 619 | index->cache[i]->ce_flags &= ~(CE_UNPACKED | CE_ADDED | CE_NEW_SKIP_WORKTREE); |
da165f47 JH |
620 | } |
621 | ||
eb9ae4b5 | 622 | static int locate_in_src_index(const struct cache_entry *ce, |
da165f47 JH |
623 | struct unpack_trees_options *o) |
624 | { | |
625 | struct index_state *index = o->src_index; | |
626 | int len = ce_namelen(ce); | |
627 | int pos = index_name_pos(index, ce->name, len); | |
628 | if (pos < 0) | |
629 | pos = -1 - pos; | |
630 | return pos; | |
631 | } | |
632 | ||
633 | /* | |
634 | * We call unpack_index_entry() with an unmerged cache entry | |
635 | * only in diff-index, and it wants a single callback. Skip | |
636 | * the other unmerged entry with the same name. | |
637 | */ | |
638 | static void mark_ce_used_same_name(struct cache_entry *ce, | |
639 | struct unpack_trees_options *o) | |
640 | { | |
641 | struct index_state *index = o->src_index; | |
642 | int len = ce_namelen(ce); | |
643 | int pos; | |
644 | ||
645 | for (pos = locate_in_src_index(ce, o); pos < index->cache_nr; pos++) { | |
646 | struct cache_entry *next = index->cache[pos]; | |
647 | if (len != ce_namelen(next) || | |
648 | memcmp(ce->name, next->name, len)) | |
649 | break; | |
650 | mark_ce_used(next, o); | |
651 | } | |
652 | } | |
653 | ||
f2a454e0 | 654 | static struct cache_entry *next_cache_entry(struct unpack_trees_options *o, int *hint) |
da165f47 JH |
655 | { |
656 | const struct index_state *index = o->src_index; | |
657 | int pos = o->cache_bottom; | |
658 | ||
f2a454e0 VD |
659 | if (*hint > pos) |
660 | pos = *hint; | |
661 | ||
da165f47 JH |
662 | while (pos < index->cache_nr) { |
663 | struct cache_entry *ce = index->cache[pos]; | |
f2a454e0 VD |
664 | if (!(ce->ce_flags & CE_UNPACKED)) { |
665 | *hint = pos + 1; | |
da165f47 | 666 | return ce; |
f2a454e0 | 667 | } |
da165f47 JH |
668 | pos++; |
669 | } | |
f2a454e0 VD |
670 | |
671 | *hint = pos; | |
da165f47 JH |
672 | return NULL; |
673 | } | |
674 | ||
9c5e6c80 | 675 | static void add_same_unmerged(const struct cache_entry *ce, |
da165f47 JH |
676 | struct unpack_trees_options *o) |
677 | { | |
678 | struct index_state *index = o->src_index; | |
679 | int len = ce_namelen(ce); | |
680 | int pos = index_name_pos(index, ce->name, len); | |
681 | ||
682 | if (0 <= pos) | |
683 | die("programming error in a caller of mark_ce_used_same_name"); | |
684 | for (pos = -pos - 1; pos < index->cache_nr; pos++) { | |
685 | struct cache_entry *next = index->cache[pos]; | |
686 | if (len != ce_namelen(next) || | |
687 | memcmp(ce->name, next->name, len)) | |
688 | break; | |
689 | add_entry(o, next, 0, 0); | |
690 | mark_ce_used(next, o); | |
691 | } | |
692 | } | |
693 | ||
694 | static int unpack_index_entry(struct cache_entry *ce, | |
695 | struct unpack_trees_options *o) | |
01904572 | 696 | { |
5828e835 | 697 | const struct cache_entry *src[MAX_UNPACK_TREES + 1] = { NULL, }; |
da165f47 | 698 | int ret; |
34110cd4 | 699 | |
66dbfd55 GV |
700 | src[0] = ce; |
701 | ||
da165f47 | 702 | mark_ce_used(ce, o); |
01904572 LT |
703 | if (ce_stage(ce)) { |
704 | if (o->skip_unmerged) { | |
34110cd4 LT |
705 | add_entry(o, ce, 0, 0); |
706 | return 0; | |
01904572 | 707 | } |
01904572 | 708 | } |
da165f47 JH |
709 | ret = call_unpack_fn(src, o); |
710 | if (ce_stage(ce)) | |
711 | mark_ce_used_same_name(ce, o); | |
712 | return ret; | |
01904572 LT |
713 | } |
714 | ||
90553847 | 715 | static int find_cache_pos(struct traverse_info *, const char *p, size_t len); |
730f7284 JH |
716 | |
717 | static void restore_cache_bottom(struct traverse_info *info, int bottom) | |
718 | { | |
719 | struct unpack_trees_options *o = info->data; | |
720 | ||
721 | if (o->diff_index_cached) | |
722 | return; | |
723 | o->cache_bottom = bottom; | |
724 | } | |
725 | ||
726 | static int switch_cache_bottom(struct traverse_info *info) | |
727 | { | |
728 | struct unpack_trees_options *o = info->data; | |
729 | int ret, pos; | |
730 | ||
731 | if (o->diff_index_cached) | |
732 | return 0; | |
733 | ret = o->cache_bottom; | |
90553847 | 734 | pos = find_cache_pos(info->prev, info->name, info->namelen); |
730f7284 JH |
735 | |
736 | if (pos < -1) | |
737 | o->cache_bottom = -2 - pos; | |
738 | else if (pos < 0) | |
739 | o->cache_bottom = o->src_index->cache_nr; | |
740 | return ret; | |
01904572 LT |
741 | } |
742 | ||
d12a8cf0 JH |
743 | static inline int are_same_oid(struct name_entry *name_j, struct name_entry *name_k) |
744 | { | |
ea82b2a0 | 745 | return !is_null_oid(&name_j->oid) && !is_null_oid(&name_k->oid) && oideq(&name_j->oid, &name_k->oid); |
d12a8cf0 JH |
746 | } |
747 | ||
b4da3738 NTND |
748 | static int all_trees_same_as_cache_tree(int n, unsigned long dirmask, |
749 | struct name_entry *names, | |
750 | struct traverse_info *info) | |
751 | { | |
752 | struct unpack_trees_options *o = info->data; | |
753 | int i; | |
754 | ||
755 | if (!o->merge || dirmask != ((1 << n) - 1)) | |
756 | return 0; | |
757 | ||
758 | for (i = 1; i < n; i++) | |
759 | if (!are_same_oid(names, names + i)) | |
760 | return 0; | |
761 | ||
762 | return cache_tree_matches_traversal(o->src_index->cache_tree, names, info); | |
763 | } | |
764 | ||
765 | static int index_pos_by_traverse_info(struct name_entry *names, | |
766 | struct traverse_info *info) | |
767 | { | |
768 | struct unpack_trees_options *o = info->data; | |
c43ab062 | 769 | struct strbuf name = STRBUF_INIT; |
b4da3738 NTND |
770 | int pos; |
771 | ||
c43ab062 JK |
772 | strbuf_make_traverse_path(&name, info, names->path, names->pathlen); |
773 | strbuf_addch(&name, '/'); | |
774 | pos = index_name_pos(o->src_index, name.buf, name.len); | |
13e13312 DS |
775 | if (pos >= 0) { |
776 | if (!o->src_index->sparse_index || | |
777 | !(o->src_index->cache[pos]->ce_flags & CE_SKIP_WORKTREE)) | |
778 | BUG("This is a directory and should not exist in index"); | |
779 | } else { | |
780 | pos = -pos - 1; | |
781 | } | |
573117df ES |
782 | if (pos >= o->src_index->cache_nr || |
783 | !starts_with(o->src_index->cache[pos]->name, name.buf) || | |
c43ab062 | 784 | (pos > 0 && starts_with(o->src_index->cache[pos-1]->name, name.buf))) |
573117df ES |
785 | BUG("pos %d doesn't point to the first entry of %s in index", |
786 | pos, name.buf); | |
c43ab062 | 787 | strbuf_release(&name); |
b4da3738 NTND |
788 | return pos; |
789 | } | |
790 | ||
791 | /* | |
792 | * Fast path if we detect that all trees are the same as cache-tree at this | |
5f4436a7 NTND |
793 | * path. We'll walk these trees in an iterative loop using cache-tree/index |
794 | * instead of ODB since we already know what these trees contain. | |
b4da3738 NTND |
795 | */ |
796 | static int traverse_by_cache_tree(int pos, int nr_entries, int nr_names, | |
b4da3738 NTND |
797 | struct traverse_info *info) |
798 | { | |
799 | struct cache_entry *src[MAX_UNPACK_TREES + 1] = { NULL, }; | |
800 | struct unpack_trees_options *o = info->data; | |
f1e11c65 NTND |
801 | struct cache_entry *tree_ce = NULL; |
802 | int ce_len = 0; | |
b4da3738 NTND |
803 | int i, d; |
804 | ||
805 | if (!o->merge) | |
806 | BUG("We need cache-tree to do this optimization"); | |
807 | ||
808 | /* | |
bd6a3fd7 | 809 | * Do what unpack_callback() and unpack_single_entry() normally |
b4da3738 NTND |
810 | * do. But we walk all paths in an iterative loop instead. |
811 | * | |
812 | * D/F conflicts and higher stage entries are not a concern | |
813 | * because cache-tree would be invalidated and we would never | |
814 | * get here in the first place. | |
815 | */ | |
816 | for (i = 0; i < nr_entries; i++) { | |
f1e11c65 | 817 | int new_ce_len, len, rc; |
b4da3738 NTND |
818 | |
819 | src[0] = o->src_index->cache[pos + i]; | |
820 | ||
821 | len = ce_namelen(src[0]); | |
f1e11c65 NTND |
822 | new_ce_len = cache_entry_size(len); |
823 | ||
824 | if (new_ce_len > ce_len) { | |
825 | new_ce_len <<= 1; | |
826 | tree_ce = xrealloc(tree_ce, new_ce_len); | |
827 | memset(tree_ce, 0, new_ce_len); | |
828 | ce_len = new_ce_len; | |
829 | ||
830 | tree_ce->ce_flags = create_ce_flags(0); | |
831 | ||
832 | for (d = 1; d <= nr_names; d++) | |
833 | src[d] = tree_ce; | |
834 | } | |
b4da3738 NTND |
835 | |
836 | tree_ce->ce_mode = src[0]->ce_mode; | |
b4da3738 NTND |
837 | tree_ce->ce_namelen = len; |
838 | oidcpy(&tree_ce->oid, &src[0]->oid); | |
839 | memcpy(tree_ce->name, src[0]->name, len + 1); | |
840 | ||
b4da3738 | 841 | rc = call_unpack_fn((const struct cache_entry * const *)src, o); |
f1e11c65 NTND |
842 | if (rc < 0) { |
843 | free(tree_ce); | |
b4da3738 | 844 | return rc; |
f1e11c65 | 845 | } |
b4da3738 NTND |
846 | |
847 | mark_ce_used(src[0], o); | |
848 | } | |
f1e11c65 | 849 | free(tree_ce); |
b4da3738 NTND |
850 | if (o->debug_unpack) |
851 | printf("Unpacked %d entries from %s to %s using cache-tree\n", | |
852 | nr_entries, | |
853 | o->src_index->cache[pos]->name, | |
854 | o->src_index->cache[pos + nr_entries - 1]->name); | |
855 | return 0; | |
856 | } | |
857 | ||
84563a62 JH |
858 | static int traverse_trees_recursive(int n, unsigned long dirmask, |
859 | unsigned long df_conflicts, | |
860 | struct name_entry *names, | |
861 | struct traverse_info *info) | |
16da134b | 862 | { |
67022e02 | 863 | struct unpack_trees_options *o = info->data; |
730f7284 | 864 | int i, ret, bottom; |
d12a8cf0 | 865 | int nr_buf = 0; |
ca885a4f | 866 | struct tree_desc t[MAX_UNPACK_TREES]; |
1ce584b0 | 867 | void *buf[MAX_UNPACK_TREES]; |
01904572 LT |
868 | struct traverse_info newinfo; |
869 | struct name_entry *p; | |
b4da3738 NTND |
870 | int nr_entries; |
871 | ||
872 | nr_entries = all_trees_same_as_cache_tree(n, dirmask, names, info); | |
873 | if (nr_entries > 0) { | |
b4da3738 NTND |
874 | int pos = index_pos_by_traverse_info(names, info); |
875 | ||
876 | if (!o->merge || df_conflicts) | |
877 | BUG("Wrong condition to get here buddy"); | |
878 | ||
879 | /* | |
880 | * All entries up to 'pos' must have been processed | |
881 | * (i.e. marked CE_UNPACKED) at this point. But to be safe, | |
882 | * save and restore cache_bottom anyway to not miss | |
883 | * unprocessed entries before 'pos'. | |
884 | */ | |
885 | bottom = o->cache_bottom; | |
66429698 | 886 | ret = traverse_by_cache_tree(pos, nr_entries, n, info); |
b4da3738 NTND |
887 | o->cache_bottom = bottom; |
888 | return ret; | |
889 | } | |
01904572 LT |
890 | |
891 | p = names; | |
892 | while (!p->mode) | |
893 | p++; | |
894 | ||
895 | newinfo = *info; | |
896 | newinfo.prev = info; | |
40e37256 | 897 | newinfo.pathspec = info->pathspec; |
90553847 JK |
898 | newinfo.name = p->path; |
899 | newinfo.namelen = p->pathlen; | |
900 | newinfo.mode = p->mode; | |
37806080 | 901 | newinfo.pathlen = st_add3(newinfo.pathlen, tree_entry_len(p), 1); |
603d2498 | 902 | newinfo.df_conflicts |= df_conflicts; |
01904572 | 903 | |
d12a8cf0 JH |
904 | /* |
905 | * Fetch the tree from the ODB for each peer directory in the | |
906 | * n commits. | |
907 | * | |
908 | * For 2- and 3-way traversals, we try to avoid hitting the | |
909 | * ODB twice for the same OID. This should yield a nice speed | |
910 | * up in checkouts and merges when the commits are similar. | |
911 | * | |
912 | * We don't bother doing the full O(n^2) search for larger n, | |
913 | * because wider traversals don't happen that often and we | |
914 | * avoid the search setup. | |
915 | * | |
916 | * When 2 peer OIDs are the same, we just copy the tree | |
917 | * descriptor data. This implicitly borrows the buffer | |
918 | * data from the earlier cell. | |
919 | */ | |
01904572 | 920 | for (i = 0; i < n; i++, dirmask >>= 1) { |
d12a8cf0 JH |
921 | if (i > 0 && are_same_oid(&names[i], &names[i - 1])) |
922 | t[i] = t[i - 1]; | |
923 | else if (i > 1 && are_same_oid(&names[i], &names[i - 2])) | |
924 | t[i] = t[i - 2]; | |
925 | else { | |
5c377d3d | 926 | const struct object_id *oid = NULL; |
d12a8cf0 | 927 | if (dirmask & 1) |
ea82b2a0 | 928 | oid = &names[i].oid; |
5e575807 | 929 | buf[nr_buf++] = fill_tree_descriptor(the_repository, t + i, oid); |
d12a8cf0 | 930 | } |
01904572 | 931 | } |
730f7284 JH |
932 | |
933 | bottom = switch_cache_bottom(&newinfo); | |
67022e02 | 934 | ret = traverse_trees(o->src_index, n, t, &newinfo); |
730f7284 | 935 | restore_cache_bottom(&newinfo, bottom); |
1ce584b0 | 936 | |
d12a8cf0 | 937 | for (i = 0; i < nr_buf; i++) |
1ce584b0 JN |
938 | free(buf[i]); |
939 | ||
730f7284 | 940 | return ret; |
01904572 LT |
941 | } |
942 | ||
943 | /* | |
944 | * Compare the traverse-path to the cache entry without actually | |
945 | * having to generate the textual representation of the traverse | |
946 | * path. | |
947 | * | |
948 | * NOTE! This *only* compares up to the size of the traverse path | |
949 | * itself - the caller needs to do the final check for the cache | |
950 | * entry having more data at the end! | |
951 | */ | |
90553847 JK |
952 | static int do_compare_entry_piecewise(const struct cache_entry *ce, |
953 | const struct traverse_info *info, | |
954 | const char *name, size_t namelen, | |
955 | unsigned mode) | |
01904572 | 956 | { |
90553847 | 957 | int pathlen, ce_len; |
01904572 LT |
958 | const char *ce_name; |
959 | ||
960 | if (info->prev) { | |
d9c2bd56 | 961 | int cmp = do_compare_entry_piecewise(ce, info->prev, |
90553847 JK |
962 | info->name, info->namelen, |
963 | info->mode); | |
01904572 LT |
964 | if (cmp) |
965 | return cmp; | |
966 | } | |
967 | pathlen = info->pathlen; | |
968 | ce_len = ce_namelen(ce); | |
969 | ||
970 | /* If ce_len < pathlen then we must have previously hit "name == directory" entry */ | |
971 | if (ce_len < pathlen) | |
972 | return -1; | |
973 | ||
974 | ce_len -= pathlen; | |
975 | ce_name = ce->name + pathlen; | |
976 | ||
90553847 | 977 | return df_name_compare(ce_name, ce_len, S_IFREG, name, namelen, mode); |
01904572 LT |
978 | } |
979 | ||
d9c2bd56 DT |
980 | static int do_compare_entry(const struct cache_entry *ce, |
981 | const struct traverse_info *info, | |
90553847 JK |
982 | const char *name, size_t namelen, |
983 | unsigned mode) | |
d9c2bd56 | 984 | { |
90553847 | 985 | int pathlen, ce_len; |
d9c2bd56 DT |
986 | const char *ce_name; |
987 | int cmp; | |
cd807a5c | 988 | unsigned ce_mode; |
d9c2bd56 DT |
989 | |
990 | /* | |
991 | * If we have not precomputed the traverse path, it is quicker | |
992 | * to avoid doing so. But if we have precomputed it, | |
993 | * it is quicker to use the precomputed version. | |
994 | */ | |
995 | if (!info->traverse_path) | |
90553847 | 996 | return do_compare_entry_piecewise(ce, info, name, namelen, mode); |
d9c2bd56 DT |
997 | |
998 | cmp = strncmp(ce->name, info->traverse_path, info->pathlen); | |
999 | if (cmp) | |
1000 | return cmp; | |
1001 | ||
1002 | pathlen = info->pathlen; | |
1003 | ce_len = ce_namelen(ce); | |
1004 | ||
1005 | if (ce_len < pathlen) | |
1006 | return -1; | |
1007 | ||
1008 | ce_len -= pathlen; | |
1009 | ce_name = ce->name + pathlen; | |
1010 | ||
cd807a5c DS |
1011 | ce_mode = S_ISSPARSEDIR(ce->ce_mode) ? S_IFDIR : S_IFREG; |
1012 | return df_name_compare(ce_name, ce_len, ce_mode, name, namelen, mode); | |
d9c2bd56 DT |
1013 | } |
1014 | ||
01904572 LT |
1015 | static int compare_entry(const struct cache_entry *ce, const struct traverse_info *info, const struct name_entry *n) |
1016 | { | |
90553847 | 1017 | int cmp = do_compare_entry(ce, info, n->path, n->pathlen, n->mode); |
01904572 LT |
1018 | if (cmp) |
1019 | return cmp; | |
1020 | ||
cd807a5c DS |
1021 | /* |
1022 | * At this point, we know that we have a prefix match. If ce | |
1023 | * is a sparse directory, then allow an exact match. This only | |
1024 | * works when the input name is a directory, since ce->name | |
1025 | * ends in a directory separator. | |
1026 | */ | |
1027 | if (S_ISSPARSEDIR(ce->ce_mode) && | |
1028 | ce->ce_namelen == traverse_path_len(info, tree_entry_len(n)) + 1) | |
1029 | return 0; | |
1030 | ||
01904572 LT |
1031 | /* |
1032 | * Even if the beginning compared identically, the ce should | |
1033 | * compare as bigger than a directory leading up to it! | |
1034 | */ | |
b3b3cbcb | 1035 | return ce_namelen(ce) > traverse_path_len(info, tree_entry_len(n)); |
01904572 LT |
1036 | } |
1037 | ||
da165f47 JH |
1038 | static int ce_in_traverse_path(const struct cache_entry *ce, |
1039 | const struct traverse_info *info) | |
1040 | { | |
1041 | if (!info->prev) | |
1042 | return 1; | |
90553847 JK |
1043 | if (do_compare_entry(ce, info->prev, |
1044 | info->name, info->namelen, info->mode)) | |
da165f47 JH |
1045 | return 0; |
1046 | /* | |
1047 | * If ce (blob) is the same name as the path (which is a tree | |
1048 | * we will be descending into), it won't be inside it. | |
1049 | */ | |
1050 | return (info->pathlen < ce_namelen(ce)); | |
1051 | } | |
1052 | ||
a849735b JM |
1053 | static struct cache_entry *create_ce_entry(const struct traverse_info *info, |
1054 | const struct name_entry *n, | |
1055 | int stage, | |
1056 | struct index_state *istate, | |
523506df DS |
1057 | int is_transient, |
1058 | int is_sparse_directory) | |
01904572 | 1059 | { |
b3b3cbcb | 1060 | size_t len = traverse_path_len(info, tree_entry_len(n)); |
523506df | 1061 | size_t alloc_len = is_sparse_directory ? len + 1 : len; |
a849735b JM |
1062 | struct cache_entry *ce = |
1063 | is_transient ? | |
523506df DS |
1064 | make_empty_transient_cache_entry(alloc_len, NULL) : |
1065 | make_empty_cache_entry(istate, alloc_len); | |
01904572 LT |
1066 | |
1067 | ce->ce_mode = create_ce_mode(n->mode); | |
b60e188c TG |
1068 | ce->ce_flags = create_ce_flags(stage); |
1069 | ce->ce_namelen = len; | |
ea82b2a0 | 1070 | oidcpy(&ce->oid, &n->oid); |
5aa02f98 JK |
1071 | /* len+1 because the cache_entry allocates space for NUL */ |
1072 | make_traverse_path(ce->name, len + 1, info, n->path, n->pathlen); | |
01904572 | 1073 | |
523506df DS |
1074 | if (is_sparse_directory) { |
1075 | ce->name[len] = '/'; | |
1076 | ce->name[len + 1] = '\0'; | |
1077 | ce->ce_namelen++; | |
1078 | ce->ce_flags |= CE_SKIP_WORKTREE; | |
1079 | } | |
1080 | ||
01904572 LT |
1081 | return ce; |
1082 | } | |
1083 | ||
b4da3738 NTND |
1084 | /* |
1085 | * Note that traverse_by_cache_tree() duplicates some logic in this function | |
1086 | * without actually calling it. If you change the logic here you may need to | |
1087 | * check and change there as well. | |
1088 | */ | |
bd6a3fd7 DS |
1089 | static int unpack_single_entry(int n, unsigned long mask, |
1090 | unsigned long dirmask, | |
1091 | struct cache_entry **src, | |
1092 | const struct name_entry *names, | |
1093 | const struct traverse_info *info) | |
01904572 LT |
1094 | { |
1095 | int i; | |
1096 | struct unpack_trees_options *o = info->data; | |
603d2498 | 1097 | unsigned long conflicts = info->df_conflicts | dirmask; |
01904572 | 1098 | |
01904572 LT |
1099 | if (mask == dirmask && !src[0]) |
1100 | return 0; | |
1101 | ||
523506df DS |
1102 | /* |
1103 | * When we have a sparse directory entry for src[0], | |
1104 | * then this isn't necessarily a directory-file conflict. | |
1105 | */ | |
1106 | if (mask == dirmask && src[0] && | |
1107 | S_ISSPARSEDIR(src[0]->ce_mode)) | |
1108 | conflicts = 0; | |
1109 | ||
01904572 LT |
1110 | /* |
1111 | * Ok, we've filled in up to any potential index entry in src[0], | |
1112 | * now do the rest. | |
1113 | */ | |
1114 | for (i = 0; i < n; i++) { | |
1115 | int stage; | |
1116 | unsigned int bit = 1ul << i; | |
1117 | if (conflicts & bit) { | |
1118 | src[i + o->merge] = o->df_conflict_entry; | |
1119 | continue; | |
1120 | } | |
1121 | if (!(mask & bit)) | |
1122 | continue; | |
1123 | if (!o->merge) | |
1124 | stage = 0; | |
1125 | else if (i + 1 < o->head_idx) | |
1126 | stage = 1; | |
1127 | else if (i + 1 > o->head_idx) | |
1128 | stage = 3; | |
1129 | else | |
1130 | stage = 2; | |
a849735b JM |
1131 | |
1132 | /* | |
1133 | * If the merge bit is set, then the cache entries are | |
1134 | * discarded in the following block. In this case, | |
1135 | * construct "transient" cache_entries, as they are | |
1136 | * not stored in the index. otherwise construct the | |
1137 | * cache entry from the index aware logic. | |
1138 | */ | |
523506df DS |
1139 | src[i + o->merge] = create_ce_entry(info, names + i, stage, |
1140 | &o->result, o->merge, | |
1141 | bit & dirmask); | |
01904572 LT |
1142 | } |
1143 | ||
5d80ef5a RS |
1144 | if (o->merge) { |
1145 | int rc = call_unpack_fn((const struct cache_entry * const *)src, | |
1146 | o); | |
1147 | for (i = 0; i < n; i++) { | |
1148 | struct cache_entry *ce = src[i + o->merge]; | |
1149 | if (ce != o->df_conflict_entry) | |
a849735b | 1150 | discard_cache_entry(ce); |
5d80ef5a RS |
1151 | } |
1152 | return rc; | |
1153 | } | |
01904572 | 1154 | |
01904572 | 1155 | for (i = 0; i < n; i++) |
aab3b9a1 | 1156 | if (src[i] && src[i] != o->df_conflict_entry) |
46169180 JK |
1157 | if (do_add_entry(o, src[i], 0, 0)) |
1158 | return -1; | |
1159 | ||
01904572 LT |
1160 | return 0; |
1161 | } | |
1162 | ||
353c5eeb JH |
1163 | static int unpack_failed(struct unpack_trees_options *o, const char *message) |
1164 | { | |
1165 | discard_index(&o->result); | |
b165fac8 | 1166 | if (!o->quiet && !o->exiting_early) { |
353c5eeb JH |
1167 | if (message) |
1168 | return error("%s", message); | |
1169 | return -1; | |
1170 | } | |
1171 | return -1; | |
1172 | } | |
1173 | ||
730f7284 JH |
1174 | /* |
1175 | * The tree traversal is looking at name p. If we have a matching entry, | |
1176 | * return it. If name p is a directory in the index, do not return | |
1177 | * anything, as we will want to match it when the traversal descends into | |
1178 | * the directory. | |
1179 | */ | |
1180 | static int find_cache_pos(struct traverse_info *info, | |
90553847 | 1181 | const char *p, size_t p_len) |
730f7284 JH |
1182 | { |
1183 | int pos; | |
1184 | struct unpack_trees_options *o = info->data; | |
1185 | struct index_state *index = o->src_index; | |
1186 | int pfxlen = info->pathlen; | |
730f7284 JH |
1187 | |
1188 | for (pos = o->cache_bottom; pos < index->cache_nr; pos++) { | |
9c5e6c80 | 1189 | const struct cache_entry *ce = index->cache[pos]; |
730f7284 JH |
1190 | const char *ce_name, *ce_slash; |
1191 | int cmp, ce_len; | |
1192 | ||
e53e6b44 BD |
1193 | if (ce->ce_flags & CE_UNPACKED) { |
1194 | /* | |
1195 | * cache_bottom entry is already unpacked, so | |
1196 | * we can never match it; don't check it | |
1197 | * again. | |
1198 | */ | |
1199 | if (pos == o->cache_bottom) | |
1200 | ++o->cache_bottom; | |
730f7284 | 1201 | continue; |
e53e6b44 | 1202 | } |
a6720955 DT |
1203 | if (!ce_in_traverse_path(ce, info)) { |
1204 | /* | |
1205 | * Check if we can skip future cache checks | |
1206 | * (because we're already past all possible | |
1207 | * entries in the traverse path). | |
1208 | */ | |
1209 | if (info->traverse_path) { | |
1210 | if (strncmp(ce->name, info->traverse_path, | |
1211 | info->pathlen) > 0) | |
1212 | break; | |
1213 | } | |
730f7284 | 1214 | continue; |
a6720955 | 1215 | } |
730f7284 JH |
1216 | ce_name = ce->name + pfxlen; |
1217 | ce_slash = strchr(ce_name, '/'); | |
1218 | if (ce_slash) | |
1219 | ce_len = ce_slash - ce_name; | |
1220 | else | |
1221 | ce_len = ce_namelen(ce) - pfxlen; | |
90553847 | 1222 | cmp = name_compare(p, p_len, ce_name, ce_len); |
730f7284 JH |
1223 | /* |
1224 | * Exact match; if we have a directory we need to | |
1225 | * delay returning it. | |
1226 | */ | |
1227 | if (!cmp) | |
1228 | return ce_slash ? -2 - pos : pos; | |
1229 | if (0 < cmp) | |
1230 | continue; /* keep looking */ | |
1231 | /* | |
1232 | * ce_name sorts after p->path; could it be that we | |
1233 | * have files under p->path directory in the index? | |
1234 | * E.g. ce_name == "t-i", and p->path == "t"; we may | |
1235 | * have "t/a" in the index. | |
1236 | */ | |
90553847 | 1237 | if (p_len < ce_len && !memcmp(ce_name, p, p_len) && |
730f7284 JH |
1238 | ce_name[p_len] < '/') |
1239 | continue; /* keep looking */ | |
1240 | break; | |
1241 | } | |
1242 | return -1; | |
1243 | } | |
1244 | ||
523506df DS |
1245 | /* |
1246 | * Given a sparse directory entry 'ce', compare ce->name to | |
8c5de0d2 DS |
1247 | * info->traverse_path + p->path + '/' if info->traverse_path |
1248 | * is non-empty. | |
1249 | * | |
523506df DS |
1250 | * Compare ce->name to p->path + '/' otherwise. Note that |
1251 | * ce->name must end in a trailing '/' because it is a sparse | |
1252 | * directory entry. | |
1253 | */ | |
1254 | static int sparse_dir_matches_path(const struct cache_entry *ce, | |
1255 | struct traverse_info *info, | |
1256 | const struct name_entry *p) | |
1257 | { | |
1258 | assert(S_ISSPARSEDIR(ce->ce_mode)); | |
1259 | assert(ce->name[ce->ce_namelen - 1] == '/'); | |
1260 | ||
8c5de0d2 DS |
1261 | if (info->pathlen) |
1262 | return ce->ce_namelen == info->pathlen + p->pathlen + 1 && | |
1263 | ce->name[info->pathlen - 1] == '/' && | |
1264 | !strncmp(ce->name, info->traverse_path, info->pathlen) && | |
1265 | !strncmp(ce->name + info->pathlen, p->path, p->pathlen); | |
523506df DS |
1266 | return ce->ce_namelen == p->pathlen + 1 && |
1267 | !strncmp(ce->name, p->path, p->pathlen); | |
1268 | } | |
1269 | ||
730f7284 JH |
1270 | static struct cache_entry *find_cache_entry(struct traverse_info *info, |
1271 | const struct name_entry *p) | |
1272 | { | |
72d84ea3 | 1273 | const char *path; |
90553847 | 1274 | int pos = find_cache_pos(info, p->path, p->pathlen); |
730f7284 JH |
1275 | struct unpack_trees_options *o = info->data; |
1276 | ||
1277 | if (0 <= pos) | |
1278 | return o->src_index->cache[pos]; | |
523506df DS |
1279 | |
1280 | /* | |
1281 | * Check for a sparse-directory entry named "path/". | |
1282 | * Due to the input p->path not having a trailing | |
1283 | * slash, the negative 'pos' value overshoots the | |
1284 | * expected position, hence "-2" instead of "-1". | |
1285 | */ | |
1286 | pos = -pos - 2; | |
1287 | ||
1288 | if (pos < 0 || pos >= o->src_index->cache_nr) | |
730f7284 | 1289 | return NULL; |
523506df DS |
1290 | |
1291 | /* | |
1292 | * Due to lexicographic sorting and sparse directory | |
1293 | * entries ending with a trailing slash, our path as a | |
1294 | * sparse directory (e.g "subdir/") and our path as a | |
1295 | * file (e.g. "subdir") might be separated by other | |
1296 | * paths (e.g. "subdir-"). | |
1297 | */ | |
1298 | while (pos >= 0) { | |
72d84ea3 | 1299 | struct cache_entry *ce = o->src_index->cache[pos]; |
523506df | 1300 | |
72d84ea3 DS |
1301 | if (!skip_prefix(ce->name, info->traverse_path, &path) || |
1302 | strncmp(path, p->path, p->pathlen) || | |
1303 | path[p->pathlen] != '/') | |
523506df DS |
1304 | return NULL; |
1305 | ||
1306 | if (S_ISSPARSEDIR(ce->ce_mode) && | |
1307 | sparse_dir_matches_path(ce, info, p)) | |
1308 | return ce; | |
1309 | ||
1310 | pos--; | |
1311 | } | |
1312 | ||
1313 | return NULL; | |
730f7284 JH |
1314 | } |
1315 | ||
ba655da5 JH |
1316 | static void debug_path(struct traverse_info *info) |
1317 | { | |
1318 | if (info->prev) { | |
1319 | debug_path(info->prev); | |
90553847 | 1320 | if (*info->prev->name) |
ba655da5 JH |
1321 | putchar('/'); |
1322 | } | |
90553847 | 1323 | printf("%s", info->name); |
ba655da5 JH |
1324 | } |
1325 | ||
1326 | static void debug_name_entry(int i, struct name_entry *n) | |
1327 | { | |
1328 | printf("ent#%d %06o %s\n", i, | |
1329 | n->path ? n->mode : 0, | |
1330 | n->path ? n->path : "(missing)"); | |
1331 | } | |
1332 | ||
1333 | static void debug_unpack_callback(int n, | |
1334 | unsigned long mask, | |
1335 | unsigned long dirmask, | |
1336 | struct name_entry *names, | |
1337 | struct traverse_info *info) | |
1338 | { | |
1339 | int i; | |
1340 | printf("* unpack mask %lu, dirmask %lu, cnt %d ", | |
1341 | mask, dirmask, n); | |
1342 | debug_path(info); | |
1343 | putchar('\n'); | |
1344 | for (i = 0; i < n; i++) | |
1345 | debug_name_entry(i, names + i); | |
1346 | } | |
1347 | ||
523506df DS |
1348 | /* |
1349 | * Returns true if and only if the given cache_entry is a | |
1350 | * sparse-directory entry that matches the given name_entry | |
1351 | * from the tree walk at the given traverse_info. | |
1352 | */ | |
1353 | static int is_sparse_directory_entry(struct cache_entry *ce, | |
1354 | struct name_entry *name, | |
1355 | struct traverse_info *info) | |
1356 | { | |
1357 | if (!ce || !name || !S_ISSPARSEDIR(ce->ce_mode)) | |
1358 | return 0; | |
1359 | ||
1360 | return sparse_dir_matches_path(ce, info, name); | |
1361 | } | |
1362 | ||
ab81047a VD |
1363 | static int unpack_sparse_callback(int n, unsigned long mask, unsigned long dirmask, struct name_entry *names, struct traverse_info *info) |
1364 | { | |
1365 | struct cache_entry *src[MAX_UNPACK_TREES + 1] = { NULL, }; | |
1366 | struct unpack_trees_options *o = info->data; | |
1367 | int ret; | |
1368 | ||
1369 | assert(o->merge); | |
1370 | ||
1371 | /* | |
1372 | * Unlike in 'unpack_callback', where src[0] is derived from the index when | |
1373 | * merging, src[0] is a transient cache entry derived from the first tree | |
1374 | * provided. Create the temporary entry as if it came from a non-sparse index. | |
1375 | */ | |
1376 | if (!is_null_oid(&names[0].oid)) { | |
1377 | src[0] = create_ce_entry(info, &names[0], 0, | |
1378 | &o->result, 1, | |
1379 | dirmask & (1ul << 0)); | |
1380 | src[0]->ce_flags |= (CE_SKIP_WORKTREE | CE_NEW_SKIP_WORKTREE); | |
1381 | } | |
1382 | ||
1383 | /* | |
1384 | * 'unpack_single_entry' assumes that src[0] is derived directly from | |
1385 | * the index, rather than from an entry in 'names'. This is *not* true when | |
1386 | * merging a sparse directory, in which case names[0] is the "index" source | |
1387 | * entry. To match the expectations of 'unpack_single_entry', shift past the | |
1388 | * "index" tree (i.e., names[0]) and adjust 'names', 'n', 'mask', and | |
1389 | * 'dirmask' accordingly. | |
1390 | */ | |
1391 | ret = unpack_single_entry(n - 1, mask >> 1, dirmask >> 1, src, names + 1, info); | |
1392 | ||
1393 | if (src[0]) | |
1394 | discard_cache_entry(src[0]); | |
1395 | ||
1396 | return ret >= 0 ? mask : -1; | |
1397 | } | |
1398 | ||
b4da3738 NTND |
1399 | /* |
1400 | * Note that traverse_by_cache_tree() duplicates some logic in this function | |
1401 | * without actually calling it. If you change the logic here you may need to | |
1402 | * check and change there as well. | |
1403 | */ | |
01904572 LT |
1404 | static int unpack_callback(int n, unsigned long mask, unsigned long dirmask, struct name_entry *names, struct traverse_info *info) |
1405 | { | |
c7cddc1a | 1406 | struct cache_entry *src[MAX_UNPACK_TREES + 1] = { NULL, }; |
01904572 | 1407 | struct unpack_trees_options *o = info->data; |
01904572 LT |
1408 | const struct name_entry *p = names; |
1409 | ||
1410 | /* Find first entry with a real name (we could use "mask" too) */ | |
1411 | while (!p->mode) | |
1412 | p++; | |
1413 | ||
ba655da5 JH |
1414 | if (o->debug_unpack) |
1415 | debug_unpack_callback(n, mask, dirmask, names, info); | |
1416 | ||
01904572 LT |
1417 | /* Are we supposed to look at the index too? */ |
1418 | if (o->merge) { | |
f2a454e0 | 1419 | int hint = -1; |
da165f47 | 1420 | while (1) { |
da165f47 | 1421 | int cmp; |
730f7284 JH |
1422 | struct cache_entry *ce; |
1423 | ||
1424 | if (o->diff_index_cached) | |
f2a454e0 | 1425 | ce = next_cache_entry(o, &hint); |
730f7284 JH |
1426 | else |
1427 | ce = find_cache_entry(info, p); | |
1428 | ||
da165f47 JH |
1429 | if (!ce) |
1430 | break; | |
1431 | cmp = compare_entry(ce, info, p); | |
01904572 LT |
1432 | if (cmp < 0) { |
1433 | if (unpack_index_entry(ce, o) < 0) | |
353c5eeb | 1434 | return unpack_failed(o, NULL); |
01904572 LT |
1435 | continue; |
1436 | } | |
1437 | if (!cmp) { | |
1438 | if (ce_stage(ce)) { | |
1439 | /* | |
da165f47 JH |
1440 | * If we skip unmerged index |
1441 | * entries, we'll skip this | |
1442 | * entry *and* the tree | |
1443 | * entries associated with it! | |
01904572 | 1444 | */ |
34110cd4 | 1445 | if (o->skip_unmerged) { |
da165f47 | 1446 | add_same_unmerged(ce, o); |
01904572 | 1447 | return mask; |
34110cd4 | 1448 | } |
01904572 LT |
1449 | } |
1450 | src[0] = ce; | |
01904572 LT |
1451 | } |
1452 | break; | |
1453 | } | |
1454 | } | |
1455 | ||
bd6a3fd7 | 1456 | if (unpack_single_entry(n, mask, dirmask, src, names, info) < 0) |
01904572 LT |
1457 | return -1; |
1458 | ||
97e5954b | 1459 | if (o->merge && src[0]) { |
da165f47 JH |
1460 | if (ce_stage(src[0])) |
1461 | mark_ce_used_same_name(src[0], o); | |
1462 | else | |
1463 | mark_ce_used(src[0], o); | |
1464 | } | |
1465 | ||
01904572 LT |
1466 | /* Now handle any directories.. */ |
1467 | if (dirmask) { | |
b65982b6 JH |
1468 | /* special case: "diff-index --cached" looking at a tree */ |
1469 | if (o->diff_index_cached && | |
1470 | n == 1 && dirmask == 1 && S_ISDIR(names->mode)) { | |
1471 | int matches; | |
1472 | matches = cache_tree_matches_traversal(o->src_index->cache_tree, | |
1473 | names, info); | |
1474 | /* | |
da165f47 JH |
1475 | * Everything under the name matches; skip the |
1476 | * entire hierarchy. diff_index_cached codepath | |
1477 | * special cases D/F conflicts in such a way that | |
1478 | * it does not do any look-ahead, so this is safe. | |
b65982b6 JH |
1479 | */ |
1480 | if (matches) { | |
da165f47 | 1481 | o->cache_bottom += matches; |
b65982b6 JH |
1482 | return mask; |
1483 | } | |
1484 | } | |
1485 | ||
523506df DS |
1486 | if (!is_sparse_directory_entry(src[0], names, info) && |
1487 | traverse_trees_recursive(n, dirmask, mask & ~dirmask, | |
1488 | names, info) < 0) { | |
542c264b | 1489 | return -1; |
523506df DS |
1490 | } |
1491 | ||
01904572 LT |
1492 | return mask; |
1493 | } | |
1494 | ||
1495 | return mask; | |
1496 | } | |
1497 | ||
27c82fb3 NTND |
1498 | static int clear_ce_flags_1(struct index_state *istate, |
1499 | struct cache_entry **cache, int nr, | |
fc2b6214 | 1500 | struct strbuf *prefix, |
28911091 | 1501 | int select_mask, int clear_mask, |
468ce99b | 1502 | struct pattern_list *pl, |
4dcd4def DS |
1503 | enum pattern_match_result default_match, |
1504 | int progress_nr); | |
28911091 | 1505 | |
9037026d | 1506 | /* Whole directory matching */ |
27c82fb3 NTND |
1507 | static int clear_ce_flags_dir(struct index_state *istate, |
1508 | struct cache_entry **cache, int nr, | |
fc2b6214 | 1509 | struct strbuf *prefix, |
9037026d NTND |
1510 | char *basename, |
1511 | int select_mask, int clear_mask, | |
468ce99b | 1512 | struct pattern_list *pl, |
4dcd4def DS |
1513 | enum pattern_match_result default_match, |
1514 | int progress_nr) | |
9037026d | 1515 | { |
28911091 | 1516 | struct cache_entry **cache_end; |
9037026d | 1517 | int dtype = DT_DIR; |
fc2b6214 | 1518 | int rc; |
eb42feca DS |
1519 | enum pattern_match_result ret, orig_ret; |
1520 | orig_ret = path_matches_pattern_list(prefix->buf, prefix->len, | |
1521 | basename, &dtype, pl, istate); | |
9037026d | 1522 | |
fc2b6214 | 1523 | strbuf_addch(prefix, '/'); |
9037026d | 1524 | |
28911091 | 1525 | /* If undecided, use matching result of parent dir in defval */ |
eb42feca | 1526 | if (orig_ret == UNDECIDED) |
468ce99b | 1527 | ret = default_match; |
eb42feca DS |
1528 | else |
1529 | ret = orig_ret; | |
9037026d | 1530 | |
28911091 NTND |
1531 | for (cache_end = cache; cache_end != cache + nr; cache_end++) { |
1532 | struct cache_entry *ce = *cache_end; | |
fc2b6214 | 1533 | if (strncmp(ce->name, prefix->buf, prefix->len)) |
28911091 | 1534 | break; |
9037026d NTND |
1535 | } |
1536 | ||
eb42feca DS |
1537 | if (pl->use_cone_patterns && orig_ret == MATCHED_RECURSIVE) { |
1538 | struct cache_entry **ce = cache; | |
4c6c7971 | 1539 | rc = cache_end - cache; |
eb42feca DS |
1540 | |
1541 | while (ce < cache_end) { | |
1542 | (*ce)->ce_flags &= ~clear_mask; | |
1543 | ce++; | |
1544 | } | |
1545 | } else if (pl->use_cone_patterns && orig_ret == NOT_MATCHED) { | |
4c6c7971 | 1546 | rc = cache_end - cache; |
eb42feca DS |
1547 | } else { |
1548 | rc = clear_ce_flags_1(istate, cache, cache_end - cache, | |
1549 | prefix, | |
1550 | select_mask, clear_mask, | |
4dcd4def DS |
1551 | pl, ret, |
1552 | progress_nr); | |
eb42feca DS |
1553 | } |
1554 | ||
fc2b6214 AP |
1555 | strbuf_setlen(prefix, prefix->len - 1); |
1556 | return rc; | |
9037026d NTND |
1557 | } |
1558 | ||
1559 | /* | |
1560 | * Traverse the index, find every entry that matches according to | |
caa3d554 | 1561 | * o->pl. Do "ce_flags &= ~clear_mask" on those entries. Return the |
9037026d NTND |
1562 | * number of traversed entries. |
1563 | * | |
1564 | * If select_mask is non-zero, only entries whose ce_flags has on of | |
1565 | * those bits enabled are traversed. | |
1566 | * | |
1567 | * cache : pointer to an index entry | |
1568 | * prefix_len : an offset to its path | |
1569 | * | |
1570 | * The current path ("prefix") including the trailing '/' is | |
1571 | * cache[0]->name[0..(prefix_len-1)] | |
1572 | * Top level path has prefix_len zero. | |
1573 | */ | |
27c82fb3 NTND |
1574 | static int clear_ce_flags_1(struct index_state *istate, |
1575 | struct cache_entry **cache, int nr, | |
fc2b6214 | 1576 | struct strbuf *prefix, |
9037026d | 1577 | int select_mask, int clear_mask, |
468ce99b | 1578 | struct pattern_list *pl, |
4dcd4def DS |
1579 | enum pattern_match_result default_match, |
1580 | int progress_nr) | |
9037026d | 1581 | { |
d20bc01a | 1582 | struct cache_entry **cache_end = nr ? cache + nr : cache; |
9037026d NTND |
1583 | |
1584 | /* | |
1585 | * Process all entries that have the given prefix and meet | |
1586 | * select_mask condition | |
1587 | */ | |
1588 | while(cache != cache_end) { | |
1589 | struct cache_entry *ce = *cache; | |
1590 | const char *name, *slash; | |
468ce99b DS |
1591 | int len, dtype; |
1592 | enum pattern_match_result ret; | |
9037026d | 1593 | |
4dcd4def DS |
1594 | display_progress(istate->progress, progress_nr); |
1595 | ||
9037026d NTND |
1596 | if (select_mask && !(ce->ce_flags & select_mask)) { |
1597 | cache++; | |
4dcd4def | 1598 | progress_nr++; |
9037026d NTND |
1599 | continue; |
1600 | } | |
1601 | ||
fc2b6214 | 1602 | if (prefix->len && strncmp(ce->name, prefix->buf, prefix->len)) |
9037026d NTND |
1603 | break; |
1604 | ||
fc2b6214 | 1605 | name = ce->name + prefix->len; |
9037026d NTND |
1606 | slash = strchr(name, '/'); |
1607 | ||
1608 | /* If it's a directory, try whole directory match first */ | |
1609 | if (slash) { | |
1610 | int processed; | |
1611 | ||
1612 | len = slash - name; | |
fc2b6214 | 1613 | strbuf_add(prefix, name, len); |
9037026d | 1614 | |
27c82fb3 | 1615 | processed = clear_ce_flags_dir(istate, cache, cache_end - cache, |
fc2b6214 AP |
1616 | prefix, |
1617 | prefix->buf + prefix->len - len, | |
9037026d | 1618 | select_mask, clear_mask, |
4dcd4def DS |
1619 | pl, default_match, |
1620 | progress_nr); | |
9037026d NTND |
1621 | |
1622 | /* clear_c_f_dir eats a whole dir already? */ | |
1623 | if (processed) { | |
1624 | cache += processed; | |
4dcd4def | 1625 | progress_nr += processed; |
fc2b6214 | 1626 | strbuf_setlen(prefix, prefix->len - len); |
9037026d NTND |
1627 | continue; |
1628 | } | |
1629 | ||
fc2b6214 | 1630 | strbuf_addch(prefix, '/'); |
4dcd4def DS |
1631 | processed = clear_ce_flags_1(istate, cache, cache_end - cache, |
1632 | prefix, | |
1633 | select_mask, clear_mask, pl, | |
1634 | default_match, progress_nr); | |
1635 | ||
1636 | cache += processed; | |
1637 | progress_nr += processed; | |
1638 | ||
fc2b6214 | 1639 | strbuf_setlen(prefix, prefix->len - len - 1); |
9037026d NTND |
1640 | continue; |
1641 | } | |
1642 | ||
1643 | /* Non-directory */ | |
1644 | dtype = ce_to_dtype(ce); | |
468ce99b DS |
1645 | ret = path_matches_pattern_list(ce->name, |
1646 | ce_namelen(ce), | |
1647 | name, &dtype, pl, istate); | |
1648 | if (ret == UNDECIDED) | |
1649 | ret = default_match; | |
f998a3f1 | 1650 | if (ret == MATCHED || ret == MATCHED_RECURSIVE) |
9037026d NTND |
1651 | ce->ce_flags &= ~clear_mask; |
1652 | cache++; | |
4dcd4def | 1653 | progress_nr++; |
9037026d | 1654 | } |
4dcd4def DS |
1655 | |
1656 | display_progress(istate->progress, progress_nr); | |
9037026d NTND |
1657 | return nr - (cache_end - cache); |
1658 | } | |
1659 | ||
27c82fb3 NTND |
1660 | static int clear_ce_flags(struct index_state *istate, |
1661 | int select_mask, int clear_mask, | |
4dcd4def DS |
1662 | struct pattern_list *pl, |
1663 | int show_progress) | |
9037026d | 1664 | { |
fc2b6214 | 1665 | static struct strbuf prefix = STRBUF_INIT; |
e6152e35 JH |
1666 | char label[100]; |
1667 | int rval; | |
fc2b6214 AP |
1668 | |
1669 | strbuf_reset(&prefix); | |
4dcd4def DS |
1670 | if (show_progress) |
1671 | istate->progress = start_delayed_progress( | |
1672 | _("Updating index flags"), | |
1673 | istate->cache_nr); | |
fc2b6214 | 1674 | |
e6152e35 JH |
1675 | xsnprintf(label, sizeof(label), "clear_ce_flags(0x%08lx,0x%08lx)", |
1676 | (unsigned long)select_mask, (unsigned long)clear_mask); | |
1677 | trace2_region_enter("unpack_trees", label, the_repository); | |
1678 | rval = clear_ce_flags_1(istate, | |
27c82fb3 NTND |
1679 | istate->cache, |
1680 | istate->cache_nr, | |
fc2b6214 | 1681 | &prefix, |
9037026d | 1682 | select_mask, clear_mask, |
4dcd4def | 1683 | pl, 0, 0); |
e6152e35 JH |
1684 | trace2_region_leave("unpack_trees", label, the_repository); |
1685 | ||
4dcd4def | 1686 | stop_progress(&istate->progress); |
e6152e35 | 1687 | return rval; |
9037026d NTND |
1688 | } |
1689 | ||
2431afbf NTND |
1690 | /* |
1691 | * Set/Clear CE_NEW_SKIP_WORKTREE according to $GIT_DIR/info/sparse-checkout | |
1692 | */ | |
caa3d554 | 1693 | static void mark_new_skip_worktree(struct pattern_list *pl, |
86016ec3 | 1694 | struct index_state *istate, |
4dcd4def DS |
1695 | int select_flag, int skip_wt_flag, |
1696 | int show_progress) | |
2431afbf NTND |
1697 | { |
1698 | int i; | |
1699 | ||
9037026d NTND |
1700 | /* |
1701 | * 1. Pretend the narrowest worktree: only unmerged entries | |
1702 | * are checked out | |
1703 | */ | |
86016ec3 NTND |
1704 | for (i = 0; i < istate->cache_nr; i++) { |
1705 | struct cache_entry *ce = istate->cache[i]; | |
2431afbf NTND |
1706 | |
1707 | if (select_flag && !(ce->ce_flags & select_flag)) | |
1708 | continue; | |
1709 | ||
b33fdfc3 | 1710 | if (!ce_stage(ce) && !(ce->ce_flags & CE_CONFLICTED)) |
2431afbf NTND |
1711 | ce->ce_flags |= skip_wt_flag; |
1712 | else | |
1713 | ce->ce_flags &= ~skip_wt_flag; | |
1714 | } | |
9037026d NTND |
1715 | |
1716 | /* | |
1717 | * 2. Widen worktree according to sparse-checkout file. | |
1718 | * Matched entries will have skip_wt_flag cleared (i.e. "in") | |
1719 | */ | |
4dcd4def | 1720 | clear_ce_flags(istate, select_flag, skip_wt_flag, pl, show_progress); |
2431afbf NTND |
1721 | } |
1722 | ||
30e89c12 EN |
1723 | static void populate_from_existing_patterns(struct unpack_trees_options *o, |
1724 | struct pattern_list *pl) | |
1725 | { | |
dd23022a | 1726 | if (get_sparse_checkout_patterns(pl) < 0) |
30e89c12 EN |
1727 | o->skip_sparse_checkout = 1; |
1728 | else | |
1729 | o->pl = pl; | |
30e89c12 EN |
1730 | } |
1731 | ||
74970392 VD |
1732 | static void update_sparsity_for_prefix(const char *prefix, |
1733 | struct index_state *istate) | |
1734 | { | |
1735 | int prefix_len = strlen(prefix); | |
1736 | struct strbuf ce_prefix = STRBUF_INIT; | |
1737 | ||
1738 | if (!istate->sparse_index) | |
1739 | return; | |
1740 | ||
1741 | while (prefix_len > 0 && prefix[prefix_len - 1] == '/') | |
1742 | prefix_len--; | |
1743 | ||
1744 | if (prefix_len <= 0) | |
1745 | BUG("Invalid prefix passed to update_sparsity_for_prefix"); | |
1746 | ||
1747 | strbuf_grow(&ce_prefix, prefix_len + 1); | |
1748 | strbuf_add(&ce_prefix, prefix, prefix_len); | |
1749 | strbuf_addch(&ce_prefix, '/'); | |
1750 | ||
1751 | /* | |
1752 | * If the prefix points to a sparse directory or a path inside a sparse | |
1753 | * directory, the index should be expanded. This is accomplished in one | |
1754 | * of two ways: | |
1755 | * - if the prefix is inside a sparse directory, it will be expanded by | |
1756 | * the 'ensure_full_index(...)' call in 'index_name_pos(...)'. | |
1757 | * - if the prefix matches an existing sparse directory entry, | |
1758 | * 'index_name_pos(...)' will return its index position, triggering | |
1759 | * the 'ensure_full_index(...)' below. | |
1760 | */ | |
1761 | if (!path_in_cone_mode_sparse_checkout(ce_prefix.buf, istate) && | |
1762 | index_name_pos(istate, ce_prefix.buf, ce_prefix.len) >= 0) | |
1763 | ensure_full_index(istate); | |
1764 | ||
1765 | strbuf_release(&ce_prefix); | |
1766 | } | |
30e89c12 | 1767 | |
eb9ae4b5 RS |
1768 | static int verify_absent(const struct cache_entry *, |
1769 | enum unpack_trees_error_types, | |
1770 | struct unpack_trees_options *); | |
2e2b887d JH |
1771 | /* |
1772 | * N-way merge "len" trees. Returns 0 on success, -1 on failure to manipulate the | |
1773 | * resulting index, -2 on failure to reflect the changes to the work tree. | |
2431afbf NTND |
1774 | * |
1775 | * CE_ADDED, CE_UNPACKED and CE_NEW_SKIP_WORKTREE are used internally | |
2e2b887d | 1776 | */ |
01904572 LT |
1777 | int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options *o) |
1778 | { | |
6863df35 | 1779 | struct repository *repo = the_repository; |
f2a454e0 | 1780 | int i, hint, ret; |
0fb1eaa8 | 1781 | static struct cache_entry *dfc; |
caa3d554 | 1782 | struct pattern_list pl; |
fa0bde45 | 1783 | int free_pattern_list = 0; |
c42e0b64 | 1784 | struct dir_struct dir = DIR_INIT; |
16da134b | 1785 | |
480d3d6b EN |
1786 | if (o->reset == UNPACK_RESET_INVALID) |
1787 | BUG("o->reset had a value of 1; should be UNPACK_TREES_*_UNTRACKED"); | |
16da134b | 1788 | |
ca885a4f JH |
1789 | if (len > MAX_UNPACK_TREES) |
1790 | die("unpack_trees takes at most %d trees", MAX_UNPACK_TREES); | |
c42e0b64 EN |
1791 | if (o->dir) |
1792 | BUG("o->dir is for internal use only"); | |
16da134b | 1793 | |
0d1ed596 | 1794 | trace_performance_enter(); |
c338898a DS |
1795 | trace2_region_enter("unpack_trees", "unpack_trees", the_repository); |
1796 | ||
6863df35 DS |
1797 | prepare_repo_settings(repo); |
1798 | if (repo->settings.command_requires_full_index) { | |
1799 | ensure_full_index(o->src_index); | |
1800 | ensure_full_index(o->dst_index); | |
1801 | } | |
1802 | ||
480d3d6b EN |
1803 | if (o->reset == UNPACK_RESET_OVERWRITE_UNTRACKED && |
1804 | o->preserve_ignored) | |
1805 | BUG("UNPACK_RESET_OVERWRITE_UNTRACKED incompatible with preserved ignored files"); | |
1806 | ||
04988c8d | 1807 | if (!o->preserve_ignored) { |
c42e0b64 | 1808 | o->dir = &dir; |
04988c8d EN |
1809 | o->dir->flags |= DIR_SHOW_IGNORED; |
1810 | setup_standard_excludes(o->dir); | |
1811 | } | |
1812 | ||
74970392 VD |
1813 | if (o->prefix) |
1814 | update_sparsity_for_prefix(o->prefix, o->src_index); | |
1815 | ||
08aefc9e NTND |
1816 | if (!core_apply_sparse_checkout || !o->update) |
1817 | o->skip_sparse_checkout = 1; | |
e091228e | 1818 | if (!o->skip_sparse_checkout && !o->pl) { |
30e89c12 | 1819 | memset(&pl, 0, sizeof(pl)); |
fa0bde45 | 1820 | free_pattern_list = 1; |
30e89c12 | 1821 | populate_from_existing_patterns(o, &pl); |
08aefc9e NTND |
1822 | } |
1823 | ||
34110cd4 | 1824 | memset(&o->result, 0, sizeof(o->result)); |
913e0e99 | 1825 | o->result.initialized = 1; |
da165f47 JH |
1826 | o->result.timestamp.sec = o->src_index->timestamp.sec; |
1827 | o->result.timestamp.nsec = o->src_index->timestamp.nsec; | |
9170c7ab | 1828 | o->result.version = o->src_index->version; |
7db11830 EN |
1829 | if (!o->src_index->split_index) { |
1830 | o->result.split_index = NULL; | |
1831 | } else if (o->src_index == o->dst_index) { | |
1832 | /* | |
1833 | * o->dst_index (and thus o->src_index) will be discarded | |
1834 | * and overwritten with o->result at the end of this function, | |
1835 | * so just use src_index's split_index to avoid having to | |
1836 | * create a new one. | |
1837 | */ | |
1838 | o->result.split_index = o->src_index->split_index; | |
5fc2fc8f | 1839 | o->result.split_index->refcount++; |
7db11830 EN |
1840 | } else { |
1841 | o->result.split_index = init_split_index(&o->result); | |
1842 | } | |
75691ea3 | 1843 | oidcpy(&o->result.oid, &o->src_index->oid); |
16da134b | 1844 | o->merge_size = len; |
da165f47 | 1845 | mark_all_ce_unused(o->src_index); |
0fb1eaa8 | 1846 | |
3dfd3059 JS |
1847 | o->result.fsmonitor_last_update = |
1848 | xstrdup_or_null(o->src_index->fsmonitor_last_update); | |
679f2f9f | 1849 | |
2431afbf NTND |
1850 | /* |
1851 | * Sparse checkout loop #1: set NEW_SKIP_WORKTREE on existing entries | |
1852 | */ | |
1853 | if (!o->skip_sparse_checkout) | |
4dcd4def DS |
1854 | mark_new_skip_worktree(o->pl, o->src_index, 0, |
1855 | CE_NEW_SKIP_WORKTREE, o->verbose_update); | |
2431afbf | 1856 | |
0fb1eaa8 | 1857 | if (!dfc) |
13494ed1 | 1858 | dfc = xcalloc(1, cache_entry_size(0)); |
0fb1eaa8 | 1859 | o->df_conflict_entry = dfc; |
16da134b JS |
1860 | |
1861 | if (len) { | |
01904572 LT |
1862 | const char *prefix = o->prefix ? o->prefix : ""; |
1863 | struct traverse_info info; | |
1864 | ||
1865 | setup_traverse_info(&info, prefix); | |
1866 | info.fn = unpack_callback; | |
1867 | info.data = o; | |
e6c111b4 | 1868 | info.show_all_errors = o->show_all_errors; |
40e37256 | 1869 | info.pathspec = o->pathspec; |
01904572 | 1870 | |
da165f47 | 1871 | if (o->prefix) { |
f2a454e0 VD |
1872 | hint = -1; |
1873 | ||
da165f47 JH |
1874 | /* |
1875 | * Unpack existing index entries that sort before the | |
1876 | * prefix the tree is spliced into. Note that o->merge | |
1877 | * is always true in this case. | |
1878 | */ | |
1879 | while (1) { | |
f2a454e0 | 1880 | struct cache_entry *ce = next_cache_entry(o, &hint); |
da165f47 JH |
1881 | if (!ce) |
1882 | break; | |
1883 | if (ce_in_traverse_path(ce, &info)) | |
1884 | break; | |
1885 | if (unpack_index_entry(ce, o) < 0) | |
1886 | goto return_failed; | |
1887 | } | |
08aefc9e | 1888 | } |
da165f47 | 1889 | |
0d1ed596 | 1890 | trace_performance_enter(); |
c338898a | 1891 | trace2_region_enter("unpack_trees", "traverse_trees", the_repository); |
67022e02 | 1892 | ret = traverse_trees(o->src_index, len, t, &info); |
c338898a | 1893 | trace2_region_leave("unpack_trees", "traverse_trees", the_repository); |
0d1ed596 NTND |
1894 | trace_performance_leave("traverse_trees"); |
1895 | if (ret < 0) | |
da165f47 | 1896 | goto return_failed; |
16da134b JS |
1897 | } |
1898 | ||
01904572 LT |
1899 | /* Any left-over entries in the index? */ |
1900 | if (o->merge) { | |
f2a454e0 | 1901 | hint = -1; |
da165f47 | 1902 | while (1) { |
f2a454e0 | 1903 | struct cache_entry *ce = next_cache_entry(o, &hint); |
da165f47 JH |
1904 | if (!ce) |
1905 | break; | |
01904572 | 1906 | if (unpack_index_entry(ce, o) < 0) |
da165f47 | 1907 | goto return_failed; |
17e46426 | 1908 | } |
17e46426 | 1909 | } |
da165f47 | 1910 | mark_all_ce_unused(o->src_index); |
16da134b | 1911 | |
08aefc9e NTND |
1912 | if (o->trivial_merges_only && o->nontrivial_merge) { |
1913 | ret = unpack_failed(o, "Merge requires file-level merging"); | |
1914 | goto done; | |
1915 | } | |
01904572 | 1916 | |
e800ec9d | 1917 | if (!o->skip_sparse_checkout) { |
2431afbf NTND |
1918 | /* |
1919 | * Sparse checkout loop #2: set NEW_SKIP_WORKTREE on entries not in loop #1 | |
031ba55b | 1920 | * If they will have NEW_SKIP_WORKTREE, also set CE_SKIP_WORKTREE |
2431afbf NTND |
1921 | * so apply_sparse_checkout() won't attempt to remove it from worktree |
1922 | */ | |
4dcd4def DS |
1923 | mark_new_skip_worktree(o->pl, &o->result, |
1924 | CE_ADDED, CE_SKIP_WORKTREE | CE_NEW_SKIP_WORKTREE, | |
1925 | o->verbose_update); | |
2431afbf | 1926 | |
17d26a4d | 1927 | ret = 0; |
2431afbf | 1928 | for (i = 0; i < o->result.cache_nr; i++) { |
e800ec9d NTND |
1929 | struct cache_entry *ce = o->result.cache[i]; |
1930 | ||
2431afbf NTND |
1931 | /* |
1932 | * Entries marked with CE_ADDED in merged_entry() do not have | |
1933 | * verify_absent() check (the check is effectively disabled | |
1934 | * because CE_NEW_SKIP_WORKTREE is set unconditionally). | |
1935 | * | |
1936 | * Do the real check now because we have had | |
1937 | * correct CE_NEW_SKIP_WORKTREE | |
1938 | */ | |
1939 | if (ce->ce_flags & CE_ADDED && | |
681c637b EN |
1940 | verify_absent(ce, WARNING_SPARSE_ORPHANED_NOT_OVERWRITTEN, o)) |
1941 | ret = 1; | |
1942 | ||
1943 | if (apply_sparse_checkout(&o->result, ce, o)) | |
1944 | ret = 1; | |
9e1afb16 | 1945 | } |
681c637b EN |
1946 | if (ret == 1) { |
1947 | /* | |
1948 | * Inability to sparsify or de-sparsify individual | |
1949 | * paths is not an error, but just a warning. | |
1950 | */ | |
1951 | if (o->show_all_errors) | |
1952 | display_warning_msgs(o); | |
1953 | ret = 0; | |
1954 | } | |
e800ec9d | 1955 | } |
01904572 | 1956 | |
b0a5a12a | 1957 | ret = check_updates(o, &o->result) ? (-2) : 0; |
e28f7641 | 1958 | if (o->dst_index) { |
836ef2b6 | 1959 | move_index_extensions(&o->result, o->src_index); |
52fca218 | 1960 | if (!ret) { |
4592e608 | 1961 | if (git_env_bool("GIT_TEST_CHECK_CACHE_TREE", 0)) |
c207e9e1 | 1962 | cache_tree_verify(the_repository, &o->result); |
52fca218 BD |
1963 | if (!cache_tree_fully_valid(o->result.cache_tree)) |
1964 | cache_tree_update(&o->result, | |
1965 | WRITE_TREE_SILENT | | |
1966 | WRITE_TREE_REPAIR); | |
1967 | } | |
1956ecd0 BP |
1968 | |
1969 | o->result.updated_workdir = 1; | |
e28f7641 | 1970 | discard_index(o->dst_index); |
34110cd4 | 1971 | *o->dst_index = o->result; |
a16cc8b2 JH |
1972 | } else { |
1973 | discard_index(&o->result); | |
e28f7641 | 1974 | } |
7db11830 | 1975 | o->src_index = NULL; |
08aefc9e NTND |
1976 | |
1977 | done: | |
fa0bde45 | 1978 | if (free_pattern_list) |
e091228e | 1979 | clear_pattern_list(&pl); |
04988c8d EN |
1980 | if (o->dir) { |
1981 | dir_clear(o->dir); | |
c42e0b64 | 1982 | o->dir = NULL; |
04988c8d | 1983 | } |
c338898a | 1984 | trace2_region_leave("unpack_trees", "unpack_trees", the_repository); |
fa0bde45 | 1985 | trace_performance_leave("unpack_trees"); |
2e2b887d | 1986 | return ret; |
da165f47 JH |
1987 | |
1988 | return_failed: | |
e6c111b4 MM |
1989 | if (o->show_all_errors) |
1990 | display_error_msgs(o); | |
da165f47 | 1991 | mark_all_ce_unused(o->src_index); |
026680f8 | 1992 | ret = unpack_failed(o, NULL); |
b4194828 JH |
1993 | if (o->exiting_early) |
1994 | ret = 0; | |
026680f8 | 1995 | goto done; |
16da134b | 1996 | } |
076b0adc | 1997 | |
7af7a258 EN |
1998 | /* |
1999 | * Update SKIP_WORKTREE bits according to sparsity patterns, and update | |
2000 | * working directory to match. | |
2001 | * | |
2002 | * CE_NEW_SKIP_WORKTREE is used internally. | |
2003 | */ | |
2004 | enum update_sparsity_result update_sparsity(struct unpack_trees_options *o) | |
2005 | { | |
2006 | enum update_sparsity_result ret = UPDATE_SPARSITY_SUCCESS; | |
2007 | struct pattern_list pl; | |
ace224ac | 2008 | int i; |
7af7a258 EN |
2009 | unsigned old_show_all_errors; |
2010 | int free_pattern_list = 0; | |
2011 | ||
2012 | old_show_all_errors = o->show_all_errors; | |
2013 | o->show_all_errors = 1; | |
2014 | ||
2015 | /* Sanity checks */ | |
2016 | if (!o->update || o->index_only || o->skip_sparse_checkout) | |
2017 | BUG("update_sparsity() is for reflecting sparsity patterns in working directory"); | |
2018 | if (o->src_index != o->dst_index || o->fn) | |
2019 | BUG("update_sparsity() called wrong"); | |
2020 | ||
2021 | trace_performance_enter(); | |
2022 | ||
2023 | /* If we weren't given patterns, use the recorded ones */ | |
2024 | if (!o->pl) { | |
2025 | memset(&pl, 0, sizeof(pl)); | |
2026 | free_pattern_list = 1; | |
2027 | populate_from_existing_patterns(o, &pl); | |
2028 | if (o->skip_sparse_checkout) | |
2029 | goto skip_sparse_checkout; | |
2030 | } | |
2031 | ||
2032 | /* Set NEW_SKIP_WORKTREE on existing entries. */ | |
2033 | mark_all_ce_unused(o->src_index); | |
2034 | mark_new_skip_worktree(o->pl, o->src_index, 0, | |
2035 | CE_NEW_SKIP_WORKTREE, o->verbose_update); | |
2036 | ||
2037 | /* Then loop over entries and update/remove as needed */ | |
2038 | ret = UPDATE_SPARSITY_SUCCESS; | |
7af7a258 EN |
2039 | for (i = 0; i < o->src_index->cache_nr; i++) { |
2040 | struct cache_entry *ce = o->src_index->cache[i]; | |
2041 | ||
ebb568b9 EN |
2042 | |
2043 | if (ce_stage(ce)) { | |
2044 | /* -1 because for loop will increment by 1 */ | |
2045 | i += warn_conflicted_path(o->src_index, i, o) - 1; | |
2046 | ret = UPDATE_SPARSITY_WARNINGS; | |
2047 | continue; | |
2048 | } | |
2049 | ||
7af7a258 EN |
2050 | if (apply_sparse_checkout(o->src_index, ce, o)) |
2051 | ret = UPDATE_SPARSITY_WARNINGS; | |
7af7a258 EN |
2052 | } |
2053 | ||
2054 | skip_sparse_checkout: | |
2055 | if (check_updates(o, o->src_index)) | |
2056 | ret = UPDATE_SPARSITY_WORKTREE_UPDATE_FAILURES; | |
2057 | ||
6271d77c | 2058 | display_warning_msgs(o); |
7af7a258 EN |
2059 | o->show_all_errors = old_show_all_errors; |
2060 | if (free_pattern_list) | |
2061 | clear_pattern_list(&pl); | |
2062 | trace_performance_leave("update_sparsity"); | |
2063 | return ret; | |
2064 | } | |
2065 | ||
076b0adc JS |
2066 | /* Here come the merge functions */ |
2067 | ||
eb9ae4b5 RS |
2068 | static int reject_merge(const struct cache_entry *ce, |
2069 | struct unpack_trees_options *o) | |
076b0adc | 2070 | { |
191e9d2c | 2071 | return add_rejected_path(o, ERROR_WOULD_OVERWRITE, ce->name); |
076b0adc JS |
2072 | } |
2073 | ||
eb9ae4b5 | 2074 | static int same(const struct cache_entry *a, const struct cache_entry *b) |
076b0adc JS |
2075 | { |
2076 | if (!!a != !!b) | |
2077 | return 0; | |
2078 | if (!a && !b) | |
2079 | return 1; | |
e11d7b59 JH |
2080 | if ((a->ce_flags | b->ce_flags) & CE_CONFLICTED) |
2081 | return 0; | |
076b0adc | 2082 | return a->ce_mode == b->ce_mode && |
4a7e27e9 | 2083 | oideq(&a->oid, &b->oid); |
076b0adc JS |
2084 | } |
2085 | ||
2086 | ||
2087 | /* | |
2088 | * When a CE gets turned into an unmerged entry, we | |
2089 | * want it to be up-to-date | |
2090 | */ | |
eb9ae4b5 RS |
2091 | static int verify_uptodate_1(const struct cache_entry *ce, |
2092 | struct unpack_trees_options *o, | |
2093 | enum unpack_trees_error_types error_type) | |
076b0adc JS |
2094 | { |
2095 | struct stat st; | |
2096 | ||
d5b66299 NTND |
2097 | if (o->index_only) |
2098 | return 0; | |
2099 | ||
2100 | /* | |
2101 | * CE_VALID and CE_SKIP_WORKTREE cheat, we better check again | |
2102 | * if this entry is truly up-to-date because this file may be | |
2103 | * overwritten. | |
2104 | */ | |
2105 | if ((ce->ce_flags & CE_VALID) || ce_skip_worktree(ce)) | |
2106 | ; /* keep checking */ | |
2107 | else if (o->reset || ce_uptodate(ce)) | |
203a2fe1 | 2108 | return 0; |
076b0adc JS |
2109 | |
2110 | if (!lstat(ce->name, &st)) { | |
d5b66299 NTND |
2111 | int flags = CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE; |
2112 | unsigned changed = ie_match_stat(o->src_index, ce, &st, flags); | |
a7bc845a SB |
2113 | |
2114 | if (submodule_from_ce(ce)) { | |
2115 | int r = check_submodule_move_head(ce, | |
2116 | "HEAD", oid_to_hex(&ce->oid), o); | |
2117 | if (r) | |
191e9d2c | 2118 | return add_rejected_path(o, error_type, ce->name); |
a7bc845a SB |
2119 | return 0; |
2120 | } | |
2121 | ||
076b0adc | 2122 | if (!changed) |
203a2fe1 | 2123 | return 0; |
936492d3 | 2124 | /* |
a7bc845a SB |
2125 | * Historic default policy was to allow submodule to be out |
2126 | * of sync wrt the superproject index. If the submodule was | |
2127 | * not considered interesting above, we don't care here. | |
936492d3 | 2128 | */ |
7a51ed66 | 2129 | if (S_ISGITLINK(ce->ce_mode)) |
203a2fe1 | 2130 | return 0; |
a7bc845a | 2131 | |
076b0adc JS |
2132 | errno = 0; |
2133 | } | |
076b0adc | 2134 | if (errno == ENOENT) |
203a2fe1 | 2135 | return 0; |
191e9d2c | 2136 | return add_rejected_path(o, error_type, ce->name); |
35a5aa79 NTND |
2137 | } |
2138 | ||
64b1abe9 EN |
2139 | int verify_uptodate(const struct cache_entry *ce, |
2140 | struct unpack_trees_options *o) | |
35a5aa79 | 2141 | { |
26b5d6b0 EN |
2142 | if (!o->skip_sparse_checkout && |
2143 | (ce->ce_flags & CE_SKIP_WORKTREE) && | |
2144 | (ce->ce_flags & CE_NEW_SKIP_WORKTREE)) | |
f1f523ea | 2145 | return 0; |
08402b04 | 2146 | return verify_uptodate_1(ce, o, ERROR_NOT_UPTODATE_FILE); |
076b0adc JS |
2147 | } |
2148 | ||
eb9ae4b5 | 2149 | static int verify_uptodate_sparse(const struct cache_entry *ce, |
e800ec9d NTND |
2150 | struct unpack_trees_options *o) |
2151 | { | |
1ac83f42 | 2152 | return verify_uptodate_1(ce, o, WARNING_SPARSE_NOT_UPTODATE_FILE); |
076b0adc JS |
2153 | } |
2154 | ||
383480ba NTND |
2155 | /* |
2156 | * TODO: We should actually invalidate o->result, not src_index [1]. | |
2157 | * But since cache tree and untracked cache both are not copied to | |
2158 | * o->result until unpacking is complete, we invalidate them on | |
2159 | * src_index instead with the assumption that they will be copied to | |
2160 | * dst_index at the end. | |
2161 | * | |
2162 | * [1] src_index->cache_tree is also used in unpack_callback() so if | |
2163 | * we invalidate o->result, we need to update it to use | |
2164 | * o->result.cache_tree as well. | |
2165 | */ | |
eb9ae4b5 RS |
2166 | static void invalidate_ce_path(const struct cache_entry *ce, |
2167 | struct unpack_trees_options *o) | |
076b0adc | 2168 | { |
e931371a NTND |
2169 | if (!ce) |
2170 | return; | |
2171 | cache_tree_invalidate_path(o->src_index, ce->name); | |
0cacebf0 | 2172 | untracked_cache_invalidate_path(o->src_index, ce->name, 1); |
076b0adc JS |
2173 | } |
2174 | ||
0cf73755 SV |
2175 | /* |
2176 | * Check that checking out ce->sha1 in subdir ce->name is not | |
2177 | * going to overwrite any working files. | |
0cf73755 | 2178 | */ |
d6b12300 SB |
2179 | static int verify_clean_submodule(const char *old_sha1, |
2180 | const struct cache_entry *ce, | |
eb9ae4b5 | 2181 | struct unpack_trees_options *o) |
0cf73755 | 2182 | { |
a7bc845a SB |
2183 | if (!submodule_from_ce(ce)) |
2184 | return 0; | |
2185 | ||
2186 | return check_submodule_move_head(ce, old_sha1, | |
2187 | oid_to_hex(&ce->oid), o); | |
0cf73755 SV |
2188 | } |
2189 | ||
eb9ae4b5 | 2190 | static int verify_clean_subdirectory(const struct cache_entry *ce, |
eb9ae4b5 | 2191 | struct unpack_trees_options *o) |
c8193534 JH |
2192 | { |
2193 | /* | |
0cf73755 | 2194 | * we are about to extract "ce->name"; we would not want to lose |
c8193534 JH |
2195 | * anything in the existing directory there. |
2196 | */ | |
2197 | int namelen; | |
7b9e3ce0 | 2198 | int i; |
c8193534 JH |
2199 | struct dir_struct d; |
2200 | char *pathbuf; | |
2201 | int cnt = 0; | |
0cf73755 | 2202 | |
d6b12300 | 2203 | if (S_ISGITLINK(ce->ce_mode)) { |
1053fe82 | 2204 | struct object_id oid; |
a98e6101 | 2205 | int sub_head = resolve_gitlink_ref(ce->name, "HEAD", &oid); |
d6b12300 SB |
2206 | /* |
2207 | * If we are not going to update the submodule, then | |
0cf73755 SV |
2208 | * we don't care. |
2209 | */ | |
4a7e27e9 | 2210 | if (!sub_head && oideq(&oid, &ce->oid)) |
0cf73755 | 2211 | return 0; |
1053fe82 | 2212 | return verify_clean_submodule(sub_head ? NULL : oid_to_hex(&oid), |
df351c6e | 2213 | ce, o); |
0cf73755 | 2214 | } |
c8193534 JH |
2215 | |
2216 | /* | |
2217 | * First let's make sure we do not have a local modification | |
2218 | * in that directory. | |
2219 | */ | |
68c4f6a5 | 2220 | namelen = ce_namelen(ce); |
da165f47 JH |
2221 | for (i = locate_in_src_index(ce, o); |
2222 | i < o->src_index->cache_nr; | |
2223 | i++) { | |
837e5fe9 CB |
2224 | struct cache_entry *ce2 = o->src_index->cache[i]; |
2225 | int len = ce_namelen(ce2); | |
c8193534 | 2226 | if (len < namelen || |
837e5fe9 CB |
2227 | strncmp(ce->name, ce2->name, namelen) || |
2228 | ce2->name[namelen] != '/') | |
c8193534 JH |
2229 | break; |
2230 | /* | |
da165f47 JH |
2231 | * ce2->name is an entry in the subdirectory to be |
2232 | * removed. | |
c8193534 | 2233 | */ |
837e5fe9 CB |
2234 | if (!ce_stage(ce2)) { |
2235 | if (verify_uptodate(ce2, o)) | |
203a2fe1 | 2236 | return -1; |
837e5fe9 | 2237 | add_entry(o, ce2, CE_REMOVE, 0); |
5697ca9a | 2238 | invalidate_ce_path(ce, o); |
da165f47 | 2239 | mark_ce_used(ce2, o); |
c8193534 JH |
2240 | } |
2241 | cnt++; | |
2242 | } | |
2243 | ||
b817e545 | 2244 | /* Do not lose a locally present file that is not ignored. */ |
75faa45a | 2245 | pathbuf = xstrfmt("%.*s/", namelen, ce->name); |
c8193534 JH |
2246 | |
2247 | memset(&d, 0, sizeof(d)); | |
2248 | if (o->dir) | |
2249 | d.exclude_per_dir = o->dir->exclude_per_dir; | |
c7f3259d | 2250 | i = read_directory(&d, o->src_index, pathbuf, namelen+1, NULL); |
e5a917fc ÆAB |
2251 | dir_clear(&d); |
2252 | free(pathbuf); | |
c8193534 | 2253 | if (i) |
191e9d2c | 2254 | return add_rejected_path(o, ERROR_NOT_UPTODATE_DIR, ce->name); |
b817e545 EN |
2255 | |
2256 | /* Do not lose startup_info->original_cwd */ | |
2257 | if (startup_info->original_cwd && | |
2258 | !strcmp(startup_info->original_cwd, ce->name)) | |
2259 | return add_rejected_path(o, ERROR_CWD_IN_THE_WAY, ce->name); | |
2260 | ||
c8193534 JH |
2261 | return cnt; |
2262 | } | |
2263 | ||
32260ad5 LT |
2264 | /* |
2265 | * This gets called when there was no index entry for the tree entry 'dst', | |
2266 | * but we found a file in the working tree that 'lstat()' said was fine, | |
2267 | * and we're on a case-insensitive filesystem. | |
2268 | * | |
2269 | * See if we can find a case-insensitive match in the index that also | |
2270 | * matches the stat information, and assume it's that other file! | |
2271 | */ | |
a9307f5a | 2272 | static int icase_exists(struct unpack_trees_options *o, const char *name, int len, struct stat *st) |
32260ad5 | 2273 | { |
9c5e6c80 | 2274 | const struct cache_entry *src; |
32260ad5 | 2275 | |
ebbd7439 | 2276 | src = index_file_exists(o->src_index, name, len, 1); |
56cac48c | 2277 | return src && !ie_match_stat(o->src_index, src, st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE); |
32260ad5 LT |
2278 | } |
2279 | ||
1fdd51aa EN |
2280 | enum absent_checking_type { |
2281 | COMPLETELY_ABSENT, | |
2282 | ABSENT_ANY_DIRECTORY | |
2283 | }; | |
2284 | ||
a9307f5a | 2285 | static int check_ok_to_remove(const char *name, int len, int dtype, |
eb9ae4b5 | 2286 | const struct cache_entry *ce, struct stat *st, |
a9307f5a | 2287 | enum unpack_trees_error_types error_type, |
1fdd51aa | 2288 | enum absent_checking_type absent_type, |
a9307f5a CB |
2289 | struct unpack_trees_options *o) |
2290 | { | |
9c5e6c80 | 2291 | const struct cache_entry *result; |
a9307f5a CB |
2292 | |
2293 | /* | |
2294 | * It may be that the 'lstat()' succeeded even though | |
2295 | * target 'ce' was absent, because there is an old | |
2296 | * entry that is different only in case.. | |
2297 | * | |
2298 | * Ignore that lstat() if it matches. | |
2299 | */ | |
2300 | if (ignore_case && icase_exists(o, name, len, st)) | |
2301 | return 0; | |
2302 | ||
589570db | 2303 | if (o->dir && |
c7f3259d | 2304 | is_excluded(o->dir, o->src_index, name, &dtype)) |
a9307f5a CB |
2305 | /* |
2306 | * ce->name is explicitly excluded, so it is Ok to | |
2307 | * overwrite it. | |
2308 | */ | |
2309 | return 0; | |
2310 | if (S_ISDIR(st->st_mode)) { | |
2311 | /* | |
2312 | * We are checking out path "foo" and | |
2313 | * found "foo/." in the working tree. | |
2314 | * This is tricky -- if we have modified | |
2315 | * files that are in "foo/" we would lose | |
2316 | * them. | |
2317 | */ | |
df351c6e | 2318 | if (verify_clean_subdirectory(ce, o) < 0) |
a9307f5a CB |
2319 | return -1; |
2320 | return 0; | |
2321 | } | |
2322 | ||
1fdd51aa EN |
2323 | /* If we only care about directories, then we can remove */ |
2324 | if (absent_type == ABSENT_ANY_DIRECTORY) | |
2325 | return 0; | |
2326 | ||
a9307f5a CB |
2327 | /* |
2328 | * The previous round may already have decided to | |
2329 | * delete this path, which is in a subdirectory that | |
2330 | * is being replaced with a blob. | |
2331 | */ | |
ebbd7439 | 2332 | result = index_file_exists(&o->result, name, len, 0); |
a9307f5a CB |
2333 | if (result) { |
2334 | if (result->ce_flags & CE_REMOVE) | |
2335 | return 0; | |
2336 | } | |
2337 | ||
191e9d2c | 2338 | return add_rejected_path(o, error_type, name); |
a9307f5a CB |
2339 | } |
2340 | ||
076b0adc JS |
2341 | /* |
2342 | * We do not want to remove or overwrite a working tree file that | |
f8a9d428 | 2343 | * is not tracked, unless it is ignored. |
076b0adc | 2344 | */ |
eb9ae4b5 RS |
2345 | static int verify_absent_1(const struct cache_entry *ce, |
2346 | enum unpack_trees_error_types error_type, | |
1fdd51aa | 2347 | enum absent_checking_type absent_type, |
eb9ae4b5 | 2348 | struct unpack_trees_options *o) |
076b0adc | 2349 | { |
f66caaf9 | 2350 | int len; |
076b0adc JS |
2351 | struct stat st; |
2352 | ||
0b0ee338 | 2353 | if (o->index_only || !o->update) |
203a2fe1 | 2354 | return 0; |
c8193534 | 2355 | |
0b0ee338 EN |
2356 | if (o->reset == UNPACK_RESET_OVERWRITE_UNTRACKED) { |
2357 | /* Avoid nuking startup_info->original_cwd... */ | |
2358 | if (startup_info->original_cwd && | |
2359 | !strcmp(startup_info->original_cwd, ce->name)) | |
2360 | return add_rejected_path(o, ERROR_CWD_IN_THE_WAY, | |
2361 | ce->name); | |
2362 | /* ...but nuke anything else. */ | |
203a2fe1 | 2363 | return 0; |
0b0ee338 | 2364 | } |
c8193534 | 2365 | |
fab78a0c | 2366 | len = check_leading_path(ce->name, ce_namelen(ce), 0); |
f66caaf9 | 2367 | if (!len) |
203a2fe1 | 2368 | return 0; |
f66caaf9 | 2369 | else if (len > 0) { |
f514ef97 JK |
2370 | char *path; |
2371 | int ret; | |
2372 | ||
2373 | path = xmemdupz(ce->name, len); | |
a93e5301 | 2374 | if (lstat(path, &st)) |
43c728e2 | 2375 | ret = error_errno("cannot stat '%s'", path); |
a7bc845a SB |
2376 | else { |
2377 | if (submodule_from_ce(ce)) | |
2378 | ret = check_submodule_move_head(ce, | |
2379 | oid_to_hex(&ce->oid), | |
2380 | NULL, o); | |
2381 | else | |
2382 | ret = check_ok_to_remove(path, len, DT_UNKNOWN, NULL, | |
1fdd51aa EN |
2383 | &st, error_type, |
2384 | absent_type, o); | |
a7bc845a | 2385 | } |
f514ef97 JK |
2386 | free(path); |
2387 | return ret; | |
92fda79e JN |
2388 | } else if (lstat(ce->name, &st)) { |
2389 | if (errno != ENOENT) | |
43c728e2 | 2390 | return error_errno("cannot stat '%s'", ce->name); |
92fda79e JN |
2391 | return 0; |
2392 | } else { | |
a7bc845a SB |
2393 | if (submodule_from_ce(ce)) |
2394 | return check_submodule_move_head(ce, oid_to_hex(&ce->oid), | |
2395 | NULL, o); | |
2396 | ||
a9307f5a | 2397 | return check_ok_to_remove(ce->name, ce_namelen(ce), |
92fda79e | 2398 | ce_to_dtype(ce), ce, &st, |
1fdd51aa | 2399 | error_type, absent_type, o); |
92fda79e | 2400 | } |
076b0adc | 2401 | } |
a9307f5a | 2402 | |
eb9ae4b5 | 2403 | static int verify_absent(const struct cache_entry *ce, |
08402b04 | 2404 | enum unpack_trees_error_types error_type, |
35a5aa79 NTND |
2405 | struct unpack_trees_options *o) |
2406 | { | |
2431afbf | 2407 | if (!o->skip_sparse_checkout && (ce->ce_flags & CE_NEW_SKIP_WORKTREE)) |
f1f523ea | 2408 | return 0; |
1fdd51aa EN |
2409 | return verify_absent_1(ce, error_type, COMPLETELY_ABSENT, o); |
2410 | } | |
2411 | ||
2412 | static int verify_absent_if_directory(const struct cache_entry *ce, | |
2413 | enum unpack_trees_error_types error_type, | |
2414 | struct unpack_trees_options *o) | |
2415 | { | |
2416 | if (!o->skip_sparse_checkout && (ce->ce_flags & CE_NEW_SKIP_WORKTREE)) | |
2417 | return 0; | |
2418 | return verify_absent_1(ce, error_type, ABSENT_ANY_DIRECTORY, o); | |
35a5aa79 | 2419 | } |
076b0adc | 2420 | |
eb9ae4b5 RS |
2421 | static int verify_absent_sparse(const struct cache_entry *ce, |
2422 | enum unpack_trees_error_types error_type, | |
2423 | struct unpack_trees_options *o) | |
e800ec9d | 2424 | { |
1fdd51aa | 2425 | return verify_absent_1(ce, error_type, COMPLETELY_ABSENT, o); |
e800ec9d | 2426 | } |
076b0adc | 2427 | |
f2fa3542 | 2428 | static int merged_entry(const struct cache_entry *ce, |
eb9ae4b5 | 2429 | const struct cache_entry *old, |
f2fa3542 | 2430 | struct unpack_trees_options *o) |
076b0adc | 2431 | { |
7f8ab8dc | 2432 | int update = CE_UPDATE; |
8e72d675 | 2433 | struct cache_entry *merge = dup_cache_entry(ce, &o->result); |
7f8ab8dc | 2434 | |
e11d7b59 | 2435 | if (!old) { |
2431afbf NTND |
2436 | /* |
2437 | * New index entries. In sparse checkout, the following | |
2438 | * verify_absent() will be delayed until after | |
2439 | * traverse_trees() finishes in unpack_trees(), then: | |
2440 | * | |
2441 | * - CE_NEW_SKIP_WORKTREE will be computed correctly | |
2442 | * - verify_absent() be called again, this time with | |
2443 | * correct CE_NEW_SKIP_WORKTREE | |
2444 | * | |
2445 | * verify_absent() call here does nothing in sparse | |
2446 | * checkout (i.e. o->skip_sparse_checkout == 0) | |
2447 | */ | |
2448 | update |= CE_ADDED; | |
2449 | merge->ce_flags |= CE_NEW_SKIP_WORKTREE; | |
2450 | ||
f2fa3542 RS |
2451 | if (verify_absent(merge, |
2452 | ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN, o)) { | |
a849735b | 2453 | discard_cache_entry(merge); |
e11d7b59 | 2454 | return -1; |
f2fa3542 | 2455 | } |
e11d7b59 | 2456 | invalidate_ce_path(merge, o); |
a7bc845a | 2457 | |
e84704f1 | 2458 | if (submodule_from_ce(ce) && file_exists(ce->name)) { |
a7bc845a SB |
2459 | int ret = check_submodule_move_head(ce, NULL, |
2460 | oid_to_hex(&ce->oid), | |
2461 | o); | |
2462 | if (ret) | |
2463 | return ret; | |
2464 | } | |
2465 | ||
e11d7b59 | 2466 | } else if (!(old->ce_flags & CE_CONFLICTED)) { |
076b0adc JS |
2467 | /* |
2468 | * See if we can re-use the old CE directly? | |
2469 | * That way we get the uptodate stat info. | |
2470 | * | |
7f8ab8dc LT |
2471 | * This also removes the UPDATE flag on a match; otherwise |
2472 | * we will end up overwriting local changes in the work tree. | |
076b0adc JS |
2473 | */ |
2474 | if (same(old, merge)) { | |
eb7a2f1d | 2475 | copy_cache_entry(merge, old); |
7f8ab8dc | 2476 | update = 0; |
076b0adc | 2477 | } else { |
f2fa3542 | 2478 | if (verify_uptodate(old, o)) { |
a849735b | 2479 | discard_cache_entry(merge); |
203a2fe1 | 2480 | return -1; |
f2fa3542 | 2481 | } |
2431afbf NTND |
2482 | /* Migrate old flags over */ |
2483 | update |= old->ce_flags & (CE_SKIP_WORKTREE | CE_NEW_SKIP_WORKTREE); | |
bc052d7f | 2484 | invalidate_ce_path(old, o); |
076b0adc | 2485 | } |
a7bc845a | 2486 | |
e84704f1 | 2487 | if (submodule_from_ce(ce) && file_exists(ce->name)) { |
a7bc845a SB |
2488 | int ret = check_submodule_move_head(ce, oid_to_hex(&old->oid), |
2489 | oid_to_hex(&ce->oid), | |
2490 | o); | |
2491 | if (ret) | |
2492 | return ret; | |
2493 | } | |
e11d7b59 JH |
2494 | } else { |
2495 | /* | |
2496 | * Previously unmerged entry left as an existence | |
2497 | * marker by read_index_unmerged(); | |
2498 | */ | |
1fdd51aa EN |
2499 | if (verify_absent_if_directory(merge, |
2500 | ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN, o)) { | |
2501 | discard_cache_entry(merge); | |
2502 | return -1; | |
2503 | } | |
2504 | ||
e11d7b59 | 2505 | invalidate_ce_path(old, o); |
076b0adc JS |
2506 | } |
2507 | ||
cc756edd JS |
2508 | if (do_add_entry(o, merge, update, CE_STAGEMASK) < 0) |
2509 | return -1; | |
076b0adc JS |
2510 | return 1; |
2511 | } | |
2512 | ||
ab81047a VD |
2513 | static int merged_sparse_dir(const struct cache_entry * const *src, int n, |
2514 | struct unpack_trees_options *o) | |
2515 | { | |
2516 | struct tree_desc t[MAX_UNPACK_TREES + 1]; | |
2517 | void * tree_bufs[MAX_UNPACK_TREES + 1]; | |
2518 | struct traverse_info info; | |
2519 | int i, ret; | |
2520 | ||
2521 | /* | |
2522 | * Create the tree traversal information for traversing into *only* the | |
2523 | * sparse directory. | |
2524 | */ | |
2525 | setup_traverse_info(&info, src[0]->name); | |
2526 | info.fn = unpack_sparse_callback; | |
2527 | info.data = o; | |
2528 | info.show_all_errors = o->show_all_errors; | |
2529 | info.pathspec = o->pathspec; | |
2530 | ||
2531 | /* Get the tree descriptors of the sparse directory in each of the merging trees */ | |
2532 | for (i = 0; i < n; i++) | |
2533 | tree_bufs[i] = fill_tree_descriptor(o->src_index->repo, &t[i], | |
2534 | src[i] && !is_null_oid(&src[i]->oid) ? &src[i]->oid : NULL); | |
2535 | ||
2536 | ret = traverse_trees(o->src_index, n, t, &info); | |
2537 | ||
2538 | for (i = 0; i < n; i++) | |
2539 | free(tree_bufs[i]); | |
2540 | ||
2541 | return ret; | |
2542 | } | |
2543 | ||
eb9ae4b5 RS |
2544 | static int deleted_entry(const struct cache_entry *ce, |
2545 | const struct cache_entry *old, | |
2546 | struct unpack_trees_options *o) | |
076b0adc | 2547 | { |
34110cd4 LT |
2548 | /* Did it exist in the index? */ |
2549 | if (!old) { | |
08402b04 | 2550 | if (verify_absent(ce, ERROR_WOULD_LOSE_UNTRACKED_REMOVED, o)) |
203a2fe1 | 2551 | return -1; |
34110cd4 | 2552 | return 0; |
56d06fe4 EN |
2553 | } else if (verify_absent_if_directory(ce, ERROR_WOULD_LOSE_UNTRACKED_REMOVED, o)) { |
2554 | return -1; | |
34110cd4 | 2555 | } |
56d06fe4 | 2556 | |
e11d7b59 | 2557 | if (!(old->ce_flags & CE_CONFLICTED) && verify_uptodate(old, o)) |
34110cd4 LT |
2558 | return -1; |
2559 | add_entry(o, ce, CE_REMOVE, 0); | |
bc052d7f | 2560 | invalidate_ce_path(ce, o); |
076b0adc JS |
2561 | return 1; |
2562 | } | |
2563 | ||
eb9ae4b5 RS |
2564 | static int keep_entry(const struct cache_entry *ce, |
2565 | struct unpack_trees_options *o) | |
076b0adc | 2566 | { |
34110cd4 | 2567 | add_entry(o, ce, 0, 0); |
5697ca9a NTND |
2568 | if (ce_stage(ce)) |
2569 | invalidate_ce_path(ce, o); | |
076b0adc JS |
2570 | return 1; |
2571 | } | |
2572 | ||
2573 | #if DBRT_DEBUG | |
2574 | static void show_stage_entry(FILE *o, | |
2575 | const char *label, const struct cache_entry *ce) | |
2576 | { | |
2577 | if (!ce) | |
2578 | fprintf(o, "%s (missing)\n", label); | |
2579 | else | |
2580 | fprintf(o, "%s%06o %s %d\t%s\n", | |
2581 | label, | |
7a51ed66 | 2582 | ce->ce_mode, |
99d1a986 | 2583 | oid_to_hex(&ce->oid), |
076b0adc JS |
2584 | ce_stage(ce), |
2585 | ce->name); | |
2586 | } | |
2587 | #endif | |
2588 | ||
5828e835 RS |
2589 | int threeway_merge(const struct cache_entry * const *stages, |
2590 | struct unpack_trees_options *o) | |
076b0adc | 2591 | { |
eb9ae4b5 RS |
2592 | const struct cache_entry *index; |
2593 | const struct cache_entry *head; | |
2594 | const struct cache_entry *remote = stages[o->head_idx + 1]; | |
076b0adc JS |
2595 | int count; |
2596 | int head_match = 0; | |
2597 | int remote_match = 0; | |
076b0adc JS |
2598 | |
2599 | int df_conflict_head = 0; | |
2600 | int df_conflict_remote = 0; | |
2601 | ||
2602 | int any_anc_missing = 0; | |
2603 | int no_anc_exists = 1; | |
2604 | int i; | |
2605 | ||
2606 | for (i = 1; i < o->head_idx; i++) { | |
4c4caafc | 2607 | if (!stages[i] || stages[i] == o->df_conflict_entry) |
076b0adc | 2608 | any_anc_missing = 1; |
4c4caafc | 2609 | else |
076b0adc | 2610 | no_anc_exists = 0; |
076b0adc JS |
2611 | } |
2612 | ||
2613 | index = stages[0]; | |
2614 | head = stages[o->head_idx]; | |
2615 | ||
2616 | if (head == o->df_conflict_entry) { | |
2617 | df_conflict_head = 1; | |
2618 | head = NULL; | |
2619 | } | |
2620 | ||
2621 | if (remote == o->df_conflict_entry) { | |
2622 | df_conflict_remote = 1; | |
2623 | remote = NULL; | |
2624 | } | |
2625 | ||
cee2d6ae JH |
2626 | /* |
2627 | * First, if there's a #16 situation, note that to prevent #13 | |
076b0adc JS |
2628 | * and #14. |
2629 | */ | |
2630 | if (!same(remote, head)) { | |
2631 | for (i = 1; i < o->head_idx; i++) { | |
2632 | if (same(stages[i], head)) { | |
2633 | head_match = i; | |
2634 | } | |
2635 | if (same(stages[i], remote)) { | |
2636 | remote_match = i; | |
2637 | } | |
2638 | } | |
2639 | } | |
2640 | ||
cee2d6ae JH |
2641 | /* |
2642 | * We start with cases where the index is allowed to match | |
076b0adc JS |
2643 | * something other than the head: #14(ALT) and #2ALT, where it |
2644 | * is permitted to match the result instead. | |
2645 | */ | |
2646 | /* #14, #14ALT, #2ALT */ | |
2647 | if (remote && !df_conflict_head && head_match && !remote_match) { | |
f27c170f VD |
2648 | if (index && !same(index, remote) && !same(index, head)) { |
2649 | if (S_ISSPARSEDIR(index->ce_mode)) | |
2650 | return merged_sparse_dir(stages, 4, o); | |
2651 | else | |
2652 | return reject_merge(index, o); | |
2653 | } | |
076b0adc JS |
2654 | return merged_entry(remote, index, o); |
2655 | } | |
2656 | /* | |
2657 | * If we have an entry in the index cache, then we want to | |
2658 | * make sure that it matches head. | |
2659 | */ | |
f27c170f VD |
2660 | if (index && !same(index, head)) { |
2661 | if (S_ISSPARSEDIR(index->ce_mode)) | |
2662 | return merged_sparse_dir(stages, 4, o); | |
2663 | else | |
2664 | return reject_merge(index, o); | |
2665 | } | |
076b0adc JS |
2666 | |
2667 | if (head) { | |
2668 | /* #5ALT, #15 */ | |
2669 | if (same(head, remote)) | |
2670 | return merged_entry(head, index, o); | |
2671 | /* #13, #3ALT */ | |
2672 | if (!df_conflict_remote && remote_match && !head_match) | |
2673 | return merged_entry(head, index, o); | |
2674 | } | |
2675 | ||
2676 | /* #1 */ | |
34110cd4 | 2677 | if (!head && !remote && any_anc_missing) |
076b0adc JS |
2678 | return 0; |
2679 | ||
cee2d6ae JH |
2680 | /* |
2681 | * Under the "aggressive" rule, we resolve mostly trivial | |
076b0adc JS |
2682 | * cases that we historically had git-merge-one-file resolve. |
2683 | */ | |
2684 | if (o->aggressive) { | |
cee2d6ae JH |
2685 | int head_deleted = !head; |
2686 | int remote_deleted = !remote; | |
eb9ae4b5 | 2687 | const struct cache_entry *ce = NULL; |
4c4caafc JH |
2688 | |
2689 | if (index) | |
0cf73755 | 2690 | ce = index; |
4c4caafc | 2691 | else if (head) |
0cf73755 | 2692 | ce = head; |
4c4caafc | 2693 | else if (remote) |
0cf73755 | 2694 | ce = remote; |
4c4caafc JH |
2695 | else { |
2696 | for (i = 1; i < o->head_idx; i++) { | |
2697 | if (stages[i] && stages[i] != o->df_conflict_entry) { | |
0cf73755 | 2698 | ce = stages[i]; |
4c4caafc JH |
2699 | break; |
2700 | } | |
2701 | } | |
2702 | } | |
2703 | ||
076b0adc JS |
2704 | /* |
2705 | * Deleted in both. | |
2706 | * Deleted in one and unchanged in the other. | |
2707 | */ | |
2708 | if ((head_deleted && remote_deleted) || | |
2709 | (head_deleted && remote && remote_match) || | |
2710 | (remote_deleted && head && head_match)) { | |
2711 | if (index) | |
2712 | return deleted_entry(index, index, o); | |
34110cd4 | 2713 | if (ce && !head_deleted) { |
08402b04 | 2714 | if (verify_absent(ce, ERROR_WOULD_LOSE_UNTRACKED_REMOVED, o)) |
203a2fe1 DB |
2715 | return -1; |
2716 | } | |
076b0adc JS |
2717 | return 0; |
2718 | } | |
2719 | /* | |
2720 | * Added in both, identically. | |
2721 | */ | |
2722 | if (no_anc_exists && head && remote && same(head, remote)) | |
2723 | return merged_entry(head, index, o); | |
2724 | ||
2725 | } | |
2726 | ||
f27c170f | 2727 | /* Handle "no merge" cases (see t/t1000-read-tree-m-3way.sh) */ |
076b0adc | 2728 | if (index) { |
f27c170f VD |
2729 | /* |
2730 | * If we've reached the "no merge" cases and we're merging | |
2731 | * a sparse directory, we may have an "edit/edit" conflict that | |
2732 | * can be resolved by individually merging directory contents. | |
2733 | */ | |
2734 | if (S_ISSPARSEDIR(index->ce_mode)) | |
2735 | return merged_sparse_dir(stages, 4, o); | |
2736 | ||
2737 | /* | |
2738 | * If we're not merging a sparse directory, ensure the index is | |
2739 | * up-to-date to avoid files getting overwritten with conflict | |
2740 | * resolution files | |
2741 | */ | |
203a2fe1 DB |
2742 | if (verify_uptodate(index, o)) |
2743 | return -1; | |
076b0adc | 2744 | } |
076b0adc JS |
2745 | |
2746 | o->nontrivial_merge = 1; | |
2747 | ||
ea4b52a8 | 2748 | /* #2, #3, #4, #6, #7, #9, #10, #11. */ |
076b0adc JS |
2749 | count = 0; |
2750 | if (!head_match || !remote_match) { | |
2751 | for (i = 1; i < o->head_idx; i++) { | |
4c4caafc | 2752 | if (stages[i] && stages[i] != o->df_conflict_entry) { |
7f7932ab | 2753 | keep_entry(stages[i], o); |
076b0adc JS |
2754 | count++; |
2755 | break; | |
2756 | } | |
2757 | } | |
2758 | } | |
2759 | #if DBRT_DEBUG | |
2760 | else { | |
2761 | fprintf(stderr, "read-tree: warning #16 detected\n"); | |
2762 | show_stage_entry(stderr, "head ", stages[head_match]); | |
2763 | show_stage_entry(stderr, "remote ", stages[remote_match]); | |
2764 | } | |
2765 | #endif | |
7f7932ab JH |
2766 | if (head) { count += keep_entry(head, o); } |
2767 | if (remote) { count += keep_entry(remote, o); } | |
076b0adc JS |
2768 | return count; |
2769 | } | |
2770 | ||
2771 | /* | |
2772 | * Two-way merge. | |
2773 | * | |
2774 | * The rule is to "carry forward" what is in the index without losing | |
a75d7b54 | 2775 | * information across a "fast-forward", favoring a successful merge |
076b0adc JS |
2776 | * over a merge failure when it makes sense. For details of the |
2777 | * "carry forward" rule, please see <Documentation/git-read-tree.txt>. | |
2778 | * | |
2779 | */ | |
5828e835 RS |
2780 | int twoway_merge(const struct cache_entry * const *src, |
2781 | struct unpack_trees_options *o) | |
076b0adc | 2782 | { |
eb9ae4b5 RS |
2783 | const struct cache_entry *current = src[0]; |
2784 | const struct cache_entry *oldtree = src[1]; | |
2785 | const struct cache_entry *newtree = src[2]; | |
076b0adc JS |
2786 | |
2787 | if (o->merge_size != 2) | |
2788 | return error("Cannot do a twoway merge of %d trees", | |
2789 | o->merge_size); | |
2790 | ||
b8ba1535 JH |
2791 | if (oldtree == o->df_conflict_entry) |
2792 | oldtree = NULL; | |
2793 | if (newtree == o->df_conflict_entry) | |
2794 | newtree = NULL; | |
2795 | ||
076b0adc | 2796 | if (current) { |
b018ff60 JK |
2797 | if (current->ce_flags & CE_CONFLICTED) { |
2798 | if (same(oldtree, newtree) || o->reset) { | |
2799 | if (!newtree) | |
2800 | return deleted_entry(current, current, o); | |
2801 | else | |
2802 | return merged_entry(newtree, current, o); | |
2803 | } | |
6a143aa2 | 2804 | return reject_merge(current, o); |
6c1db1b3 | 2805 | } else if ((!oldtree && !newtree) || /* 4 and 5 */ |
b018ff60 JK |
2806 | (!oldtree && newtree && |
2807 | same(current, newtree)) || /* 6 and 7 */ | |
2808 | (oldtree && newtree && | |
2809 | same(oldtree, newtree)) || /* 14 and 15 */ | |
2810 | (oldtree && newtree && | |
2811 | !same(oldtree, newtree) && /* 18 and 19 */ | |
2812 | same(current, newtree))) { | |
7f7932ab | 2813 | return keep_entry(current, o); |
6c1db1b3 | 2814 | } else if (oldtree && !newtree && same(current, oldtree)) { |
076b0adc JS |
2815 | /* 10 or 11 */ |
2816 | return deleted_entry(oldtree, current, o); | |
6c1db1b3 | 2817 | } else if (oldtree && newtree && |
076b0adc JS |
2818 | same(current, oldtree) && !same(current, newtree)) { |
2819 | /* 20 or 21 */ | |
2820 | return merged_entry(newtree, current, o); | |
e05cdb17 DS |
2821 | } else if (current && !oldtree && newtree && |
2822 | S_ISSPARSEDIR(current->ce_mode) != S_ISSPARSEDIR(newtree->ce_mode) && | |
2823 | ce_stage(current) == 0) { | |
2824 | /* | |
2825 | * This case is a directory/file conflict across the sparse-index | |
2826 | * boundary. When we are changing from one path to another via | |
2827 | * 'git checkout', then we want to replace one entry with another | |
2828 | * via merged_entry(). If there are staged changes, then we should | |
2829 | * reject the merge instead. | |
2830 | */ | |
2831 | return merged_entry(newtree, current, o); | |
ab81047a VD |
2832 | } else if (S_ISSPARSEDIR(current->ce_mode)) { |
2833 | /* | |
2834 | * The sparse directories differ, but we don't know whether that's | |
2835 | * because of two different files in the directory being modified | |
2836 | * (can be trivially merged) or if there is a real file conflict. | |
2837 | * Merge the sparse directory by OID to compare file-by-file. | |
2838 | */ | |
2839 | return merged_sparse_dir(src, 3, o); | |
6c1db1b3 | 2840 | } else |
6a143aa2 | 2841 | return reject_merge(current, o); |
076b0adc | 2842 | } |
55218834 JH |
2843 | else if (newtree) { |
2844 | if (oldtree && !o->initial_checkout) { | |
2845 | /* | |
2846 | * deletion of the path was staged; | |
2847 | */ | |
2848 | if (same(oldtree, newtree)) | |
2849 | return 1; | |
2850 | return reject_merge(oldtree, o); | |
2851 | } | |
076b0adc | 2852 | return merged_entry(newtree, current, o); |
55218834 | 2853 | } |
d699676d | 2854 | return deleted_entry(oldtree, current, o); |
076b0adc JS |
2855 | } |
2856 | ||
2857 | /* | |
2858 | * Bind merge. | |
2859 | * | |
2860 | * Keep the index entries at stage0, collapse stage1 but make sure | |
2861 | * stage0 does not have anything there. | |
2862 | */ | |
5828e835 RS |
2863 | int bind_merge(const struct cache_entry * const *src, |
2864 | struct unpack_trees_options *o) | |
076b0adc | 2865 | { |
eb9ae4b5 RS |
2866 | const struct cache_entry *old = src[0]; |
2867 | const struct cache_entry *a = src[1]; | |
076b0adc JS |
2868 | |
2869 | if (o->merge_size != 1) | |
82247e9b | 2870 | return error("Cannot do a bind merge of %d trees", |
076b0adc JS |
2871 | o->merge_size); |
2872 | if (a && old) | |
b165fac8 | 2873 | return o->quiet ? -1 : |
3d415425 SB |
2874 | error(ERRORMSG(o, ERROR_BIND_OVERLAP), |
2875 | super_prefixed(a->name), | |
2876 | super_prefixed(old->name)); | |
076b0adc | 2877 | if (!a) |
7f7932ab | 2878 | return keep_entry(old, o); |
076b0adc JS |
2879 | else |
2880 | return merged_entry(a, NULL, o); | |
2881 | } | |
2882 | ||
2883 | /* | |
2884 | * One-way merge. | |
2885 | * | |
2886 | * The rule is: | |
2887 | * - take the stat information from stage0, take the data from stage1 | |
2888 | */ | |
5828e835 RS |
2889 | int oneway_merge(const struct cache_entry * const *src, |
2890 | struct unpack_trees_options *o) | |
076b0adc | 2891 | { |
eb9ae4b5 RS |
2892 | const struct cache_entry *old = src[0]; |
2893 | const struct cache_entry *a = src[1]; | |
076b0adc JS |
2894 | |
2895 | if (o->merge_size != 1) | |
2896 | return error("Cannot do a oneway merge of %d trees", | |
2897 | o->merge_size); | |
2898 | ||
78d3b06e | 2899 | if (!a || a == o->df_conflict_entry) |
076b0adc | 2900 | return deleted_entry(old, old, o); |
34110cd4 | 2901 | |
076b0adc | 2902 | if (old && same(old, a)) { |
34110cd4 | 2903 | int update = 0; |
679f2f9f US |
2904 | if (o->reset && o->update && !ce_uptodate(old) && !ce_skip_worktree(old) && |
2905 | !(old->ce_flags & CE_FSMONITOR_VALID)) { | |
076b0adc JS |
2906 | struct stat st; |
2907 | if (lstat(old->name, &st) || | |
56cac48c | 2908 | ie_match_stat(o->src_index, old, &st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE)) |
34110cd4 | 2909 | update |= CE_UPDATE; |
076b0adc | 2910 | } |
ad17312e SB |
2911 | if (o->update && S_ISGITLINK(old->ce_mode) && |
2912 | should_update_submodules() && !verify_uptodate(old, o)) | |
2913 | update |= CE_UPDATE; | |
ab5af825 | 2914 | add_entry(o, old, update, CE_STAGEMASK); |
34110cd4 | 2915 | return 0; |
076b0adc JS |
2916 | } |
2917 | return merged_entry(a, old, o); | |
2918 | } | |
d3c7bf73 DL |
2919 | |
2920 | /* | |
2921 | * Merge worktree and untracked entries in a stash entry. | |
2922 | * | |
2923 | * Ignore all index entries. Collapse remaining trees but make sure that they | |
2924 | * don't have any conflicting files. | |
2925 | */ | |
2926 | int stash_worktree_untracked_merge(const struct cache_entry * const *src, | |
2927 | struct unpack_trees_options *o) | |
2928 | { | |
2929 | const struct cache_entry *worktree = src[1]; | |
2930 | const struct cache_entry *untracked = src[2]; | |
2931 | ||
2932 | if (o->merge_size != 2) | |
2933 | BUG("invalid merge_size: %d", o->merge_size); | |
2934 | ||
2935 | if (worktree && untracked) | |
2936 | return error(_("worktree and untracked commit have duplicate entries: %s"), | |
2937 | super_prefixed(worktree->name)); | |
2938 | ||
2939 | return merged_entry(worktree ? worktree : untracked, NULL, o); | |
2940 | } |