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