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