]>
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" |
16da134b | 11 | |
8ccba008 JH |
12 | /* |
13 | * Error messages expected by scripts out of plumbing commands such as | |
14 | * read-tree. Non-scripted Porcelain is not required to use these messages | |
15 | * and in fact are encouraged to reword them to better suit their particular | |
23cbf11b | 16 | * situation better. See how "git checkout" and "git merge" replaces |
dc1166e6 | 17 | * them using setup_unpack_trees_porcelain(), for example. |
8ccba008 | 18 | */ |
08353ebb MM |
19 | const char *unpack_plumbing_errors[NB_UNPACK_TREES_ERROR_TYPES] = { |
20 | /* ERROR_WOULD_OVERWRITE */ | |
8ccba008 JH |
21 | "Entry '%s' would be overwritten by merge. Cannot merge.", |
22 | ||
08353ebb | 23 | /* ERROR_NOT_UPTODATE_FILE */ |
8ccba008 JH |
24 | "Entry '%s' not uptodate. Cannot merge.", |
25 | ||
08353ebb | 26 | /* ERROR_NOT_UPTODATE_DIR */ |
8ccba008 JH |
27 | "Updating '%s' would lose untracked files in it", |
28 | ||
08402b04 MM |
29 | /* ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN */ |
30 | "Untracked working tree file '%s' would be overwritten by merge.", | |
8ccba008 | 31 | |
08402b04 MM |
32 | /* ERROR_WOULD_LOSE_UNTRACKED_REMOVED */ |
33 | "Untracked working tree file '%s' would be removed by merge.", | |
8ccba008 | 34 | |
08353ebb | 35 | /* ERROR_BIND_OVERLAP */ |
8ccba008 | 36 | "Entry '%s' overlaps with '%s'. Cannot bind.", |
e800ec9d | 37 | |
08353ebb | 38 | /* ERROR_SPARSE_NOT_UPTODATE_FILE */ |
e800ec9d NTND |
39 | "Entry '%s' not uptodate. Cannot update sparse checkout.", |
40 | ||
08402b04 MM |
41 | /* ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN */ |
42 | "Working tree file '%s' would be overwritten by sparse checkout update.", | |
43 | ||
44 | /* ERROR_WOULD_LOSE_ORPHANED_REMOVED */ | |
45 | "Working tree file '%s' would be removed by sparse checkout update.", | |
8ccba008 JH |
46 | }; |
47 | ||
08353ebb MM |
48 | #define ERRORMSG(o,type) \ |
49 | ( ((o) && (o)->msgs[(type)]) \ | |
50 | ? ((o)->msgs[(type)]) \ | |
51 | : (unpack_plumbing_errors[(type)]) ) | |
8ccba008 | 52 | |
e294030f MM |
53 | void setup_unpack_trees_porcelain(struct unpack_trees_options *opts, |
54 | const char *cmd) | |
dc1166e6 | 55 | { |
7980872d | 56 | int i; |
e294030f | 57 | const char **msgs = opts->msgs; |
dc1166e6 MM |
58 | const char *msg; |
59 | char *tmp; | |
60 | const char *cmd2 = strcmp(cmd, "checkout") ? cmd : "switch branches"; | |
61 | if (advice_commit_before_merge) | |
62 | msg = "Your local changes to the following files would be overwritten by %s:\n%%s" | |
63 | "Please, commit your changes or stash them before you can %s."; | |
64 | else | |
65 | msg = "Your local changes to the following files would be overwritten by %s:\n%%s"; | |
66 | tmp = xmalloc(strlen(msg) + strlen(cmd) + strlen(cmd2) - 2); | |
67 | sprintf(tmp, msg, cmd, cmd2); | |
68 | msgs[ERROR_WOULD_OVERWRITE] = tmp; | |
69 | msgs[ERROR_NOT_UPTODATE_FILE] = tmp; | |
70 | ||
71 | msgs[ERROR_NOT_UPTODATE_DIR] = | |
72 | "Updating the following directories would lose untracked files in it:\n%s"; | |
73 | ||
74 | if (advice_commit_before_merge) | |
75 | msg = "The following untracked working tree files would be %s by %s:\n%%s" | |
76 | "Please move or remove them before you can %s."; | |
77 | else | |
78 | msg = "The following untracked working tree files would be %s by %s:\n%%s"; | |
79 | tmp = xmalloc(strlen(msg) + strlen(cmd) + strlen("removed") + strlen(cmd2) - 4); | |
80 | sprintf(tmp, msg, "removed", cmd, cmd2); | |
81 | msgs[ERROR_WOULD_LOSE_UNTRACKED_REMOVED] = tmp; | |
82 | tmp = xmalloc(strlen(msg) + strlen(cmd) + strlen("overwritten") + strlen(cmd2) - 4); | |
83 | sprintf(tmp, msg, "overwritten", cmd, cmd2); | |
84 | msgs[ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN] = tmp; | |
85 | ||
86 | /* | |
87 | * Special case: ERROR_BIND_OVERLAP refers to a pair of paths, we | |
88 | * cannot easily display it as a list. | |
89 | */ | |
90 | msgs[ERROR_BIND_OVERLAP] = "Entry '%s' overlaps with '%s'. Cannot bind."; | |
91 | ||
92 | msgs[ERROR_SPARSE_NOT_UPTODATE_FILE] = | |
93 | "Cannot update sparse checkout: the following entries are not up-to-date:\n%s"; | |
94 | msgs[ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN] = | |
95 | "The following Working tree files would be overwritten by sparse checkout update:\n%s"; | |
96 | msgs[ERROR_WOULD_LOSE_ORPHANED_REMOVED] = | |
97 | "The following Working tree files would be removed by sparse checkout update:\n%s"; | |
5e65ee35 MM |
98 | |
99 | opts->show_all_errors = 1; | |
7980872d CB |
100 | /* rejected paths may not have a static buffer */ |
101 | for (i = 0; i < ARRAY_SIZE(opts->unpack_rejects); i++) | |
102 | opts->unpack_rejects[i].strdup_strings = 1; | |
dc1166e6 MM |
103 | } |
104 | ||
34110cd4 LT |
105 | static void add_entry(struct unpack_trees_options *o, struct cache_entry *ce, |
106 | unsigned int set, unsigned int clear) | |
b48d5a05 | 107 | { |
34110cd4 LT |
108 | unsigned int size = ce_size(ce); |
109 | struct cache_entry *new = xmalloc(size); | |
110 | ||
111 | clear |= CE_HASHED | CE_UNHASHED; | |
112 | ||
700e66d6 NTND |
113 | if (set & CE_REMOVE) |
114 | set |= CE_WT_REMOVE; | |
115 | ||
34110cd4 LT |
116 | memcpy(new, ce, size); |
117 | new->next = NULL; | |
118 | new->ce_flags = (new->ce_flags & ~clear) | set; | |
aab3b9a1 | 119 | add_index_entry(&o->result, new, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE); |
b48d5a05 LT |
120 | } |
121 | ||
e6c111b4 MM |
122 | /* |
123 | * add error messages on path <path> | |
124 | * corresponding to the type <e> with the message <msg> | |
125 | * indicating if it should be display in porcelain or not | |
126 | */ | |
127 | static int add_rejected_path(struct unpack_trees_options *o, | |
128 | enum unpack_trees_error_types e, | |
129 | const char *path) | |
130 | { | |
e6c111b4 MM |
131 | if (!o->show_all_errors) |
132 | return error(ERRORMSG(o, e), path); | |
133 | ||
134 | /* | |
135 | * Otherwise, insert in a list for future display by | |
136 | * display_error_msgs() | |
137 | */ | |
7980872d | 138 | string_list_append(&o->unpack_rejects[e], path); |
e6c111b4 MM |
139 | return -1; |
140 | } | |
141 | ||
e6c111b4 MM |
142 | /* |
143 | * display all the error messages stored in a nice way | |
144 | */ | |
145 | static void display_error_msgs(struct unpack_trees_options *o) | |
146 | { | |
7980872d | 147 | int e, i; |
e6c111b4 MM |
148 | int something_displayed = 0; |
149 | for (e = 0; e < NB_UNPACK_TREES_ERROR_TYPES; e++) { | |
7980872d CB |
150 | struct string_list *rejects = &o->unpack_rejects[e]; |
151 | if (rejects->nr > 0) { | |
e6c111b4 MM |
152 | struct strbuf path = STRBUF_INIT; |
153 | something_displayed = 1; | |
7980872d CB |
154 | for (i = 0; i < rejects->nr; i++) |
155 | strbuf_addf(&path, "\t%s\n", rejects->items[i].string); | |
e6c111b4 MM |
156 | error(ERRORMSG(o, e), path.buf); |
157 | strbuf_release(&path); | |
e6c111b4 | 158 | } |
7980872d | 159 | string_list_clear(rejects, 0); |
e6c111b4 MM |
160 | } |
161 | if (something_displayed) | |
162 | printf("Aborting\n"); | |
163 | } | |
164 | ||
78478927 KB |
165 | /* |
166 | * Unlink the last component and schedule the leading directories for | |
167 | * removal, such that empty directories get removed. | |
16da134b | 168 | */ |
c40641b7 | 169 | static void unlink_entry(struct cache_entry *ce) |
16da134b | 170 | { |
f66caaf9 | 171 | if (!check_leading_path(ce->name, ce_namelen(ce))) |
16a4c617 | 172 | return; |
80d706af PC |
173 | if (remove_or_warn(ce->ce_mode, ce->name)) |
174 | return; | |
78478927 | 175 | schedule_dir_for_removal(ce->name, ce_namelen(ce)); |
16da134b JS |
176 | } |
177 | ||
16da134b | 178 | static struct checkout state; |
c4758d3c | 179 | static int check_updates(struct unpack_trees_options *o) |
16da134b | 180 | { |
96a02f8f | 181 | unsigned cnt = 0, total = 0; |
dc6a0757 | 182 | struct progress *progress = NULL; |
34110cd4 | 183 | struct index_state *index = &o->result; |
33ecf7eb | 184 | int i; |
c4758d3c | 185 | int errs = 0; |
16da134b JS |
186 | |
187 | if (o->update && o->verbose_update) { | |
34110cd4 LT |
188 | for (total = cnt = 0; cnt < index->cache_nr; cnt++) { |
189 | struct cache_entry *ce = index->cache[cnt]; | |
700e66d6 | 190 | if (ce->ce_flags & (CE_UPDATE | CE_WT_REMOVE)) |
16da134b JS |
191 | total++; |
192 | } | |
193 | ||
dc6a0757 | 194 | progress = start_progress_delay("Checking out files", |
e8548645 | 195 | total, 50, 1); |
16da134b JS |
196 | cnt = 0; |
197 | } | |
198 | ||
66985e66 JH |
199 | if (o->update) |
200 | git_attr_set_direction(GIT_ATTR_CHECKOUT, &o->result); | |
34110cd4 LT |
201 | for (i = 0; i < index->cache_nr; i++) { |
202 | struct cache_entry *ce = index->cache[i]; | |
16da134b | 203 | |
e663db2f NTND |
204 | if (ce->ce_flags & CE_WT_REMOVE) { |
205 | display_progress(progress, ++cnt); | |
206 | if (o->update) | |
207 | unlink_entry(ce); | |
208 | continue; | |
209 | } | |
1fa6ead4 | 210 | } |
36419c8e | 211 | remove_marked_cache_entries(&o->result); |
78478927 | 212 | remove_scheduled_dirs(); |
1fa6ead4 LT |
213 | |
214 | for (i = 0; i < index->cache_nr; i++) { | |
215 | struct cache_entry *ce = index->cache[i]; | |
216 | ||
7a51ed66 | 217 | if (ce->ce_flags & CE_UPDATE) { |
1fa6ead4 | 218 | display_progress(progress, ++cnt); |
7a51ed66 | 219 | ce->ce_flags &= ~CE_UPDATE; |
16a4c617 | 220 | if (o->update) { |
c4758d3c | 221 | errs |= checkout_entry(ce, &state, NULL); |
16a4c617 | 222 | } |
16da134b JS |
223 | } |
224 | } | |
4d4fcc54 | 225 | stop_progress(&progress); |
66985e66 JH |
226 | if (o->update) |
227 | git_attr_set_direction(GIT_ATTR_CHECKIN, NULL); | |
c4758d3c | 228 | return errs != 0; |
16da134b JS |
229 | } |
230 | ||
e800ec9d | 231 | static int verify_uptodate_sparse(struct cache_entry *ce, struct unpack_trees_options *o); |
08402b04 | 232 | static int verify_absent_sparse(struct cache_entry *ce, enum unpack_trees_error_types, struct unpack_trees_options *o); |
e800ec9d NTND |
233 | |
234 | static int will_have_skip_worktree(const struct cache_entry *ce, struct unpack_trees_options *o) | |
235 | { | |
236 | const char *basename; | |
237 | ||
e800ec9d NTND |
238 | basename = strrchr(ce->name, '/'); |
239 | basename = basename ? basename+1 : ce->name; | |
240 | return excluded_from_list(ce->name, ce_namelen(ce), basename, NULL, o->el) <= 0; | |
241 | } | |
242 | ||
243 | static int apply_sparse_checkout(struct cache_entry *ce, struct unpack_trees_options *o) | |
244 | { | |
245 | int was_skip_worktree = ce_skip_worktree(ce); | |
246 | ||
711f151a | 247 | if (!ce_stage(ce) && will_have_skip_worktree(ce, o)) |
e800ec9d NTND |
248 | ce->ce_flags |= CE_SKIP_WORKTREE; |
249 | else | |
250 | ce->ce_flags &= ~CE_SKIP_WORKTREE; | |
251 | ||
252 | /* | |
eec3fc03 NTND |
253 | * if (!was_skip_worktree && !ce_skip_worktree()) { |
254 | * This is perfectly normal. Move on; | |
255 | * } | |
e800ec9d | 256 | */ |
eec3fc03 NTND |
257 | |
258 | /* | |
259 | * Merge strategies may set CE_UPDATE|CE_REMOVE outside checkout | |
260 | * area as a result of ce_skip_worktree() shortcuts in | |
700e66d6 NTND |
261 | * verify_absent() and verify_uptodate(). |
262 | * Make sure they don't modify worktree if they are already | |
263 | * outside checkout area | |
eec3fc03 | 264 | */ |
700e66d6 NTND |
265 | if (was_skip_worktree && ce_skip_worktree(ce)) { |
266 | ce->ce_flags &= ~CE_UPDATE; | |
267 | ||
268 | /* | |
269 | * By default, when CE_REMOVE is on, CE_WT_REMOVE is also | |
270 | * on to get that file removed from both index and worktree. | |
271 | * If that file is already outside worktree area, don't | |
272 | * bother remove it. | |
273 | */ | |
274 | if (ce->ce_flags & CE_REMOVE) | |
275 | ce->ce_flags &= ~CE_WT_REMOVE; | |
276 | } | |
e800ec9d NTND |
277 | |
278 | if (!was_skip_worktree && ce_skip_worktree(ce)) { | |
279 | /* | |
280 | * If CE_UPDATE is set, verify_uptodate() must be called already | |
281 | * also stat info may have lost after merged_entry() so calling | |
282 | * verify_uptodate() again may fail | |
283 | */ | |
284 | if (!(ce->ce_flags & CE_UPDATE) && verify_uptodate_sparse(ce, o)) | |
285 | return -1; | |
286 | ce->ce_flags |= CE_WT_REMOVE; | |
287 | } | |
288 | if (was_skip_worktree && !ce_skip_worktree(ce)) { | |
08402b04 | 289 | if (verify_absent_sparse(ce, ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN, o)) |
e800ec9d NTND |
290 | return -1; |
291 | ce->ce_flags |= CE_UPDATE; | |
292 | } | |
293 | return 0; | |
294 | } | |
295 | ||
34110cd4 | 296 | static inline int call_unpack_fn(struct cache_entry **src, struct unpack_trees_options *o) |
01904572 | 297 | { |
34110cd4 LT |
298 | int ret = o->fn(src, o); |
299 | if (ret > 0) | |
01904572 | 300 | ret = 0; |
01904572 LT |
301 | return ret; |
302 | } | |
303 | ||
da165f47 JH |
304 | static void mark_ce_used(struct cache_entry *ce, struct unpack_trees_options *o) |
305 | { | |
306 | ce->ce_flags |= CE_UNPACKED; | |
307 | ||
308 | if (o->cache_bottom < o->src_index->cache_nr && | |
309 | o->src_index->cache[o->cache_bottom] == ce) { | |
310 | int bottom = o->cache_bottom; | |
311 | while (bottom < o->src_index->cache_nr && | |
312 | o->src_index->cache[bottom]->ce_flags & CE_UNPACKED) | |
313 | bottom++; | |
314 | o->cache_bottom = bottom; | |
315 | } | |
316 | } | |
317 | ||
318 | static void mark_all_ce_unused(struct index_state *index) | |
319 | { | |
320 | int i; | |
321 | for (i = 0; i < index->cache_nr; i++) | |
322 | index->cache[i]->ce_flags &= ~CE_UNPACKED; | |
323 | } | |
324 | ||
325 | static int locate_in_src_index(struct cache_entry *ce, | |
326 | struct unpack_trees_options *o) | |
327 | { | |
328 | struct index_state *index = o->src_index; | |
329 | int len = ce_namelen(ce); | |
330 | int pos = index_name_pos(index, ce->name, len); | |
331 | if (pos < 0) | |
332 | pos = -1 - pos; | |
333 | return pos; | |
334 | } | |
335 | ||
336 | /* | |
337 | * We call unpack_index_entry() with an unmerged cache entry | |
338 | * only in diff-index, and it wants a single callback. Skip | |
339 | * the other unmerged entry with the same name. | |
340 | */ | |
341 | static void mark_ce_used_same_name(struct cache_entry *ce, | |
342 | struct unpack_trees_options *o) | |
343 | { | |
344 | struct index_state *index = o->src_index; | |
345 | int len = ce_namelen(ce); | |
346 | int pos; | |
347 | ||
348 | for (pos = locate_in_src_index(ce, o); pos < index->cache_nr; pos++) { | |
349 | struct cache_entry *next = index->cache[pos]; | |
350 | if (len != ce_namelen(next) || | |
351 | memcmp(ce->name, next->name, len)) | |
352 | break; | |
353 | mark_ce_used(next, o); | |
354 | } | |
355 | } | |
356 | ||
357 | static struct cache_entry *next_cache_entry(struct unpack_trees_options *o) | |
358 | { | |
359 | const struct index_state *index = o->src_index; | |
360 | int pos = o->cache_bottom; | |
361 | ||
362 | while (pos < index->cache_nr) { | |
363 | struct cache_entry *ce = index->cache[pos]; | |
364 | if (!(ce->ce_flags & CE_UNPACKED)) | |
365 | return ce; | |
366 | pos++; | |
367 | } | |
368 | return NULL; | |
369 | } | |
370 | ||
371 | static void add_same_unmerged(struct cache_entry *ce, | |
372 | struct unpack_trees_options *o) | |
373 | { | |
374 | struct index_state *index = o->src_index; | |
375 | int len = ce_namelen(ce); | |
376 | int pos = index_name_pos(index, ce->name, len); | |
377 | ||
378 | if (0 <= pos) | |
379 | die("programming error in a caller of mark_ce_used_same_name"); | |
380 | for (pos = -pos - 1; pos < index->cache_nr; pos++) { | |
381 | struct cache_entry *next = index->cache[pos]; | |
382 | if (len != ce_namelen(next) || | |
383 | memcmp(ce->name, next->name, len)) | |
384 | break; | |
385 | add_entry(o, next, 0, 0); | |
386 | mark_ce_used(next, o); | |
387 | } | |
388 | } | |
389 | ||
390 | static int unpack_index_entry(struct cache_entry *ce, | |
391 | struct unpack_trees_options *o) | |
01904572 | 392 | { |
66dbfd55 | 393 | struct cache_entry *src[5] = { NULL }; |
da165f47 | 394 | int ret; |
34110cd4 | 395 | |
66dbfd55 GV |
396 | src[0] = ce; |
397 | ||
da165f47 | 398 | mark_ce_used(ce, o); |
01904572 LT |
399 | if (ce_stage(ce)) { |
400 | if (o->skip_unmerged) { | |
34110cd4 LT |
401 | add_entry(o, ce, 0, 0); |
402 | return 0; | |
01904572 | 403 | } |
01904572 | 404 | } |
da165f47 JH |
405 | ret = call_unpack_fn(src, o); |
406 | if (ce_stage(ce)) | |
407 | mark_ce_used_same_name(ce, o); | |
408 | return ret; | |
01904572 LT |
409 | } |
410 | ||
730f7284 JH |
411 | static int find_cache_pos(struct traverse_info *, const struct name_entry *); |
412 | ||
413 | static void restore_cache_bottom(struct traverse_info *info, int bottom) | |
414 | { | |
415 | struct unpack_trees_options *o = info->data; | |
416 | ||
417 | if (o->diff_index_cached) | |
418 | return; | |
419 | o->cache_bottom = bottom; | |
420 | } | |
421 | ||
422 | static int switch_cache_bottom(struct traverse_info *info) | |
423 | { | |
424 | struct unpack_trees_options *o = info->data; | |
425 | int ret, pos; | |
426 | ||
427 | if (o->diff_index_cached) | |
428 | return 0; | |
429 | ret = o->cache_bottom; | |
430 | pos = find_cache_pos(info->prev, &info->name); | |
431 | ||
432 | if (pos < -1) | |
433 | o->cache_bottom = -2 - pos; | |
434 | else if (pos < 0) | |
435 | o->cache_bottom = o->src_index->cache_nr; | |
436 | return ret; | |
01904572 LT |
437 | } |
438 | ||
2af202be | 439 | static int traverse_trees_recursive(int n, unsigned long dirmask, unsigned long df_conflicts, struct name_entry *names, struct traverse_info *info) |
16da134b | 440 | { |
730f7284 | 441 | int i, ret, bottom; |
ca885a4f | 442 | struct tree_desc t[MAX_UNPACK_TREES]; |
1ce584b0 | 443 | void *buf[MAX_UNPACK_TREES]; |
01904572 LT |
444 | struct traverse_info newinfo; |
445 | struct name_entry *p; | |
446 | ||
447 | p = names; | |
448 | while (!p->mode) | |
449 | p++; | |
450 | ||
451 | newinfo = *info; | |
452 | newinfo.prev = info; | |
453 | newinfo.name = *p; | |
454 | newinfo.pathlen += tree_entry_len(p->path, p->sha1) + 1; | |
455 | newinfo.conflicts |= df_conflicts; | |
456 | ||
457 | for (i = 0; i < n; i++, dirmask >>= 1) { | |
458 | const unsigned char *sha1 = NULL; | |
459 | if (dirmask & 1) | |
460 | sha1 = names[i].sha1; | |
1ce584b0 | 461 | buf[i] = fill_tree_descriptor(t+i, sha1); |
01904572 | 462 | } |
730f7284 JH |
463 | |
464 | bottom = switch_cache_bottom(&newinfo); | |
465 | ret = traverse_trees(n, t, &newinfo); | |
466 | restore_cache_bottom(&newinfo, bottom); | |
1ce584b0 JN |
467 | |
468 | for (i = 0; i < n; i++) | |
469 | free(buf[i]); | |
470 | ||
730f7284 | 471 | return ret; |
01904572 LT |
472 | } |
473 | ||
474 | /* | |
475 | * Compare the traverse-path to the cache entry without actually | |
476 | * having to generate the textual representation of the traverse | |
477 | * path. | |
478 | * | |
479 | * NOTE! This *only* compares up to the size of the traverse path | |
480 | * itself - the caller needs to do the final check for the cache | |
481 | * entry having more data at the end! | |
482 | */ | |
483 | static int do_compare_entry(const struct cache_entry *ce, const struct traverse_info *info, const struct name_entry *n) | |
484 | { | |
485 | int len, pathlen, ce_len; | |
486 | const char *ce_name; | |
487 | ||
488 | if (info->prev) { | |
489 | int cmp = do_compare_entry(ce, info->prev, &info->name); | |
490 | if (cmp) | |
491 | return cmp; | |
492 | } | |
493 | pathlen = info->pathlen; | |
494 | ce_len = ce_namelen(ce); | |
495 | ||
496 | /* If ce_len < pathlen then we must have previously hit "name == directory" entry */ | |
497 | if (ce_len < pathlen) | |
498 | return -1; | |
499 | ||
500 | ce_len -= pathlen; | |
501 | ce_name = ce->name + pathlen; | |
502 | ||
503 | len = tree_entry_len(n->path, n->sha1); | |
504 | return df_name_compare(ce_name, ce_len, S_IFREG, n->path, len, n->mode); | |
505 | } | |
506 | ||
507 | static int compare_entry(const struct cache_entry *ce, const struct traverse_info *info, const struct name_entry *n) | |
508 | { | |
509 | int cmp = do_compare_entry(ce, info, n); | |
510 | if (cmp) | |
511 | return cmp; | |
512 | ||
513 | /* | |
514 | * Even if the beginning compared identically, the ce should | |
515 | * compare as bigger than a directory leading up to it! | |
516 | */ | |
517 | return ce_namelen(ce) > traverse_path_len(info, n); | |
518 | } | |
519 | ||
da165f47 JH |
520 | static int ce_in_traverse_path(const struct cache_entry *ce, |
521 | const struct traverse_info *info) | |
522 | { | |
523 | if (!info->prev) | |
524 | return 1; | |
525 | if (do_compare_entry(ce, info->prev, &info->name)) | |
526 | return 0; | |
527 | /* | |
528 | * If ce (blob) is the same name as the path (which is a tree | |
529 | * we will be descending into), it won't be inside it. | |
530 | */ | |
531 | return (info->pathlen < ce_namelen(ce)); | |
532 | } | |
533 | ||
01904572 LT |
534 | static struct cache_entry *create_ce_entry(const struct traverse_info *info, const struct name_entry *n, int stage) |
535 | { | |
536 | int len = traverse_path_len(info, n); | |
537 | struct cache_entry *ce = xcalloc(1, cache_entry_size(len)); | |
538 | ||
539 | ce->ce_mode = create_ce_mode(n->mode); | |
540 | ce->ce_flags = create_ce_flags(len, stage); | |
541 | hashcpy(ce->sha1, n->sha1); | |
542 | make_traverse_path(ce->name, info, n); | |
543 | ||
544 | return ce; | |
545 | } | |
546 | ||
c7cddc1a RS |
547 | static int unpack_nondirectories(int n, unsigned long mask, |
548 | unsigned long dirmask, | |
549 | struct cache_entry **src, | |
550 | const struct name_entry *names, | |
551 | const struct traverse_info *info) | |
01904572 LT |
552 | { |
553 | int i; | |
554 | struct unpack_trees_options *o = info->data; | |
555 | unsigned long conflicts; | |
556 | ||
557 | /* Do we have *only* directories? Nothing to do */ | |
558 | if (mask == dirmask && !src[0]) | |
559 | return 0; | |
560 | ||
561 | conflicts = info->conflicts; | |
562 | if (o->merge) | |
563 | conflicts >>= 1; | |
564 | conflicts |= dirmask; | |
565 | ||
566 | /* | |
567 | * Ok, we've filled in up to any potential index entry in src[0], | |
568 | * now do the rest. | |
569 | */ | |
570 | for (i = 0; i < n; i++) { | |
571 | int stage; | |
572 | unsigned int bit = 1ul << i; | |
573 | if (conflicts & bit) { | |
574 | src[i + o->merge] = o->df_conflict_entry; | |
575 | continue; | |
576 | } | |
577 | if (!(mask & bit)) | |
578 | continue; | |
579 | if (!o->merge) | |
580 | stage = 0; | |
581 | else if (i + 1 < o->head_idx) | |
582 | stage = 1; | |
583 | else if (i + 1 > o->head_idx) | |
584 | stage = 3; | |
585 | else | |
586 | stage = 2; | |
587 | src[i + o->merge] = create_ce_entry(info, names + i, stage); | |
588 | } | |
589 | ||
590 | if (o->merge) | |
34110cd4 | 591 | return call_unpack_fn(src, o); |
01904572 | 592 | |
01904572 | 593 | for (i = 0; i < n; i++) |
aab3b9a1 JH |
594 | if (src[i] && src[i] != o->df_conflict_entry) |
595 | add_entry(o, src[i], 0, 0); | |
01904572 LT |
596 | return 0; |
597 | } | |
598 | ||
353c5eeb JH |
599 | static int unpack_failed(struct unpack_trees_options *o, const char *message) |
600 | { | |
601 | discard_index(&o->result); | |
602 | if (!o->gently) { | |
603 | if (message) | |
604 | return error("%s", message); | |
605 | return -1; | |
606 | } | |
607 | return -1; | |
608 | } | |
609 | ||
730f7284 JH |
610 | /* NEEDSWORK: give this a better name and share with tree-walk.c */ |
611 | static int name_compare(const char *a, int a_len, | |
612 | const char *b, int b_len) | |
613 | { | |
614 | int len = (a_len < b_len) ? a_len : b_len; | |
615 | int cmp = memcmp(a, b, len); | |
616 | if (cmp) | |
617 | return cmp; | |
618 | return (a_len - b_len); | |
619 | } | |
620 | ||
621 | /* | |
622 | * The tree traversal is looking at name p. If we have a matching entry, | |
623 | * return it. If name p is a directory in the index, do not return | |
624 | * anything, as we will want to match it when the traversal descends into | |
625 | * the directory. | |
626 | */ | |
627 | static int find_cache_pos(struct traverse_info *info, | |
628 | const struct name_entry *p) | |
629 | { | |
630 | int pos; | |
631 | struct unpack_trees_options *o = info->data; | |
632 | struct index_state *index = o->src_index; | |
633 | int pfxlen = info->pathlen; | |
634 | int p_len = tree_entry_len(p->path, p->sha1); | |
635 | ||
636 | for (pos = o->cache_bottom; pos < index->cache_nr; pos++) { | |
637 | struct cache_entry *ce = index->cache[pos]; | |
638 | const char *ce_name, *ce_slash; | |
639 | int cmp, ce_len; | |
640 | ||
e53e6b44 BD |
641 | if (ce->ce_flags & CE_UNPACKED) { |
642 | /* | |
643 | * cache_bottom entry is already unpacked, so | |
644 | * we can never match it; don't check it | |
645 | * again. | |
646 | */ | |
647 | if (pos == o->cache_bottom) | |
648 | ++o->cache_bottom; | |
730f7284 | 649 | continue; |
e53e6b44 BD |
650 | } |
651 | if (!ce_in_traverse_path(ce, info)) | |
730f7284 JH |
652 | continue; |
653 | ce_name = ce->name + pfxlen; | |
654 | ce_slash = strchr(ce_name, '/'); | |
655 | if (ce_slash) | |
656 | ce_len = ce_slash - ce_name; | |
657 | else | |
658 | ce_len = ce_namelen(ce) - pfxlen; | |
659 | cmp = name_compare(p->path, p_len, ce_name, ce_len); | |
660 | /* | |
661 | * Exact match; if we have a directory we need to | |
662 | * delay returning it. | |
663 | */ | |
664 | if (!cmp) | |
665 | return ce_slash ? -2 - pos : pos; | |
666 | if (0 < cmp) | |
667 | continue; /* keep looking */ | |
668 | /* | |
669 | * ce_name sorts after p->path; could it be that we | |
670 | * have files under p->path directory in the index? | |
671 | * E.g. ce_name == "t-i", and p->path == "t"; we may | |
672 | * have "t/a" in the index. | |
673 | */ | |
674 | if (p_len < ce_len && !memcmp(ce_name, p->path, p_len) && | |
675 | ce_name[p_len] < '/') | |
676 | continue; /* keep looking */ | |
677 | break; | |
678 | } | |
679 | return -1; | |
680 | } | |
681 | ||
682 | static struct cache_entry *find_cache_entry(struct traverse_info *info, | |
683 | const struct name_entry *p) | |
684 | { | |
685 | int pos = find_cache_pos(info, p); | |
686 | struct unpack_trees_options *o = info->data; | |
687 | ||
688 | if (0 <= pos) | |
689 | return o->src_index->cache[pos]; | |
690 | else | |
691 | return NULL; | |
692 | } | |
693 | ||
ba655da5 JH |
694 | static void debug_path(struct traverse_info *info) |
695 | { | |
696 | if (info->prev) { | |
697 | debug_path(info->prev); | |
698 | if (*info->prev->name.path) | |
699 | putchar('/'); | |
700 | } | |
701 | printf("%s", info->name.path); | |
702 | } | |
703 | ||
704 | static void debug_name_entry(int i, struct name_entry *n) | |
705 | { | |
706 | printf("ent#%d %06o %s\n", i, | |
707 | n->path ? n->mode : 0, | |
708 | n->path ? n->path : "(missing)"); | |
709 | } | |
710 | ||
711 | static void debug_unpack_callback(int n, | |
712 | unsigned long mask, | |
713 | unsigned long dirmask, | |
714 | struct name_entry *names, | |
715 | struct traverse_info *info) | |
716 | { | |
717 | int i; | |
718 | printf("* unpack mask %lu, dirmask %lu, cnt %d ", | |
719 | mask, dirmask, n); | |
720 | debug_path(info); | |
721 | putchar('\n'); | |
722 | for (i = 0; i < n; i++) | |
723 | debug_name_entry(i, names + i); | |
724 | } | |
725 | ||
01904572 LT |
726 | static int unpack_callback(int n, unsigned long mask, unsigned long dirmask, struct name_entry *names, struct traverse_info *info) |
727 | { | |
c7cddc1a | 728 | struct cache_entry *src[MAX_UNPACK_TREES + 1] = { NULL, }; |
01904572 | 729 | struct unpack_trees_options *o = info->data; |
01904572 LT |
730 | const struct name_entry *p = names; |
731 | ||
732 | /* Find first entry with a real name (we could use "mask" too) */ | |
733 | while (!p->mode) | |
734 | p++; | |
735 | ||
ba655da5 JH |
736 | if (o->debug_unpack) |
737 | debug_unpack_callback(n, mask, dirmask, names, info); | |
738 | ||
01904572 LT |
739 | /* Are we supposed to look at the index too? */ |
740 | if (o->merge) { | |
da165f47 | 741 | while (1) { |
da165f47 | 742 | int cmp; |
730f7284 JH |
743 | struct cache_entry *ce; |
744 | ||
745 | if (o->diff_index_cached) | |
746 | ce = next_cache_entry(o); | |
747 | else | |
748 | ce = find_cache_entry(info, p); | |
749 | ||
da165f47 JH |
750 | if (!ce) |
751 | break; | |
752 | cmp = compare_entry(ce, info, p); | |
01904572 LT |
753 | if (cmp < 0) { |
754 | if (unpack_index_entry(ce, o) < 0) | |
353c5eeb | 755 | return unpack_failed(o, NULL); |
01904572 LT |
756 | continue; |
757 | } | |
758 | if (!cmp) { | |
759 | if (ce_stage(ce)) { | |
760 | /* | |
da165f47 JH |
761 | * If we skip unmerged index |
762 | * entries, we'll skip this | |
763 | * entry *and* the tree | |
764 | * entries associated with it! | |
01904572 | 765 | */ |
34110cd4 | 766 | if (o->skip_unmerged) { |
da165f47 | 767 | add_same_unmerged(ce, o); |
01904572 | 768 | return mask; |
34110cd4 | 769 | } |
01904572 LT |
770 | } |
771 | src[0] = ce; | |
01904572 LT |
772 | } |
773 | break; | |
774 | } | |
775 | } | |
776 | ||
34110cd4 | 777 | if (unpack_nondirectories(n, mask, dirmask, src, names, info) < 0) |
01904572 LT |
778 | return -1; |
779 | ||
da165f47 JH |
780 | if (src[0]) { |
781 | if (ce_stage(src[0])) | |
782 | mark_ce_used_same_name(src[0], o); | |
783 | else | |
784 | mark_ce_used(src[0], o); | |
785 | } | |
786 | ||
01904572 LT |
787 | /* Now handle any directories.. */ |
788 | if (dirmask) { | |
789 | unsigned long conflicts = mask & ~dirmask; | |
790 | if (o->merge) { | |
791 | conflicts <<= 1; | |
792 | if (src[0]) | |
793 | conflicts |= 1; | |
794 | } | |
b65982b6 JH |
795 | |
796 | /* special case: "diff-index --cached" looking at a tree */ | |
797 | if (o->diff_index_cached && | |
798 | n == 1 && dirmask == 1 && S_ISDIR(names->mode)) { | |
799 | int matches; | |
800 | matches = cache_tree_matches_traversal(o->src_index->cache_tree, | |
801 | names, info); | |
802 | /* | |
da165f47 JH |
803 | * Everything under the name matches; skip the |
804 | * entire hierarchy. diff_index_cached codepath | |
805 | * special cases D/F conflicts in such a way that | |
806 | * it does not do any look-ahead, so this is safe. | |
b65982b6 JH |
807 | */ |
808 | if (matches) { | |
da165f47 | 809 | o->cache_bottom += matches; |
b65982b6 JH |
810 | return mask; |
811 | } | |
812 | } | |
813 | ||
542c264b JH |
814 | if (traverse_trees_recursive(n, dirmask, conflicts, |
815 | names, info) < 0) | |
816 | return -1; | |
01904572 LT |
817 | return mask; |
818 | } | |
819 | ||
820 | return mask; | |
821 | } | |
822 | ||
2e2b887d JH |
823 | /* |
824 | * N-way merge "len" trees. Returns 0 on success, -1 on failure to manipulate the | |
825 | * resulting index, -2 on failure to reflect the changes to the work tree. | |
826 | */ | |
01904572 LT |
827 | int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options *o) |
828 | { | |
e800ec9d | 829 | int i, ret; |
0fb1eaa8 | 830 | static struct cache_entry *dfc; |
08aefc9e | 831 | struct exclude_list el; |
16da134b | 832 | |
ca885a4f JH |
833 | if (len > MAX_UNPACK_TREES) |
834 | die("unpack_trees takes at most %d trees", MAX_UNPACK_TREES); | |
076b0adc | 835 | memset(&state, 0, sizeof(state)); |
16da134b JS |
836 | state.base_dir = ""; |
837 | state.force = 1; | |
838 | state.quiet = 1; | |
839 | state.refresh_cache = 1; | |
840 | ||
08aefc9e NTND |
841 | memset(&el, 0, sizeof(el)); |
842 | if (!core_apply_sparse_checkout || !o->update) | |
843 | o->skip_sparse_checkout = 1; | |
844 | if (!o->skip_sparse_checkout) { | |
845 | if (add_excludes_from_file_to_list(git_path("info/sparse-checkout"), "", 0, NULL, &el, 0) < 0) | |
846 | o->skip_sparse_checkout = 1; | |
847 | else | |
848 | o->el = ⪙ | |
849 | } | |
850 | ||
34110cd4 | 851 | memset(&o->result, 0, sizeof(o->result)); |
913e0e99 | 852 | o->result.initialized = 1; |
da165f47 JH |
853 | o->result.timestamp.sec = o->src_index->timestamp.sec; |
854 | o->result.timestamp.nsec = o->src_index->timestamp.nsec; | |
16da134b | 855 | o->merge_size = len; |
da165f47 | 856 | mark_all_ce_unused(o->src_index); |
0fb1eaa8 JH |
857 | |
858 | if (!dfc) | |
13494ed1 | 859 | dfc = xcalloc(1, cache_entry_size(0)); |
0fb1eaa8 | 860 | o->df_conflict_entry = dfc; |
16da134b JS |
861 | |
862 | if (len) { | |
01904572 LT |
863 | const char *prefix = o->prefix ? o->prefix : ""; |
864 | struct traverse_info info; | |
865 | ||
866 | setup_traverse_info(&info, prefix); | |
867 | info.fn = unpack_callback; | |
868 | info.data = o; | |
e6c111b4 | 869 | info.show_all_errors = o->show_all_errors; |
01904572 | 870 | |
da165f47 JH |
871 | if (o->prefix) { |
872 | /* | |
873 | * Unpack existing index entries that sort before the | |
874 | * prefix the tree is spliced into. Note that o->merge | |
875 | * is always true in this case. | |
876 | */ | |
877 | while (1) { | |
878 | struct cache_entry *ce = next_cache_entry(o); | |
879 | if (!ce) | |
880 | break; | |
881 | if (ce_in_traverse_path(ce, &info)) | |
882 | break; | |
883 | if (unpack_index_entry(ce, o) < 0) | |
884 | goto return_failed; | |
885 | } | |
08aefc9e | 886 | } |
da165f47 | 887 | |
01904572 | 888 | if (traverse_trees(len, t, &info) < 0) |
da165f47 | 889 | goto return_failed; |
16da134b JS |
890 | } |
891 | ||
01904572 LT |
892 | /* Any left-over entries in the index? */ |
893 | if (o->merge) { | |
da165f47 JH |
894 | while (1) { |
895 | struct cache_entry *ce = next_cache_entry(o); | |
896 | if (!ce) | |
897 | break; | |
01904572 | 898 | if (unpack_index_entry(ce, o) < 0) |
da165f47 | 899 | goto return_failed; |
17e46426 | 900 | } |
17e46426 | 901 | } |
da165f47 | 902 | mark_all_ce_unused(o->src_index); |
16da134b | 903 | |
08aefc9e NTND |
904 | if (o->trivial_merges_only && o->nontrivial_merge) { |
905 | ret = unpack_failed(o, "Merge requires file-level merging"); | |
906 | goto done; | |
907 | } | |
01904572 | 908 | |
e800ec9d | 909 | if (!o->skip_sparse_checkout) { |
9e1afb16 | 910 | int empty_worktree = 1; |
e800ec9d NTND |
911 | for (i = 0;i < o->result.cache_nr;i++) { |
912 | struct cache_entry *ce = o->result.cache[i]; | |
913 | ||
914 | if (apply_sparse_checkout(ce, o)) { | |
915 | ret = -1; | |
916 | goto done; | |
917 | } | |
eec3fc03 | 918 | if (!ce_skip_worktree(ce)) |
9e1afb16 | 919 | empty_worktree = 0; |
f1f523ea | 920 | |
e800ec9d | 921 | } |
9e1afb16 NTND |
922 | if (o->result.cache_nr && empty_worktree) { |
923 | ret = unpack_failed(o, "Sparse checkout leaves no entry on working directory"); | |
924 | goto done; | |
925 | } | |
e800ec9d | 926 | } |
01904572 | 927 | |
34110cd4 | 928 | o->src_index = NULL; |
2e2b887d | 929 | ret = check_updates(o) ? (-2) : 0; |
34110cd4 LT |
930 | if (o->dst_index) |
931 | *o->dst_index = o->result; | |
08aefc9e NTND |
932 | |
933 | done: | |
934 | for (i = 0;i < el.nr;i++) | |
935 | free(el.excludes[i]); | |
936 | if (el.excludes) | |
937 | free(el.excludes); | |
938 | ||
2e2b887d | 939 | return ret; |
da165f47 JH |
940 | |
941 | return_failed: | |
e6c111b4 MM |
942 | if (o->show_all_errors) |
943 | display_error_msgs(o); | |
da165f47 | 944 | mark_all_ce_unused(o->src_index); |
026680f8 JH |
945 | ret = unpack_failed(o, NULL); |
946 | goto done; | |
16da134b | 947 | } |
076b0adc JS |
948 | |
949 | /* Here come the merge functions */ | |
950 | ||
8ccba008 | 951 | static int reject_merge(struct cache_entry *ce, struct unpack_trees_options *o) |
076b0adc | 952 | { |
e6c111b4 | 953 | return add_rejected_path(o, ERROR_WOULD_OVERWRITE, ce->name); |
076b0adc JS |
954 | } |
955 | ||
956 | static int same(struct cache_entry *a, struct cache_entry *b) | |
957 | { | |
958 | if (!!a != !!b) | |
959 | return 0; | |
960 | if (!a && !b) | |
961 | return 1; | |
e11d7b59 JH |
962 | if ((a->ce_flags | b->ce_flags) & CE_CONFLICTED) |
963 | return 0; | |
076b0adc | 964 | return a->ce_mode == b->ce_mode && |
a89fccd2 | 965 | !hashcmp(a->sha1, b->sha1); |
076b0adc JS |
966 | } |
967 | ||
968 | ||
969 | /* | |
970 | * When a CE gets turned into an unmerged entry, we | |
971 | * want it to be up-to-date | |
972 | */ | |
35a5aa79 NTND |
973 | static int verify_uptodate_1(struct cache_entry *ce, |
974 | struct unpack_trees_options *o, | |
08402b04 | 975 | enum unpack_trees_error_types error_type) |
076b0adc JS |
976 | { |
977 | struct stat st; | |
978 | ||
aecda37c | 979 | if (o->index_only || (!((ce->ce_flags & CE_VALID) || ce_skip_worktree(ce)) && (o->reset || ce_uptodate(ce)))) |
203a2fe1 | 980 | return 0; |
076b0adc JS |
981 | |
982 | if (!lstat(ce->name, &st)) { | |
56cac48c | 983 | unsigned changed = ie_match_stat(o->src_index, ce, &st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE); |
076b0adc | 984 | if (!changed) |
203a2fe1 | 985 | return 0; |
936492d3 JH |
986 | /* |
987 | * NEEDSWORK: the current default policy is to allow | |
988 | * submodule to be out of sync wrt the supermodule | |
989 | * index. This needs to be tightened later for | |
990 | * submodules that are marked to be automatically | |
991 | * checked out. | |
992 | */ | |
7a51ed66 | 993 | if (S_ISGITLINK(ce->ce_mode)) |
203a2fe1 | 994 | return 0; |
076b0adc JS |
995 | errno = 0; |
996 | } | |
076b0adc | 997 | if (errno == ENOENT) |
203a2fe1 | 998 | return 0; |
17e46426 | 999 | return o->gently ? -1 : |
e6c111b4 | 1000 | add_rejected_path(o, error_type, ce->name); |
35a5aa79 NTND |
1001 | } |
1002 | ||
1003 | static int verify_uptodate(struct cache_entry *ce, | |
1004 | struct unpack_trees_options *o) | |
1005 | { | |
f1f523ea NTND |
1006 | if (!o->skip_sparse_checkout && will_have_skip_worktree(ce, o)) |
1007 | return 0; | |
08402b04 | 1008 | return verify_uptodate_1(ce, o, ERROR_NOT_UPTODATE_FILE); |
076b0adc JS |
1009 | } |
1010 | ||
e800ec9d NTND |
1011 | static int verify_uptodate_sparse(struct cache_entry *ce, |
1012 | struct unpack_trees_options *o) | |
1013 | { | |
08402b04 | 1014 | return verify_uptodate_1(ce, o, ERROR_SPARSE_NOT_UPTODATE_FILE); |
076b0adc JS |
1015 | } |
1016 | ||
bc052d7f | 1017 | static void invalidate_ce_path(struct cache_entry *ce, struct unpack_trees_options *o) |
076b0adc JS |
1018 | { |
1019 | if (ce) | |
34110cd4 | 1020 | cache_tree_invalidate_path(o->src_index->cache_tree, ce->name); |
076b0adc JS |
1021 | } |
1022 | ||
0cf73755 SV |
1023 | /* |
1024 | * Check that checking out ce->sha1 in subdir ce->name is not | |
1025 | * going to overwrite any working files. | |
1026 | * | |
1027 | * Currently, git does not checkout subprojects during a superproject | |
1028 | * checkout, so it is not going to overwrite anything. | |
1029 | */ | |
08402b04 MM |
1030 | static int verify_clean_submodule(struct cache_entry *ce, |
1031 | enum unpack_trees_error_types error_type, | |
0cf73755 SV |
1032 | struct unpack_trees_options *o) |
1033 | { | |
1034 | return 0; | |
1035 | } | |
1036 | ||
08402b04 MM |
1037 | static int verify_clean_subdirectory(struct cache_entry *ce, |
1038 | enum unpack_trees_error_types error_type, | |
c8193534 JH |
1039 | struct unpack_trees_options *o) |
1040 | { | |
1041 | /* | |
0cf73755 | 1042 | * we are about to extract "ce->name"; we would not want to lose |
c8193534 JH |
1043 | * anything in the existing directory there. |
1044 | */ | |
1045 | int namelen; | |
7b9e3ce0 | 1046 | int i; |
c8193534 JH |
1047 | struct dir_struct d; |
1048 | char *pathbuf; | |
1049 | int cnt = 0; | |
0cf73755 SV |
1050 | unsigned char sha1[20]; |
1051 | ||
7a51ed66 | 1052 | if (S_ISGITLINK(ce->ce_mode) && |
0cf73755 SV |
1053 | resolve_gitlink_ref(ce->name, "HEAD", sha1) == 0) { |
1054 | /* If we are not going to update the submodule, then | |
1055 | * we don't care. | |
1056 | */ | |
1057 | if (!hashcmp(sha1, ce->sha1)) | |
1058 | return 0; | |
08402b04 | 1059 | return verify_clean_submodule(ce, error_type, o); |
0cf73755 | 1060 | } |
c8193534 JH |
1061 | |
1062 | /* | |
1063 | * First let's make sure we do not have a local modification | |
1064 | * in that directory. | |
1065 | */ | |
0cf73755 | 1066 | namelen = strlen(ce->name); |
da165f47 JH |
1067 | for (i = locate_in_src_index(ce, o); |
1068 | i < o->src_index->cache_nr; | |
1069 | i++) { | |
837e5fe9 CB |
1070 | struct cache_entry *ce2 = o->src_index->cache[i]; |
1071 | int len = ce_namelen(ce2); | |
c8193534 | 1072 | if (len < namelen || |
837e5fe9 CB |
1073 | strncmp(ce->name, ce2->name, namelen) || |
1074 | ce2->name[namelen] != '/') | |
c8193534 JH |
1075 | break; |
1076 | /* | |
da165f47 JH |
1077 | * ce2->name is an entry in the subdirectory to be |
1078 | * removed. | |
c8193534 | 1079 | */ |
837e5fe9 CB |
1080 | if (!ce_stage(ce2)) { |
1081 | if (verify_uptodate(ce2, o)) | |
203a2fe1 | 1082 | return -1; |
837e5fe9 | 1083 | add_entry(o, ce2, CE_REMOVE, 0); |
da165f47 | 1084 | mark_ce_used(ce2, o); |
c8193534 JH |
1085 | } |
1086 | cnt++; | |
1087 | } | |
1088 | ||
1089 | /* | |
1090 | * Then we need to make sure that we do not lose a locally | |
1091 | * present file that is not ignored. | |
1092 | */ | |
1093 | pathbuf = xmalloc(namelen + 2); | |
0cf73755 | 1094 | memcpy(pathbuf, ce->name, namelen); |
c8193534 JH |
1095 | strcpy(pathbuf+namelen, "/"); |
1096 | ||
1097 | memset(&d, 0, sizeof(d)); | |
1098 | if (o->dir) | |
1099 | d.exclude_per_dir = o->dir->exclude_per_dir; | |
dba2e203 | 1100 | i = read_directory(&d, pathbuf, namelen+1, NULL); |
c8193534 | 1101 | if (i) |
17e46426 | 1102 | return o->gently ? -1 : |
e6c111b4 | 1103 | add_rejected_path(o, ERROR_NOT_UPTODATE_DIR, ce->name); |
c8193534 JH |
1104 | free(pathbuf); |
1105 | return cnt; | |
1106 | } | |
1107 | ||
32260ad5 LT |
1108 | /* |
1109 | * This gets called when there was no index entry for the tree entry 'dst', | |
1110 | * but we found a file in the working tree that 'lstat()' said was fine, | |
1111 | * and we're on a case-insensitive filesystem. | |
1112 | * | |
1113 | * See if we can find a case-insensitive match in the index that also | |
1114 | * matches the stat information, and assume it's that other file! | |
1115 | */ | |
a9307f5a | 1116 | static int icase_exists(struct unpack_trees_options *o, const char *name, int len, struct stat *st) |
32260ad5 LT |
1117 | { |
1118 | struct cache_entry *src; | |
1119 | ||
a9307f5a | 1120 | src = index_name_exists(o->src_index, name, len, 1); |
56cac48c | 1121 | return src && !ie_match_stat(o->src_index, src, st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE); |
32260ad5 LT |
1122 | } |
1123 | ||
a9307f5a CB |
1124 | static int check_ok_to_remove(const char *name, int len, int dtype, |
1125 | struct cache_entry *ce, struct stat *st, | |
1126 | enum unpack_trees_error_types error_type, | |
1127 | struct unpack_trees_options *o) | |
1128 | { | |
1129 | struct cache_entry *result; | |
1130 | ||
1131 | /* | |
1132 | * It may be that the 'lstat()' succeeded even though | |
1133 | * target 'ce' was absent, because there is an old | |
1134 | * entry that is different only in case.. | |
1135 | * | |
1136 | * Ignore that lstat() if it matches. | |
1137 | */ | |
1138 | if (ignore_case && icase_exists(o, name, len, st)) | |
1139 | return 0; | |
1140 | ||
1141 | if (o->dir && excluded(o->dir, name, &dtype)) | |
1142 | /* | |
1143 | * ce->name is explicitly excluded, so it is Ok to | |
1144 | * overwrite it. | |
1145 | */ | |
1146 | return 0; | |
1147 | if (S_ISDIR(st->st_mode)) { | |
1148 | /* | |
1149 | * We are checking out path "foo" and | |
1150 | * found "foo/." in the working tree. | |
1151 | * This is tricky -- if we have modified | |
1152 | * files that are in "foo/" we would lose | |
1153 | * them. | |
1154 | */ | |
1155 | if (verify_clean_subdirectory(ce, error_type, o) < 0) | |
1156 | return -1; | |
1157 | return 0; | |
1158 | } | |
1159 | ||
1160 | /* | |
1161 | * The previous round may already have decided to | |
1162 | * delete this path, which is in a subdirectory that | |
1163 | * is being replaced with a blob. | |
1164 | */ | |
1165 | result = index_name_exists(&o->result, name, len, 0); | |
1166 | if (result) { | |
1167 | if (result->ce_flags & CE_REMOVE) | |
1168 | return 0; | |
1169 | } | |
1170 | ||
1171 | return o->gently ? -1 : | |
1172 | add_rejected_path(o, error_type, name); | |
1173 | } | |
1174 | ||
076b0adc JS |
1175 | /* |
1176 | * We do not want to remove or overwrite a working tree file that | |
f8a9d428 | 1177 | * is not tracked, unless it is ignored. |
076b0adc | 1178 | */ |
08402b04 MM |
1179 | static int verify_absent_1(struct cache_entry *ce, |
1180 | enum unpack_trees_error_types error_type, | |
1181 | struct unpack_trees_options *o) | |
076b0adc | 1182 | { |
f66caaf9 | 1183 | int len; |
076b0adc JS |
1184 | struct stat st; |
1185 | ||
1186 | if (o->index_only || o->reset || !o->update) | |
203a2fe1 | 1187 | return 0; |
c8193534 | 1188 | |
f66caaf9 CB |
1189 | len = check_leading_path(ce->name, ce_namelen(ce)); |
1190 | if (!len) | |
203a2fe1 | 1191 | return 0; |
f66caaf9 CB |
1192 | else if (len > 0) { |
1193 | char path[PATH_MAX + 1]; | |
1194 | memcpy(path, ce->name, len); | |
1195 | path[len] = 0; | |
1196 | lstat(path, &st); | |
ec0603e1 | 1197 | |
f66caaf9 CB |
1198 | return check_ok_to_remove(path, len, DT_UNKNOWN, NULL, &st, |
1199 | error_type, o); | |
1200 | } else if (!lstat(ce->name, &st)) | |
a9307f5a CB |
1201 | return check_ok_to_remove(ce->name, ce_namelen(ce), |
1202 | ce_to_dtype(ce), ce, &st, | |
1203 | error_type, o); | |
f66caaf9 | 1204 | |
203a2fe1 | 1205 | return 0; |
076b0adc | 1206 | } |
a9307f5a | 1207 | |
08402b04 MM |
1208 | static int verify_absent(struct cache_entry *ce, |
1209 | enum unpack_trees_error_types error_type, | |
35a5aa79 NTND |
1210 | struct unpack_trees_options *o) |
1211 | { | |
f1f523ea NTND |
1212 | if (!o->skip_sparse_checkout && will_have_skip_worktree(ce, o)) |
1213 | return 0; | |
08402b04 | 1214 | return verify_absent_1(ce, error_type, o); |
35a5aa79 | 1215 | } |
076b0adc | 1216 | |
08402b04 MM |
1217 | static int verify_absent_sparse(struct cache_entry *ce, |
1218 | enum unpack_trees_error_types error_type, | |
e800ec9d NTND |
1219 | struct unpack_trees_options *o) |
1220 | { | |
08402b04 MM |
1221 | enum unpack_trees_error_types orphaned_error = error_type; |
1222 | if (orphaned_error == ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN) | |
1223 | orphaned_error = ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN; | |
1224 | ||
1225 | return verify_absent_1(ce, orphaned_error, o); | |
e800ec9d | 1226 | } |
076b0adc JS |
1227 | |
1228 | static int merged_entry(struct cache_entry *merge, struct cache_entry *old, | |
1229 | struct unpack_trees_options *o) | |
1230 | { | |
7f8ab8dc LT |
1231 | int update = CE_UPDATE; |
1232 | ||
e11d7b59 | 1233 | if (!old) { |
08402b04 | 1234 | if (verify_absent(merge, ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN, o)) |
e11d7b59 | 1235 | return -1; |
74da98f9 NTND |
1236 | if (!o->skip_sparse_checkout && will_have_skip_worktree(merge, o)) |
1237 | update |= CE_SKIP_WORKTREE; | |
e11d7b59 JH |
1238 | invalidate_ce_path(merge, o); |
1239 | } else if (!(old->ce_flags & CE_CONFLICTED)) { | |
076b0adc JS |
1240 | /* |
1241 | * See if we can re-use the old CE directly? | |
1242 | * That way we get the uptodate stat info. | |
1243 | * | |
7f8ab8dc LT |
1244 | * This also removes the UPDATE flag on a match; otherwise |
1245 | * we will end up overwriting local changes in the work tree. | |
076b0adc JS |
1246 | */ |
1247 | if (same(old, merge)) { | |
eb7a2f1d | 1248 | copy_cache_entry(merge, old); |
7f8ab8dc | 1249 | update = 0; |
076b0adc | 1250 | } else { |
203a2fe1 DB |
1251 | if (verify_uptodate(old, o)) |
1252 | return -1; | |
32f54ca3 NTND |
1253 | if (ce_skip_worktree(old)) |
1254 | update |= CE_SKIP_WORKTREE; | |
bc052d7f | 1255 | invalidate_ce_path(old, o); |
076b0adc | 1256 | } |
e11d7b59 JH |
1257 | } else { |
1258 | /* | |
1259 | * Previously unmerged entry left as an existence | |
1260 | * marker by read_index_unmerged(); | |
1261 | */ | |
1262 | invalidate_ce_path(old, o); | |
076b0adc JS |
1263 | } |
1264 | ||
7f8ab8dc | 1265 | add_entry(o, merge, update, CE_STAGEMASK); |
076b0adc JS |
1266 | return 1; |
1267 | } | |
1268 | ||
1269 | static int deleted_entry(struct cache_entry *ce, struct cache_entry *old, | |
1270 | struct unpack_trees_options *o) | |
1271 | { | |
34110cd4 LT |
1272 | /* Did it exist in the index? */ |
1273 | if (!old) { | |
08402b04 | 1274 | if (verify_absent(ce, ERROR_WOULD_LOSE_UNTRACKED_REMOVED, o)) |
203a2fe1 | 1275 | return -1; |
34110cd4 LT |
1276 | return 0; |
1277 | } | |
e11d7b59 | 1278 | if (!(old->ce_flags & CE_CONFLICTED) && verify_uptodate(old, o)) |
34110cd4 LT |
1279 | return -1; |
1280 | add_entry(o, ce, CE_REMOVE, 0); | |
bc052d7f | 1281 | invalidate_ce_path(ce, o); |
076b0adc JS |
1282 | return 1; |
1283 | } | |
1284 | ||
7f7932ab | 1285 | static int keep_entry(struct cache_entry *ce, struct unpack_trees_options *o) |
076b0adc | 1286 | { |
34110cd4 | 1287 | add_entry(o, ce, 0, 0); |
076b0adc JS |
1288 | return 1; |
1289 | } | |
1290 | ||
1291 | #if DBRT_DEBUG | |
1292 | static void show_stage_entry(FILE *o, | |
1293 | const char *label, const struct cache_entry *ce) | |
1294 | { | |
1295 | if (!ce) | |
1296 | fprintf(o, "%s (missing)\n", label); | |
1297 | else | |
1298 | fprintf(o, "%s%06o %s %d\t%s\n", | |
1299 | label, | |
7a51ed66 | 1300 | ce->ce_mode, |
076b0adc JS |
1301 | sha1_to_hex(ce->sha1), |
1302 | ce_stage(ce), | |
1303 | ce->name); | |
1304 | } | |
1305 | #endif | |
1306 | ||
34110cd4 | 1307 | int threeway_merge(struct cache_entry **stages, struct unpack_trees_options *o) |
076b0adc JS |
1308 | { |
1309 | struct cache_entry *index; | |
1310 | struct cache_entry *head; | |
1311 | struct cache_entry *remote = stages[o->head_idx + 1]; | |
1312 | int count; | |
1313 | int head_match = 0; | |
1314 | int remote_match = 0; | |
076b0adc JS |
1315 | |
1316 | int df_conflict_head = 0; | |
1317 | int df_conflict_remote = 0; | |
1318 | ||
1319 | int any_anc_missing = 0; | |
1320 | int no_anc_exists = 1; | |
1321 | int i; | |
1322 | ||
1323 | for (i = 1; i < o->head_idx; i++) { | |
4c4caafc | 1324 | if (!stages[i] || stages[i] == o->df_conflict_entry) |
076b0adc | 1325 | any_anc_missing = 1; |
4c4caafc | 1326 | else |
076b0adc | 1327 | no_anc_exists = 0; |
076b0adc JS |
1328 | } |
1329 | ||
1330 | index = stages[0]; | |
1331 | head = stages[o->head_idx]; | |
1332 | ||
1333 | if (head == o->df_conflict_entry) { | |
1334 | df_conflict_head = 1; | |
1335 | head = NULL; | |
1336 | } | |
1337 | ||
1338 | if (remote == o->df_conflict_entry) { | |
1339 | df_conflict_remote = 1; | |
1340 | remote = NULL; | |
1341 | } | |
1342 | ||
cee2d6ae JH |
1343 | /* |
1344 | * First, if there's a #16 situation, note that to prevent #13 | |
076b0adc JS |
1345 | * and #14. |
1346 | */ | |
1347 | if (!same(remote, head)) { | |
1348 | for (i = 1; i < o->head_idx; i++) { | |
1349 | if (same(stages[i], head)) { | |
1350 | head_match = i; | |
1351 | } | |
1352 | if (same(stages[i], remote)) { | |
1353 | remote_match = i; | |
1354 | } | |
1355 | } | |
1356 | } | |
1357 | ||
cee2d6ae JH |
1358 | /* |
1359 | * We start with cases where the index is allowed to match | |
076b0adc JS |
1360 | * something other than the head: #14(ALT) and #2ALT, where it |
1361 | * is permitted to match the result instead. | |
1362 | */ | |
1363 | /* #14, #14ALT, #2ALT */ | |
1364 | if (remote && !df_conflict_head && head_match && !remote_match) { | |
1365 | if (index && !same(index, remote) && !same(index, head)) | |
8ccba008 | 1366 | return o->gently ? -1 : reject_merge(index, o); |
076b0adc JS |
1367 | return merged_entry(remote, index, o); |
1368 | } | |
1369 | /* | |
1370 | * If we have an entry in the index cache, then we want to | |
1371 | * make sure that it matches head. | |
1372 | */ | |
4e7c4571 | 1373 | if (index && !same(index, head)) |
8ccba008 | 1374 | return o->gently ? -1 : reject_merge(index, o); |
076b0adc JS |
1375 | |
1376 | if (head) { | |
1377 | /* #5ALT, #15 */ | |
1378 | if (same(head, remote)) | |
1379 | return merged_entry(head, index, o); | |
1380 | /* #13, #3ALT */ | |
1381 | if (!df_conflict_remote && remote_match && !head_match) | |
1382 | return merged_entry(head, index, o); | |
1383 | } | |
1384 | ||
1385 | /* #1 */ | |
34110cd4 | 1386 | if (!head && !remote && any_anc_missing) |
076b0adc JS |
1387 | return 0; |
1388 | ||
cee2d6ae JH |
1389 | /* |
1390 | * Under the "aggressive" rule, we resolve mostly trivial | |
076b0adc JS |
1391 | * cases that we historically had git-merge-one-file resolve. |
1392 | */ | |
1393 | if (o->aggressive) { | |
cee2d6ae JH |
1394 | int head_deleted = !head; |
1395 | int remote_deleted = !remote; | |
0cf73755 | 1396 | struct cache_entry *ce = NULL; |
4c4caafc JH |
1397 | |
1398 | if (index) | |
0cf73755 | 1399 | ce = index; |
4c4caafc | 1400 | else if (head) |
0cf73755 | 1401 | ce = head; |
4c4caafc | 1402 | else if (remote) |
0cf73755 | 1403 | ce = remote; |
4c4caafc JH |
1404 | else { |
1405 | for (i = 1; i < o->head_idx; i++) { | |
1406 | if (stages[i] && stages[i] != o->df_conflict_entry) { | |
0cf73755 | 1407 | ce = stages[i]; |
4c4caafc JH |
1408 | break; |
1409 | } | |
1410 | } | |
1411 | } | |
1412 | ||
076b0adc JS |
1413 | /* |
1414 | * Deleted in both. | |
1415 | * Deleted in one and unchanged in the other. | |
1416 | */ | |
1417 | if ((head_deleted && remote_deleted) || | |
1418 | (head_deleted && remote && remote_match) || | |
1419 | (remote_deleted && head && head_match)) { | |
1420 | if (index) | |
1421 | return deleted_entry(index, index, o); | |
34110cd4 | 1422 | if (ce && !head_deleted) { |
08402b04 | 1423 | if (verify_absent(ce, ERROR_WOULD_LOSE_UNTRACKED_REMOVED, o)) |
203a2fe1 DB |
1424 | return -1; |
1425 | } | |
076b0adc JS |
1426 | return 0; |
1427 | } | |
1428 | /* | |
1429 | * Added in both, identically. | |
1430 | */ | |
1431 | if (no_anc_exists && head && remote && same(head, remote)) | |
1432 | return merged_entry(head, index, o); | |
1433 | ||
1434 | } | |
1435 | ||
1436 | /* Below are "no merge" cases, which require that the index be | |
1437 | * up-to-date to avoid the files getting overwritten with | |
1438 | * conflict resolution files. | |
1439 | */ | |
1440 | if (index) { | |
203a2fe1 DB |
1441 | if (verify_uptodate(index, o)) |
1442 | return -1; | |
076b0adc | 1443 | } |
076b0adc JS |
1444 | |
1445 | o->nontrivial_merge = 1; | |
1446 | ||
ea4b52a8 | 1447 | /* #2, #3, #4, #6, #7, #9, #10, #11. */ |
076b0adc JS |
1448 | count = 0; |
1449 | if (!head_match || !remote_match) { | |
1450 | for (i = 1; i < o->head_idx; i++) { | |
4c4caafc | 1451 | if (stages[i] && stages[i] != o->df_conflict_entry) { |
7f7932ab | 1452 | keep_entry(stages[i], o); |
076b0adc JS |
1453 | count++; |
1454 | break; | |
1455 | } | |
1456 | } | |
1457 | } | |
1458 | #if DBRT_DEBUG | |
1459 | else { | |
1460 | fprintf(stderr, "read-tree: warning #16 detected\n"); | |
1461 | show_stage_entry(stderr, "head ", stages[head_match]); | |
1462 | show_stage_entry(stderr, "remote ", stages[remote_match]); | |
1463 | } | |
1464 | #endif | |
7f7932ab JH |
1465 | if (head) { count += keep_entry(head, o); } |
1466 | if (remote) { count += keep_entry(remote, o); } | |
076b0adc JS |
1467 | return count; |
1468 | } | |
1469 | ||
1470 | /* | |
1471 | * Two-way merge. | |
1472 | * | |
1473 | * The rule is to "carry forward" what is in the index without losing | |
a75d7b54 | 1474 | * information across a "fast-forward", favoring a successful merge |
076b0adc JS |
1475 | * over a merge failure when it makes sense. For details of the |
1476 | * "carry forward" rule, please see <Documentation/git-read-tree.txt>. | |
1477 | * | |
1478 | */ | |
34110cd4 | 1479 | int twoway_merge(struct cache_entry **src, struct unpack_trees_options *o) |
076b0adc JS |
1480 | { |
1481 | struct cache_entry *current = src[0]; | |
b8ba1535 JH |
1482 | struct cache_entry *oldtree = src[1]; |
1483 | struct cache_entry *newtree = src[2]; | |
076b0adc JS |
1484 | |
1485 | if (o->merge_size != 2) | |
1486 | return error("Cannot do a twoway merge of %d trees", | |
1487 | o->merge_size); | |
1488 | ||
b8ba1535 JH |
1489 | if (oldtree == o->df_conflict_entry) |
1490 | oldtree = NULL; | |
1491 | if (newtree == o->df_conflict_entry) | |
1492 | newtree = NULL; | |
1493 | ||
076b0adc JS |
1494 | if (current) { |
1495 | if ((!oldtree && !newtree) || /* 4 and 5 */ | |
1496 | (!oldtree && newtree && | |
1497 | same(current, newtree)) || /* 6 and 7 */ | |
1498 | (oldtree && newtree && | |
1499 | same(oldtree, newtree)) || /* 14 and 15 */ | |
1500 | (oldtree && newtree && | |
b8ba1535 | 1501 | !same(oldtree, newtree) && /* 18 and 19 */ |
076b0adc | 1502 | same(current, newtree))) { |
7f7932ab | 1503 | return keep_entry(current, o); |
076b0adc JS |
1504 | } |
1505 | else if (oldtree && !newtree && same(current, oldtree)) { | |
1506 | /* 10 or 11 */ | |
1507 | return deleted_entry(oldtree, current, o); | |
1508 | } | |
1509 | else if (oldtree && newtree && | |
1510 | same(current, oldtree) && !same(current, newtree)) { | |
1511 | /* 20 or 21 */ | |
1512 | return merged_entry(newtree, current, o); | |
1513 | } | |
1514 | else { | |
1515 | /* all other failures */ | |
1516 | if (oldtree) | |
8ccba008 | 1517 | return o->gently ? -1 : reject_merge(oldtree, o); |
076b0adc | 1518 | if (current) |
8ccba008 | 1519 | return o->gently ? -1 : reject_merge(current, o); |
076b0adc | 1520 | if (newtree) |
8ccba008 | 1521 | return o->gently ? -1 : reject_merge(newtree, o); |
076b0adc JS |
1522 | return -1; |
1523 | } | |
1524 | } | |
55218834 JH |
1525 | else if (newtree) { |
1526 | if (oldtree && !o->initial_checkout) { | |
1527 | /* | |
1528 | * deletion of the path was staged; | |
1529 | */ | |
1530 | if (same(oldtree, newtree)) | |
1531 | return 1; | |
1532 | return reject_merge(oldtree, o); | |
1533 | } | |
076b0adc | 1534 | return merged_entry(newtree, current, o); |
55218834 | 1535 | } |
d699676d | 1536 | return deleted_entry(oldtree, current, o); |
076b0adc JS |
1537 | } |
1538 | ||
1539 | /* | |
1540 | * Bind merge. | |
1541 | * | |
1542 | * Keep the index entries at stage0, collapse stage1 but make sure | |
1543 | * stage0 does not have anything there. | |
1544 | */ | |
1545 | int bind_merge(struct cache_entry **src, | |
34110cd4 | 1546 | struct unpack_trees_options *o) |
076b0adc JS |
1547 | { |
1548 | struct cache_entry *old = src[0]; | |
1549 | struct cache_entry *a = src[1]; | |
1550 | ||
1551 | if (o->merge_size != 1) | |
1552 | return error("Cannot do a bind merge of %d trees\n", | |
1553 | o->merge_size); | |
1554 | if (a && old) | |
17e46426 | 1555 | return o->gently ? -1 : |
08353ebb | 1556 | error(ERRORMSG(o, ERROR_BIND_OVERLAP), a->name, old->name); |
076b0adc | 1557 | if (!a) |
7f7932ab | 1558 | return keep_entry(old, o); |
076b0adc JS |
1559 | else |
1560 | return merged_entry(a, NULL, o); | |
1561 | } | |
1562 | ||
1563 | /* | |
1564 | * One-way merge. | |
1565 | * | |
1566 | * The rule is: | |
1567 | * - take the stat information from stage0, take the data from stage1 | |
1568 | */ | |
34110cd4 | 1569 | int oneway_merge(struct cache_entry **src, struct unpack_trees_options *o) |
076b0adc JS |
1570 | { |
1571 | struct cache_entry *old = src[0]; | |
1572 | struct cache_entry *a = src[1]; | |
1573 | ||
1574 | if (o->merge_size != 1) | |
1575 | return error("Cannot do a oneway merge of %d trees", | |
1576 | o->merge_size); | |
1577 | ||
78d3b06e | 1578 | if (!a || a == o->df_conflict_entry) |
076b0adc | 1579 | return deleted_entry(old, old, o); |
34110cd4 | 1580 | |
076b0adc | 1581 | if (old && same(old, a)) { |
34110cd4 | 1582 | int update = 0; |
52030836 | 1583 | if (o->reset && !ce_uptodate(old) && !ce_skip_worktree(old)) { |
076b0adc JS |
1584 | struct stat st; |
1585 | if (lstat(old->name, &st) || | |
56cac48c | 1586 | ie_match_stat(o->src_index, old, &st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE)) |
34110cd4 | 1587 | update |= CE_UPDATE; |
076b0adc | 1588 | } |
34110cd4 LT |
1589 | add_entry(o, old, update, 0); |
1590 | return 0; | |
076b0adc JS |
1591 | } |
1592 | return merged_entry(a, old, o); | |
1593 | } |