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