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