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