Use 'unsigned short' for mode, like diff_filespec does
[git/git.git] / merge-recursive.c
CommitLineData
9047ebbc
MV
1/*
2 * Recursive Merge algorithm stolen from git-merge-recursive.py by
3 * Fredrik Kuivinen.
4 * The thieves were Alex Riesen and Johannes Schindelin, in June/July 2006
5 */
6#include "cache.h"
b2141fc1 7#include "config.h"
1c4b6604 8#include "advice.h"
697cc8ef 9#include "lockfile.h"
9047ebbc 10#include "cache-tree.h"
cbd53a21 11#include "object-store.h"
109cd76d 12#include "repository.h"
9047ebbc
MV
13#include "commit.h"
14#include "blob.h"
15#include "builtin.h"
16#include "tree-walk.h"
17#include "diff.h"
18#include "diffcore.h"
19#include "tag.h"
14ba97f8 20#include "alloc.h"
9047ebbc
MV
21#include "unpack-trees.h"
22#include "string-list.h"
23#include "xdiff-interface.h"
24#include "ll-merge.h"
9047ebbc
MV
25#include "attr.h"
26#include "merge-recursive.h"
9800c0df 27#include "dir.h"
68d03e4a 28#include "submodule.h"
18cfc088 29#include "revision.h"
64043556 30#include "commit-reach.h"
9047ebbc 31
fc65b00d
KW
32struct path_hashmap_entry {
33 struct hashmap_entry e;
34 char path[FLEX_ARRAY];
35};
36
37static int path_hashmap_cmp(const void *cmp_data,
38 const void *entry,
39 const void *entry_or_key,
40 const void *keydata)
41{
42 const struct path_hashmap_entry *a = entry;
43 const struct path_hashmap_entry *b = entry_or_key;
44 const char *key = keydata;
45
46 if (ignore_case)
47 return strcasecmp(a->path, key ? key : b->path);
48 else
49 return strcmp(a->path, key ? key : b->path);
50}
51
52static unsigned int path_hash(const char *path)
53{
54 return ignore_case ? strihash(path) : strhash(path);
55}
56
7fe40b88
EN
57static struct dir_rename_entry *dir_rename_find_entry(struct hashmap *hashmap,
58 char *dir)
59{
60 struct dir_rename_entry key;
61
62 if (dir == NULL)
63 return NULL;
64 hashmap_entry_init(&key, strhash(dir));
65 key.dir = dir;
66 return hashmap_get(hashmap, &key, NULL);
67}
68
69static int dir_rename_cmp(const void *unused_cmp_data,
70 const void *entry,
71 const void *entry_or_key,
72 const void *unused_keydata)
73{
74 const struct dir_rename_entry *e1 = entry;
75 const struct dir_rename_entry *e2 = entry_or_key;
76
77 return strcmp(e1->dir, e2->dir);
78}
79
80static void dir_rename_init(struct hashmap *map)
81{
82 hashmap_init(map, dir_rename_cmp, NULL, 0);
83}
84
85static void dir_rename_entry_init(struct dir_rename_entry *entry,
86 char *directory)
87{
88 hashmap_entry_init(entry, strhash(directory));
89 entry->dir = directory;
90 entry->non_unique_new_dir = 0;
91 strbuf_init(&entry->new_dir, 0);
92 string_list_init(&entry->possible_new_dirs, 0);
93}
94
e95ab70a
EN
95static struct collision_entry *collision_find_entry(struct hashmap *hashmap,
96 char *target_file)
97{
98 struct collision_entry key;
99
100 hashmap_entry_init(&key, strhash(target_file));
101 key.target_file = target_file;
102 return hashmap_get(hashmap, &key, NULL);
103}
104
105static int collision_cmp(void *unused_cmp_data,
106 const struct collision_entry *e1,
107 const struct collision_entry *e2,
108 const void *unused_keydata)
109{
110 return strcmp(e1->target_file, e2->target_file);
111}
112
113static void collision_init(struct hashmap *map)
114{
115 hashmap_init(map, (hashmap_cmp_fn) collision_cmp, NULL, 0);
116}
117
bc9204d4
JS
118static void flush_output(struct merge_options *o)
119{
f1e2426b 120 if (o->buffer_output < 2 && o->obuf.len) {
bc9204d4
JS
121 fputs(o->obuf.buf, stdout);
122 strbuf_reset(&o->obuf);
123 }
124}
125
126static int err(struct merge_options *o, const char *err, ...)
127{
128 va_list params;
129
f1e2426b
JS
130 if (o->buffer_output < 2)
131 flush_output(o);
132 else {
133 strbuf_complete(&o->obuf, '\n');
134 strbuf_addstr(&o->obuf, "error: ");
135 }
bc9204d4
JS
136 va_start(params, err);
137 strbuf_vaddf(&o->obuf, err, params);
138 va_end(params);
f1e2426b
JS
139 if (o->buffer_output > 1)
140 strbuf_addch(&o->obuf, '\n');
141 else {
142 error("%s", o->obuf.buf);
143 strbuf_reset(&o->obuf);
144 }
bc9204d4
JS
145
146 return -1;
147}
148
d7cf3a96
NTND
149static struct tree *shift_tree_object(struct repository *repo,
150 struct tree *one, struct tree *two,
85e51b78 151 const char *subtree_shift)
9047ebbc 152{
f2fd0760 153 struct object_id shifted;
9047ebbc 154
85e51b78 155 if (!*subtree_shift) {
82db3d44 156 shift_tree(&one->object.oid, &two->object.oid, &shifted, 0);
85e51b78 157 } else {
82db3d44 158 shift_tree_by(&one->object.oid, &two->object.oid, &shifted,
85e51b78
JH
159 subtree_shift);
160 }
4a7e27e9 161 if (oideq(&two->object.oid, &shifted))
9047ebbc 162 return two;
d7cf3a96 163 return lookup_tree(repo, &shifted);
9047ebbc
MV
164}
165
d7cf3a96
NTND
166static struct commit *make_virtual_commit(struct repository *repo,
167 struct tree *tree,
168 const char *comment)
9047ebbc 169{
d7cf3a96 170 struct commit *commit = alloc_commit_node(repo);
ae8e4c9c 171
a2571653 172 set_merge_remote_desc(commit, comment, (struct object *)commit);
891435d5 173 commit->maybe_tree = tree;
9047ebbc
MV
174 commit->object.parsed = 1;
175 return commit;
176}
177
178/*
179 * Since we use get_tree_entry(), which does not put the read object into
180 * the object pool, we cannot rely on a == b.
181 */
b4da9d62 182static int oid_eq(const struct object_id *a, const struct object_id *b)
9047ebbc
MV
183{
184 if (!a && !b)
185 return 2;
4a7e27e9 186 return a && b && oideq(a, b);
9047ebbc
MV
187}
188
25c39363
EN
189enum rename_type {
190 RENAME_NORMAL = 0,
5455c338 191 RENAME_VIA_DIR,
7f867165 192 RENAME_ADD,
25c39363 193 RENAME_DELETE,
4f66dade 194 RENAME_ONE_FILE_TO_ONE,
461f5041
EN
195 RENAME_ONE_FILE_TO_TWO,
196 RENAME_TWO_FILES_TO_ONE
25c39363
EN
197};
198
4f66dade 199struct rename_conflict_info {
25c39363
EN
200 enum rename_type rename_type;
201 struct diff_filepair *pair1;
202 struct diff_filepair *pair2;
203 const char *branch1;
204 const char *branch2;
205 struct stage_data *dst_entry1;
206 struct stage_data *dst_entry2;
232c635f
EN
207 struct diff_filespec ren1_other;
208 struct diff_filespec ren2_other;
25c39363
EN
209};
210
9047ebbc
MV
211/*
212 * Since we want to write the index eventually, we cannot reuse the index
213 * for these (temporary) data.
214 */
9cba13ca
JN
215struct stage_data {
216 struct {
5ec1e728 217 unsigned short mode;
fd429e98 218 struct object_id oid;
9047ebbc 219 } stages[4];
4f66dade 220 struct rename_conflict_info *rename_conflict_info;
9047ebbc
MV
221 unsigned processed:1;
222};
223
4f66dade
EN
224static inline void setup_rename_conflict_info(enum rename_type rename_type,
225 struct diff_filepair *pair1,
226 struct diff_filepair *pair2,
227 const char *branch1,
228 const char *branch2,
229 struct stage_data *dst_entry1,
232c635f
EN
230 struct stage_data *dst_entry2,
231 struct merge_options *o,
232 struct stage_data *src_entry1,
233 struct stage_data *src_entry2)
25c39363 234{
7f867165 235 int ostage1 = 0, ostage2;
4f445453
EN
236 struct rename_conflict_info *ci;
237
238 /*
239 * When we have two renames involved, it's easiest to get the
240 * correct things into stage 2 and 3, and to make sure that the
241 * content merge puts HEAD before the other branch if we just
242 * ensure that branch1 == o->branch1. So, simply flip arguments
243 * around if we don't have that.
244 */
245 if (dst_entry2 && branch1 != o->branch1) {
246 setup_rename_conflict_info(rename_type,
247 pair2, pair1,
248 branch2, branch1,
249 dst_entry2, dst_entry1,
250 o,
251 src_entry2, src_entry1);
252 return;
253 }
254
255 ci = xcalloc(1, sizeof(struct rename_conflict_info));
25c39363
EN
256 ci->rename_type = rename_type;
257 ci->pair1 = pair1;
258 ci->branch1 = branch1;
259 ci->branch2 = branch2;
260
261 ci->dst_entry1 = dst_entry1;
4f66dade 262 dst_entry1->rename_conflict_info = ci;
25c39363
EN
263 dst_entry1->processed = 0;
264
265 assert(!pair2 == !dst_entry2);
266 if (dst_entry2) {
267 ci->dst_entry2 = dst_entry2;
268 ci->pair2 = pair2;
4f66dade 269 dst_entry2->rename_conflict_info = ci;
25c39363 270 }
232c635f 271
7f867165
EN
272 /*
273 * For each rename, there could have been
274 * modifications on the side of history where that
275 * file was not renamed.
276 */
277 if (rename_type == RENAME_ADD ||
278 rename_type == RENAME_TWO_FILES_TO_ONE) {
279 ostage1 = o->branch1 == branch1 ? 3 : 2;
232c635f
EN
280
281 ci->ren1_other.path = pair1->one->path;
fd429e98 282 oidcpy(&ci->ren1_other.oid, &src_entry1->stages[ostage1].oid);
232c635f 283 ci->ren1_other.mode = src_entry1->stages[ostage1].mode;
7f867165
EN
284 }
285
286 if (rename_type == RENAME_TWO_FILES_TO_ONE) {
287 ostage2 = ostage1 ^ 1;
232c635f
EN
288
289 ci->ren2_other.path = pair2->one->path;
fd429e98 290 oidcpy(&ci->ren2_other.oid, &src_entry2->stages[ostage2].oid);
232c635f 291 ci->ren2_other.mode = src_entry2->stages[ostage2].mode;
25c39363
EN
292 }
293}
294
8a2fce18 295static int show(struct merge_options *o, int v)
9047ebbc 296{
5033639c 297 return (!o->call_depth && o->verbosity >= v) || o->verbosity >= 5;
9047ebbc
MV
298}
299
28bea9e5 300__attribute__((format (printf, 3, 4)))
8a2fce18 301static void output(struct merge_options *o, int v, const char *fmt, ...)
9047ebbc 302{
9047ebbc
MV
303 va_list ap;
304
8a2fce18 305 if (!show(o, v))
9047ebbc
MV
306 return;
307
415792ed 308 strbuf_addchars(&o->obuf, ' ', o->call_depth * 2);
9047ebbc
MV
309
310 va_start(ap, fmt);
ebeb6090 311 strbuf_vaddf(&o->obuf, fmt, ap);
9047ebbc
MV
312 va_end(ap);
313
294b2680 314 strbuf_addch(&o->obuf, '\n');
8a2fce18 315 if (!o->buffer_output)
c7d84924 316 flush_output(o);
9047ebbc
MV
317}
318
5033639c 319static void output_commit_title(struct merge_options *o, struct commit *commit)
9047ebbc 320{
e2e5ac23
NTND
321 struct merge_remote_desc *desc;
322
dde75cb0 323 strbuf_addchars(&o->obuf, ' ', o->call_depth * 2);
e2e5ac23
NTND
324 desc = merge_remote_util(commit);
325 if (desc)
326 strbuf_addf(&o->obuf, "virtual %s\n", desc->name);
9047ebbc 327 else {
30e677e0 328 strbuf_add_unique_abbrev(&o->obuf, &commit->object.oid,
a94bb683
RS
329 DEFAULT_ABBREV);
330 strbuf_addch(&o->obuf, ' ');
9047ebbc 331 if (parse_commit(commit) != 0)
a22ae753 332 strbuf_addstr(&o->obuf, _("(bad commit)\n"));
9047ebbc 333 else {
49b7120e 334 const char *title;
8597ea3a 335 const char *msg = get_commit_buffer(commit, NULL);
bc6b8fc1 336 int len = find_commit_subject(msg, &title);
49b7120e 337 if (len)
dde75cb0 338 strbuf_addf(&o->obuf, "%.*s\n", len, title);
bc6b8fc1 339 unuse_commit_buffer(commit, msg);
9047ebbc
MV
340 }
341 }
dde75cb0 342 flush_output(o);
9047ebbc
MV
343}
344
bc9204d4 345static int add_cacheinfo(struct merge_options *o,
d90e759f
EN
346 unsigned int mode, const struct object_id *oid,
347 const char *path, int stage, int refresh, int options)
9047ebbc 348{
0d6caa2d 349 struct index_state *istate = o->repo->index;
9047ebbc 350 struct cache_entry *ce;
1335d76e
JH
351 int ret;
352
0d6caa2d 353 ce = make_cache_entry(istate, mode, oid ? oid : &null_oid, path, stage, 0);
9047ebbc 354 if (!ce)
fd53b7ff 355 return err(o, _("add_cacheinfo failed for path '%s'; merge aborting."), path);
1335d76e 356
0d6caa2d 357 ret = add_index_entry(istate, ce, options);
1335d76e
JH
358 if (refresh) {
359 struct cache_entry *nce;
360
0d6caa2d
NTND
361 nce = refresh_cache_entry(istate, ce,
362 CE_MATCH_REFRESH | CE_MATCH_IGNORE_MISSING);
55e9f0e5 363 if (!nce)
fd53b7ff 364 return err(o, _("add_cacheinfo failed to refresh for path '%s'; merge aborting."), path);
1335d76e 365 if (nce != ce)
0d6caa2d 366 ret = add_index_entry(istate, nce, options);
1335d76e
JH
367 }
368 return ret;
9047ebbc
MV
369}
370
9047ebbc
MV
371static void init_tree_desc_from_tree(struct tree_desc *desc, struct tree *tree)
372{
373 parse_tree(tree);
374 init_tree_desc(desc, tree->buffer, tree->size);
375}
376
3f1c1c36
EN
377static int unpack_trees_start(struct merge_options *o,
378 struct tree *common,
379 struct tree *head,
380 struct tree *merge)
9047ebbc
MV
381{
382 int rc;
383 struct tree_desc t[3];
a35edc84 384 struct index_state tmp_index = { NULL };
9047ebbc 385
64b1abe9
EN
386 memset(&o->unpack_opts, 0, sizeof(o->unpack_opts));
387 if (o->call_depth)
388 o->unpack_opts.index_only = 1;
9047ebbc 389 else
64b1abe9
EN
390 o->unpack_opts.update = 1;
391 o->unpack_opts.merge = 1;
392 o->unpack_opts.head_idx = 2;
393 o->unpack_opts.fn = threeway_merge;
0d6caa2d 394 o->unpack_opts.src_index = o->repo->index;
a35edc84 395 o->unpack_opts.dst_index = &tmp_index;
6f10a09e 396 o->unpack_opts.aggressive = !merge_detect_rename(o);
64b1abe9 397 setup_unpack_trees_porcelain(&o->unpack_opts, "merge");
9047ebbc
MV
398
399 init_tree_desc_from_tree(t+0, common);
400 init_tree_desc_from_tree(t+1, head);
401 init_tree_desc_from_tree(t+2, merge);
402
64b1abe9 403 rc = unpack_trees(3, t, &o->unpack_opts);
0d6caa2d 404 cache_tree_free(&o->repo->index->cache_tree);
a35edc84 405
64b1abe9 406 /*
0d6caa2d 407 * Update o->repo->index to match the new results, AFTER saving a copy
a35edc84
EN
408 * in o->orig_index. Update src_index to point to the saved copy.
409 * (verify_uptodate() checks src_index, and the original index is
410 * the one that had the necessary modification timestamps.)
64b1abe9 411 */
0d6caa2d
NTND
412 o->orig_index = *o->repo->index;
413 *o->repo->index = tmp_index;
a35edc84
EN
414 o->unpack_opts.src_index = &o->orig_index;
415
9047ebbc
MV
416 return rc;
417}
418
3f1c1c36
EN
419static void unpack_trees_finish(struct merge_options *o)
420{
421 discard_index(&o->orig_index);
1c41d280 422 clear_unpack_trees_porcelain(&o->unpack_opts);
3f1c1c36
EN
423}
424
8a2fce18 425struct tree *write_tree_from_memory(struct merge_options *o)
9047ebbc
MV
426{
427 struct tree *result = NULL;
0d6caa2d 428 struct index_state *istate = o->repo->index;
9047ebbc 429
0d6caa2d 430 if (unmerged_index(istate)) {
9047ebbc 431 int i;
19c6a4f8 432 fprintf(stderr, "BUG: There are unmerged index entries:\n");
0d6caa2d
NTND
433 for (i = 0; i < istate->cache_nr; i++) {
434 const struct cache_entry *ce = istate->cache[i];
9047ebbc 435 if (ce_stage(ce))
c43ba42e 436 fprintf(stderr, "BUG: %d %.*s\n", ce_stage(ce),
19c6a4f8 437 (int)ce_namelen(ce), ce->name);
9047ebbc 438 }
033abf97 439 BUG("unmerged index entries in merge-recursive.c");
9047ebbc
MV
440 }
441
0d6caa2d
NTND
442 if (!istate->cache_tree)
443 istate->cache_tree = cache_tree();
9047ebbc 444
0d6caa2d
NTND
445 if (!cache_tree_fully_valid(istate->cache_tree) &&
446 cache_tree_update(istate, 0) < 0) {
bc9204d4 447 err(o, _("error building trees"));
6003303a
JS
448 return NULL;
449 }
9047ebbc 450
d7cf3a96 451 result = lookup_tree(o->repo, &istate->cache_tree->oid);
9047ebbc
MV
452
453 return result;
454}
455
df46d77e 456static int save_files_dirs(const struct object_id *oid,
d90e759f
EN
457 struct strbuf *base, const char *path,
458 unsigned int mode, int stage, void *context)
9047ebbc 459{
fc65b00d 460 struct path_hashmap_entry *entry;
6a0b0b6d 461 int baselen = base->len;
696ee23c
MV
462 struct merge_options *o = context;
463
6a0b0b6d 464 strbuf_addstr(base, path);
9047ebbc 465
fc65b00d
KW
466 FLEX_ALLOC_MEM(entry, path, base->buf, base->len);
467 hashmap_entry_init(entry, path_hash(entry->path));
468 hashmap_add(&o->current_file_dir_set, entry);
9047ebbc 469
6a0b0b6d 470 strbuf_setlen(base, baselen);
d3bee161 471 return (S_ISDIR(mode) ? READ_TREE_RECURSIVE : 0);
9047ebbc
MV
472}
473
ef9c4dc3 474static void get_files_dirs(struct merge_options *o, struct tree *tree)
9047ebbc 475{
f0096c06 476 struct pathspec match_all;
9a087274 477 memset(&match_all, 0, sizeof(match_all));
e092073d
NTND
478 read_tree_recursive(the_repository, tree, "", 0, 0,
479 &match_all, save_files_dirs, o);
9047ebbc
MV
480}
481
5b047ac0
EN
482static int get_tree_entry_if_blob(const struct object_id *tree,
483 const char *path,
484 struct object_id *hashy,
5ec1e728 485 unsigned short *mode_o)
5b047ac0
EN
486{
487 int ret;
488
489 ret = get_tree_entry(tree, path, hashy, mode_o);
490 if (S_ISDIR(*mode_o)) {
491 oidcpy(hashy, &null_oid);
492 *mode_o = 0;
493 }
494 return ret;
495}
496
9047ebbc
MV
497/*
498 * Returns an index_entry instance which doesn't have to correspond to
499 * a real cache entry in Git's index.
500 */
501static struct stage_data *insert_stage_data(const char *path,
502 struct tree *o, struct tree *a, struct tree *b,
503 struct string_list *entries)
504{
505 struct string_list_item *item;
506 struct stage_data *e = xcalloc(1, sizeof(struct stage_data));
5b047ac0
EN
507 get_tree_entry_if_blob(&o->object.oid, path,
508 &e->stages[1].oid, &e->stages[1].mode);
509 get_tree_entry_if_blob(&a->object.oid, path,
510 &e->stages[2].oid, &e->stages[2].mode);
511 get_tree_entry_if_blob(&b->object.oid, path,
512 &e->stages[3].oid, &e->stages[3].mode);
78a395d3 513 item = string_list_insert(entries, path);
9047ebbc
MV
514 item->util = e;
515 return e;
516}
517
518/*
519 * Create a dictionary mapping file names to stage_data objects. The
520 * dictionary contains one entry for every path with a non-zero stage entry.
521 */
0d6caa2d 522static struct string_list *get_unmerged(struct index_state *istate)
9047ebbc
MV
523{
524 struct string_list *unmerged = xcalloc(1, sizeof(struct string_list));
525 int i;
526
527 unmerged->strdup_strings = 1;
528
0d6caa2d 529 for (i = 0; i < istate->cache_nr; i++) {
9047ebbc
MV
530 struct string_list_item *item;
531 struct stage_data *e;
0d6caa2d 532 const struct cache_entry *ce = istate->cache[i];
9047ebbc
MV
533 if (!ce_stage(ce))
534 continue;
535
e8c8b713 536 item = string_list_lookup(unmerged, ce->name);
9047ebbc 537 if (!item) {
78a395d3 538 item = string_list_insert(unmerged, ce->name);
9047ebbc
MV
539 item->util = xcalloc(1, sizeof(struct stage_data));
540 }
541 e = item->util;
542 e->stages[ce_stage(ce)].mode = ce->ce_mode;
99d1a986 543 oidcpy(&e->stages[ce_stage(ce)].oid, &ce->oid);
9047ebbc
MV
544 }
545
546 return unmerged;
547}
548
fa6ca111 549static int string_list_df_name_compare(const char *one, const char *two)
ef02b317 550{
fa6ca111
NTND
551 int onelen = strlen(one);
552 int twolen = strlen(two);
f0fd4d05
EN
553 /*
554 * Here we only care that entries for D/F conflicts are
555 * adjacent, in particular with the file of the D/F conflict
556 * appearing before files below the corresponding directory.
557 * The order of the rest of the list is irrelevant for us.
ef02b317 558 *
f0fd4d05
EN
559 * To achieve this, we sort with df_name_compare and provide
560 * the mode S_IFDIR so that D/F conflicts will sort correctly.
561 * We use the mode S_IFDIR for everything else for simplicity,
562 * since in other cases any changes in their order due to
563 * sorting cause no problems for us.
564 */
fa6ca111
NTND
565 int cmp = df_name_compare(one, onelen, S_IFDIR,
566 two, twolen, S_IFDIR);
f0fd4d05
EN
567 /*
568 * Now that 'foo' and 'foo/bar' compare equal, we have to make sure
569 * that 'foo' comes before 'foo/bar'.
ef02b317 570 */
f0fd4d05
EN
571 if (cmp)
572 return cmp;
573 return onelen - twolen;
574}
575
70cc3d36
EN
576static void record_df_conflict_files(struct merge_options *o,
577 struct string_list *entries)
ef02b317 578{
70cc3d36 579 /* If there is a D/F conflict and the file for such a conflict
2d6bad91 580 * currently exists in the working tree, we want to allow it to be
edd2faf5
EN
581 * removed to make room for the corresponding directory if needed.
582 * The files underneath the directories of such D/F conflicts will
583 * be processed before the corresponding file involved in the D/F
584 * conflict. If the D/F directory ends up being removed by the
585 * merge, then we won't have to touch the D/F file. If the D/F
586 * directory needs to be written to the working copy, then the D/F
587 * file will simply be removed (in make_room_for_path()) to make
588 * room for the necessary paths. Note that if both the directory
589 * and the file need to be present, then the D/F file will be
590 * reinstated with a new unique name at the time it is processed.
ef02b317 591 */
af4941d4 592 struct string_list df_sorted_entries = STRING_LIST_INIT_NODUP;
ef02b317 593 const char *last_file = NULL;
c8516500 594 int last_len = 0;
ef02b317
EN
595 int i;
596
0b30e812
EN
597 /*
598 * If we're merging merge-bases, we don't want to bother with
599 * any working directory changes.
600 */
601 if (o->call_depth)
602 return;
603
f0fd4d05 604 /* Ensure D/F conflicts are adjacent in the entries list. */
ef02b317 605 for (i = 0; i < entries->nr; i++) {
f701aae0
EN
606 struct string_list_item *next = &entries->items[i];
607 string_list_append(&df_sorted_entries, next->string)->util =
608 next->util;
609 }
fa6ca111
NTND
610 df_sorted_entries.cmp = string_list_df_name_compare;
611 string_list_sort(&df_sorted_entries);
f0fd4d05 612
70cc3d36 613 string_list_clear(&o->df_conflict_file_set, 1);
f701aae0
EN
614 for (i = 0; i < df_sorted_entries.nr; i++) {
615 const char *path = df_sorted_entries.items[i].string;
ef02b317 616 int len = strlen(path);
f701aae0 617 struct stage_data *e = df_sorted_entries.items[i].util;
ef02b317
EN
618
619 /*
620 * Check if last_file & path correspond to a D/F conflict;
621 * i.e. whether path is last_file+'/'+<something>.
70cc3d36
EN
622 * If so, record that it's okay to remove last_file to make
623 * room for path and friends if needed.
ef02b317
EN
624 */
625 if (last_file &&
626 len > last_len &&
627 memcmp(path, last_file, last_len) == 0 &&
628 path[last_len] == '/') {
70cc3d36 629 string_list_insert(&o->df_conflict_file_set, last_file);
ef02b317
EN
630 }
631
632 /*
633 * Determine whether path could exist as a file in the
634 * working directory as a possible D/F conflict. This
635 * will only occur when it exists in stage 2 as a
636 * file.
637 */
638 if (S_ISREG(e->stages[2].mode) || S_ISLNK(e->stages[2].mode)) {
639 last_file = path;
640 last_len = len;
ef02b317
EN
641 } else {
642 last_file = NULL;
643 }
644 }
f701aae0 645 string_list_clear(&df_sorted_entries, 0);
ef02b317
EN
646}
647
9cba13ca 648struct rename {
9047ebbc 649 struct diff_filepair *pair;
379fc378
EN
650 /*
651 * Purpose of src_entry and dst_entry:
652 *
653 * If 'before' is renamed to 'after' then src_entry will contain
654 * the versions of 'before' from the merge_base, HEAD, and MERGE in
655 * stages 1, 2, and 3; dst_entry will contain the respective
656 * versions of 'after' in corresponding locations. Thus, we have a
657 * total of six modes and oids, though some will be null. (Stage 0
658 * is ignored; we're interested in handling conflicts.)
659 *
660 * Since we don't turn on break-rewrites by default, neither
661 * src_entry nor dst_entry can have all three of their stages have
662 * non-null oids, meaning at most four of the six will be non-null.
663 * Also, since this is a rename, both src_entry and dst_entry will
664 * have at least one non-null oid, meaning at least two will be
665 * non-null. Of the six oids, a typical rename will have three be
666 * non-null. Only two implies a rename/delete, and four implies a
667 * rename/add.
668 */
9047ebbc
MV
669 struct stage_data *src_entry;
670 struct stage_data *dst_entry;
9c0743fe 671 unsigned add_turned_into_rename:1;
9047ebbc
MV
672 unsigned processed:1;
673};
674
bc9204d4
JS
675static int update_stages(struct merge_options *opt, const char *path,
676 const struct diff_filespec *o,
650467cf
EN
677 const struct diff_filespec *a,
678 const struct diff_filespec *b)
9047ebbc 679{
f53d3977
EN
680
681 /*
682 * NOTE: It is usually a bad idea to call update_stages on a path
683 * before calling update_file on that same path, since it can
684 * sometimes lead to spurious "refusing to lose untracked file..."
685 * messages from update_file (via make_room_for path via
686 * would_lose_untracked). Instead, reverse the order of the calls
687 * (executing update_file first and then update_stages).
688 */
650467cf
EN
689 int clear = 1;
690 int options = ADD_CACHE_OK_TO_ADD | ADD_CACHE_SKIP_DFCHECK;
9047ebbc 691 if (clear)
0d6caa2d 692 if (remove_file_from_index(opt->repo->index, path))
9047ebbc
MV
693 return -1;
694 if (o)
bc9204d4 695 if (add_cacheinfo(opt, o->mode, &o->oid, path, 1, 0, options))
9047ebbc
MV
696 return -1;
697 if (a)
bc9204d4 698 if (add_cacheinfo(opt, a->mode, &a->oid, path, 2, 0, options))
9047ebbc
MV
699 return -1;
700 if (b)
bc9204d4 701 if (add_cacheinfo(opt, b->mode, &b->oid, path, 3, 0, options))
9047ebbc
MV
702 return -1;
703 return 0;
704}
705
b8ddf164
EN
706static void update_entry(struct stage_data *entry,
707 struct diff_filespec *o,
708 struct diff_filespec *a,
709 struct diff_filespec *b)
2ff739f9 710{
2ff739f9
EN
711 entry->processed = 0;
712 entry->stages[1].mode = o->mode;
713 entry->stages[2].mode = a->mode;
714 entry->stages[3].mode = b->mode;
fd429e98 715 oidcpy(&entry->stages[1].oid, &o->oid);
716 oidcpy(&entry->stages[2].oid, &a->oid);
717 oidcpy(&entry->stages[3].oid, &b->oid);
2ff739f9
EN
718}
719
b7fa51da
MV
720static int remove_file(struct merge_options *o, int clean,
721 const char *path, int no_wd)
9047ebbc 722{
b7fa51da
MV
723 int update_cache = o->call_depth || clean;
724 int update_working_directory = !o->call_depth && !no_wd;
9047ebbc
MV
725
726 if (update_cache) {
0d6caa2d 727 if (remove_file_from_index(o->repo->index, path))
9047ebbc
MV
728 return -1;
729 }
730 if (update_working_directory) {
ae352c7f
DT
731 if (ignore_case) {
732 struct cache_entry *ce;
0d6caa2d
NTND
733 ce = index_file_exists(o->repo->index, path, strlen(path),
734 ignore_case);
4cba2b01 735 if (ce && ce_stage(ce) == 0 && strcmp(path, ce->name))
ae352c7f
DT
736 return 0;
737 }
25755e84 738 if (remove_path(path))
9047ebbc 739 return -1;
9047ebbc
MV
740 }
741 return 0;
742}
743
45bc131d
JK
744/* add a string to a strbuf, but converting "/" to "_" */
745static void add_flattened_path(struct strbuf *out, const char *s)
746{
747 size_t i = out->len;
748 strbuf_addstr(out, s);
749 for (; i < out->len; i++)
750 if (out->buf[i] == '/')
751 out->buf[i] = '_';
752}
753
696ee23c 754static char *unique_path(struct merge_options *o, const char *path, const char *branch)
9047ebbc 755{
fc65b00d 756 struct path_hashmap_entry *entry;
45bc131d 757 struct strbuf newpath = STRBUF_INIT;
9047ebbc 758 int suffix = 0;
45bc131d
JK
759 size_t base_len;
760
761 strbuf_addf(&newpath, "%s~", path);
762 add_flattened_path(&newpath, branch);
763
764 base_len = newpath.len;
fc65b00d
KW
765 while (hashmap_get_from_hash(&o->current_file_dir_set,
766 path_hash(newpath.buf), newpath.buf) ||
8e1b62f1 767 (!o->call_depth && file_exists(newpath.buf))) {
45bc131d
JK
768 strbuf_setlen(&newpath, base_len);
769 strbuf_addf(&newpath, "_%d", suffix++);
770 }
771
fc65b00d
KW
772 FLEX_ALLOC_MEM(entry, path, newpath.buf, newpath.len);
773 hashmap_entry_init(entry, path_hash(entry->path));
774 hashmap_add(&o->current_file_dir_set, entry);
45bc131d 775 return strbuf_detach(&newpath, NULL);
9047ebbc
MV
776}
777
5423d2e7
DT
778/**
779 * Check whether a directory in the index is in the way of an incoming
780 * file. Return 1 if so. If check_working_copy is non-zero, also
781 * check the working directory. If empty_ok is non-zero, also return
782 * 0 in the case where the working-tree dir exists but is empty.
783 */
0d6caa2d
NTND
784static int dir_in_way(struct index_state *istate, const char *path,
785 int check_working_copy, int empty_ok)
f2507b4e 786{
b4600fbe
JK
787 int pos;
788 struct strbuf dirpath = STRBUF_INIT;
f2507b4e
EN
789 struct stat st;
790
b4600fbe
JK
791 strbuf_addstr(&dirpath, path);
792 strbuf_addch(&dirpath, '/');
f2507b4e 793
0d6caa2d 794 pos = index_name_pos(istate, dirpath.buf, dirpath.len);
f2507b4e
EN
795
796 if (pos < 0)
797 pos = -1 - pos;
0d6caa2d
NTND
798 if (pos < istate->cache_nr &&
799 !strncmp(dirpath.buf, istate->cache[pos]->name, dirpath.len)) {
b4600fbe 800 strbuf_release(&dirpath);
f2507b4e
EN
801 return 1;
802 }
803
b4600fbe 804 strbuf_release(&dirpath);
5423d2e7
DT
805 return check_working_copy && !lstat(path, &st) && S_ISDIR(st.st_mode) &&
806 !(empty_ok && is_empty_dir(path));
f2507b4e
EN
807}
808
1de70dbd
EN
809/*
810 * Returns whether path was tracked in the index before the merge started,
811 * and its oid and mode match the specified values
812 */
813static int was_tracked_and_matches(struct merge_options *o, const char *path,
814 const struct object_id *oid, unsigned mode)
60c91181 815{
1de70dbd
EN
816 int pos = index_name_pos(&o->orig_index, path, strlen(path));
817 struct cache_entry *ce;
818
819 if (0 > pos)
820 /* we were not tracking this path before the merge */
821 return 0;
822
823 /* See if the file we were tracking before matches */
824 ce = o->orig_index.cache[pos];
825 return (oid_eq(&ce->oid, oid) && ce->ce_mode == mode);
826}
827
a35edc84
EN
828/*
829 * Returns whether path was tracked in the index before the merge started
830 */
831static int was_tracked(struct merge_options *o, const char *path)
60c91181 832{
a35edc84 833 int pos = index_name_pos(&o->orig_index, path, strlen(path));
60c91181 834
f8d83fb6 835 if (0 <= pos)
a35edc84 836 /* we were tracking this path before the merge */
f8d83fb6
JS
837 return 1;
838
aacb82de 839 return 0;
60c91181
JH
840}
841
0d6caa2d 842static int would_lose_untracked(struct merge_options *o, const char *path)
9047ebbc 843{
0d6caa2d
NTND
844 struct index_state *istate = o->repo->index;
845
a35edc84
EN
846 /*
847 * This may look like it can be simplified to:
848 * return !was_tracked(o, path) && file_exists(path)
849 * but it can't. This function needs to know whether path was in
850 * the working tree due to EITHER having been tracked in the index
851 * before the merge OR having been put into the working copy and
852 * index by unpack_trees(). Due to that either-or requirement, we
853 * check the current index instead of the original one.
854 *
855 * Note that we do not need to worry about merge-recursive itself
856 * updating the index after unpack_trees() and before calling this
857 * function, because we strictly require all code paths in
858 * merge-recursive to update the working tree first and the index
859 * second. Doing otherwise would break
860 * update_file()/would_lose_untracked(); see every comment in this
861 * file which mentions "update_stages".
862 */
0d6caa2d 863 int pos = index_name_pos(istate, path, strlen(path));
a35edc84
EN
864
865 if (pos < 0)
866 pos = -1 - pos;
0d6caa2d
NTND
867 while (pos < istate->cache_nr &&
868 !strcmp(path, istate->cache[pos]->name)) {
a35edc84
EN
869 /*
870 * If stage #0, it is definitely tracked.
871 * If it has stage #2 then it was tracked
872 * before this merge started. All other
873 * cases the path was not tracked.
874 */
0d6caa2d 875 switch (ce_stage(istate->cache[pos])) {
a35edc84
EN
876 case 0:
877 case 2:
878 return 0;
879 }
880 pos++;
881 }
882 return file_exists(path);
60c91181
JH
883}
884
64b1abe9
EN
885static int was_dirty(struct merge_options *o, const char *path)
886{
887 struct cache_entry *ce;
888 int dirty = 1;
889
a35edc84 890 if (o->call_depth || !was_tracked(o, path))
64b1abe9
EN
891 return !dirty;
892
277292d5
EN
893 ce = index_file_exists(o->unpack_opts.src_index,
894 path, strlen(path), ignore_case);
895 dirty = verify_uptodate(ce, &o->unpack_opts) != 0;
64b1abe9 896 return dirty;
60c91181
JH
897}
898
ed0148a5 899static int make_room_for_path(struct merge_options *o, const char *path)
9047ebbc 900{
ed0148a5 901 int status, i;
55653a68 902 const char *msg = _("failed to create path '%s'%s");
9047ebbc 903
ed0148a5
EN
904 /* Unlink any D/F conflict files that are in the way */
905 for (i = 0; i < o->df_conflict_file_set.nr; i++) {
906 const char *df_path = o->df_conflict_file_set.items[i].string;
907 size_t pathlen = strlen(path);
908 size_t df_pathlen = strlen(df_path);
909 if (df_pathlen < pathlen &&
910 path[df_pathlen] == '/' &&
911 strncmp(path, df_path, df_pathlen) == 0) {
912 output(o, 3,
55653a68 913 _("Removing %s to make room for subdirectory\n"),
ed0148a5
EN
914 df_path);
915 unlink(df_path);
916 unsorted_string_list_delete_item(&o->df_conflict_file_set,
917 i, 0);
918 break;
919 }
920 }
921
922 /* Make sure leading directories are created */
9047ebbc
MV
923 status = safe_create_leading_directories_const(path);
924 if (status) {
6003303a 925 if (status == SCLD_EXISTS)
9047ebbc 926 /* something else exists */
bc9204d4
JS
927 return err(o, msg, path, _(": perhaps a D/F conflict?"));
928 return err(o, msg, path, "");
9047ebbc
MV
929 }
930
60c91181
JH
931 /*
932 * Do not unlink a file in the work tree if we are not
933 * tracking it.
934 */
0d6caa2d 935 if (would_lose_untracked(o, path))
bc9204d4 936 return err(o, _("refusing to lose untracked file at '%s'"),
d90e759f 937 path);
60c91181 938
9047ebbc
MV
939 /* Successful unlink is good.. */
940 if (!unlink(path))
941 return 0;
942 /* .. and so is no existing file */
943 if (errno == ENOENT)
944 return 0;
945 /* .. but not some other error (who really cares what?) */
bc9204d4 946 return err(o, msg, path, _(": perhaps a D/F conflict?"));
9047ebbc
MV
947}
948
75456f96
JS
949static int update_file_flags(struct merge_options *o,
950 const struct object_id *oid,
951 unsigned mode,
952 const char *path,
953 int update_cache,
954 int update_wd)
9047ebbc 955{
6003303a
JS
956 int ret = 0;
957
b7fa51da 958 if (o->call_depth)
9047ebbc
MV
959 update_wd = 0;
960
961 if (update_wd) {
962 enum object_type type;
963 void *buf;
964 unsigned long size;
965
68d03e4a 966 if (S_ISGITLINK(mode)) {
0c44c943
JH
967 /*
968 * We may later decide to recursively descend into
969 * the submodule directory and update its index
970 * and/or work tree, but we do not do that now.
971 */
68d03e4a 972 update_wd = 0;
0c44c943 973 goto update_index;
68d03e4a 974 }
9047ebbc 975
b4f5aca4 976 buf = read_object_file(oid, &type, &size);
9047ebbc 977 if (!buf)
bc9204d4 978 return err(o, _("cannot read object %s '%s'"), oid_to_hex(oid), path);
6003303a 979 if (type != OBJ_BLOB) {
bc9204d4 980 ret = err(o, _("blob expected for %s '%s'"), oid_to_hex(oid), path);
6003303a
JS
981 goto free_buf;
982 }
9047ebbc 983 if (S_ISREG(mode)) {
f285a2d7 984 struct strbuf strbuf = STRBUF_INIT;
0d6caa2d 985 if (convert_to_working_tree(o->repo->index, path, buf, size, &strbuf)) {
9047ebbc
MV
986 free(buf);
987 size = strbuf.len;
988 buf = strbuf_detach(&strbuf, NULL);
989 }
990 }
991
ed0148a5 992 if (make_room_for_path(o, path) < 0) {
9047ebbc 993 update_wd = 0;
75456f96 994 goto free_buf;
9047ebbc
MV
995 }
996 if (S_ISREG(mode) || (!has_symlinks && S_ISLNK(mode))) {
997 int fd;
998 if (mode & 0100)
999 mode = 0777;
1000 else
1001 mode = 0666;
1002 fd = open(path, O_WRONLY | O_TRUNC | O_CREAT, mode);
6003303a 1003 if (fd < 0) {
bc9204d4
JS
1004 ret = err(o, _("failed to open '%s': %s"),
1005 path, strerror(errno));
6003303a
JS
1006 goto free_buf;
1007 }
f633ea2c 1008 write_in_full(fd, buf, size);
9047ebbc
MV
1009 close(fd);
1010 } else if (S_ISLNK(mode)) {
1011 char *lnk = xmemdupz(buf, size);
1012 safe_create_leading_directories_const(path);
1013 unlink(path);
304dcf26 1014 if (symlink(lnk, path))
bc9204d4 1015 ret = err(o, _("failed to symlink '%s': %s"),
d90e759f 1016 path, strerror(errno));
9047ebbc
MV
1017 free(lnk);
1018 } else
bc9204d4
JS
1019 ret = err(o,
1020 _("do not know what to do with %06o %s '%s'"),
1021 mode, oid_to_hex(oid), path);
93665365 1022 free_buf:
9047ebbc
MV
1023 free(buf);
1024 }
93665365 1025update_index:
6003303a 1026 if (!ret && update_cache)
fd53b7ff
EN
1027 if (add_cacheinfo(o, mode, oid, path, 0, update_wd,
1028 ADD_CACHE_OK_TO_ADD))
1029 return -1;
6003303a 1030 return ret;
9047ebbc
MV
1031}
1032
75456f96
JS
1033static int update_file(struct merge_options *o,
1034 int clean,
1035 const struct object_id *oid,
1036 unsigned mode,
1037 const char *path)
9047ebbc 1038{
75456f96 1039 return update_file_flags(o, oid, mode, path, o->call_depth || clean, !o->call_depth);
9047ebbc
MV
1040}
1041
1042/* Low level file merging, update and removal */
1043
9cba13ca 1044struct merge_file_info {
9b561499 1045 struct object_id oid;
9047ebbc
MV
1046 unsigned mode;
1047 unsigned clean:1,
1048 merge:1;
1049};
1050
b7fa51da
MV
1051static int merge_3way(struct merge_options *o,
1052 mmbuffer_t *result_buf,
0c059420
EN
1053 const struct diff_filespec *one,
1054 const struct diff_filespec *a,
1055 const struct diff_filespec *b,
9047ebbc 1056 const char *branch1,
b2a7942b
EN
1057 const char *branch2,
1058 const int extra_marker_size)
9047ebbc
MV
1059{
1060 mmfile_t orig, src1, src2;
712516bc 1061 struct ll_merge_options ll_opts = {0};
4c5868f4 1062 char *base_name, *name1, *name2;
9047ebbc 1063 int merge_status;
8cc5b290 1064
712516bc 1065 ll_opts.renormalize = o->renormalize;
b2a7942b 1066 ll_opts.extra_marker_size = extra_marker_size;
58a1ece4 1067 ll_opts.xdl_opts = o->xdl_opts;
712516bc
JN
1068
1069 if (o->call_depth) {
1070 ll_opts.virtual_ancestor = 1;
1071 ll_opts.variant = 0;
1072 } else {
8cc5b290
AP
1073 switch (o->recursive_variant) {
1074 case MERGE_RECURSIVE_OURS:
712516bc 1075 ll_opts.variant = XDL_MERGE_FAVOR_OURS;
8cc5b290
AP
1076 break;
1077 case MERGE_RECURSIVE_THEIRS:
712516bc 1078 ll_opts.variant = XDL_MERGE_FAVOR_THEIRS;
8cc5b290
AP
1079 break;
1080 default:
712516bc 1081 ll_opts.variant = 0;
8cc5b290
AP
1082 break;
1083 }
1084 }
9047ebbc 1085
4c5868f4
JN
1086 if (strcmp(a->path, b->path) ||
1087 (o->ancestor != NULL && strcmp(a->path, one->path) != 0)) {
1088 base_name = o->ancestor == NULL ? NULL :
4e2d094d
RJ
1089 mkpathdup("%s:%s", o->ancestor, one->path);
1090 name1 = mkpathdup("%s:%s", branch1, a->path);
1091 name2 = mkpathdup("%s:%s", branch2, b->path);
606475f3 1092 } else {
4c5868f4 1093 base_name = o->ancestor == NULL ? NULL :
4e2d094d
RJ
1094 mkpathdup("%s", o->ancestor);
1095 name1 = mkpathdup("%s", branch1);
1096 name2 = mkpathdup("%s", branch2);
606475f3 1097 }
9047ebbc 1098
d449347d 1099 read_mmblob(&orig, &one->oid);
1100 read_mmblob(&src1, &a->oid);
1101 read_mmblob(&src2, &b->oid);
9047ebbc 1102
4c5868f4 1103 merge_status = ll_merge(result_buf, a->path, &orig, base_name,
32eaa468 1104 &src1, name1, &src2, name2,
0d6caa2d 1105 o->repo->index, &ll_opts);
9047ebbc 1106
4e2d094d 1107 free(base_name);
9047ebbc
MV
1108 free(name1);
1109 free(name2);
1110 free(orig.ptr);
1111 free(src1.ptr);
1112 free(src2.ptr);
1113 return merge_status;
1114}
1115
0d6caa2d
NTND
1116static int find_first_merges(struct repository *repo,
1117 struct object_array *result, const char *path,
d90e759f 1118 struct commit *a, struct commit *b)
18cfc088
SB
1119{
1120 int i, j;
1121 struct object_array merges = OBJECT_ARRAY_INIT;
1122 struct commit *commit;
1123 int contains_another;
1124
1125 char merged_revision[42];
1126 const char *rev_args[] = { "rev-list", "--merges", "--ancestry-path",
1127 "--all", merged_revision, NULL };
1128 struct rev_info revs;
1129 struct setup_revision_opt rev_opts;
1130
1131 memset(result, 0, sizeof(struct object_array));
1132 memset(&rev_opts, 0, sizeof(rev_opts));
1133
1134 /* get all revisions that merge commit a */
1135 xsnprintf(merged_revision, sizeof(merged_revision), "^%s",
d90e759f 1136 oid_to_hex(&a->object.oid));
0d6caa2d 1137 repo_init_revisions(repo, &revs, NULL);
18cfc088
SB
1138 rev_opts.submodule = path;
1139 /* FIXME: can't handle linked worktrees in submodules yet */
1140 revs.single_worktree = path != NULL;
1141 setup_revisions(ARRAY_SIZE(rev_args)-1, rev_args, &revs, &rev_opts);
1142
1143 /* save all revisions from the above list that contain b */
1144 if (prepare_revision_walk(&revs))
1145 die("revision walk setup failed");
1146 while ((commit = get_revision(&revs)) != NULL) {
1147 struct object *o = &(commit->object);
1148 if (in_merge_bases(b, commit))
1149 add_object_array(o, NULL, &merges);
1150 }
1151 reset_revision_walk();
1152
1153 /* Now we've got all merges that contain a and b. Prune all
1154 * merges that contain another found merge and save them in
1155 * result.
1156 */
1157 for (i = 0; i < merges.nr; i++) {
1158 struct commit *m1 = (struct commit *) merges.objects[i].item;
1159
1160 contains_another = 0;
1161 for (j = 0; j < merges.nr; j++) {
1162 struct commit *m2 = (struct commit *) merges.objects[j].item;
1163 if (i != j && in_merge_bases(m2, m1)) {
1164 contains_another = 1;
1165 break;
1166 }
1167 }
1168
1169 if (!contains_another)
1170 add_object_array(merges.objects[i].item, NULL, result);
1171 }
1172
1173 object_array_clear(&merges);
1174 return result->nr;
1175}
1176
1177static void print_commit(struct commit *commit)
1178{
1179 struct strbuf sb = STRBUF_INIT;
1180 struct pretty_print_context ctx = {0};
1181 ctx.date_mode.type = DATE_NORMAL;
1182 format_commit_message(commit, " %h: %m %s", &sb, &ctx);
1183 fprintf(stderr, "%s\n", sb.buf);
1184 strbuf_release(&sb);
1185}
1186
325f3a8e
SB
1187static int merge_submodule(struct merge_options *o,
1188 struct object_id *result, const char *path,
18cfc088 1189 const struct object_id *base, const struct object_id *a,
325f3a8e 1190 const struct object_id *b)
18cfc088
SB
1191{
1192 struct commit *commit_base, *commit_a, *commit_b;
1193 int parent_count;
1194 struct object_array merges;
1195
1196 int i;
325f3a8e 1197 int search = !o->call_depth;
18cfc088
SB
1198
1199 /* store a in result in case we fail */
1200 oidcpy(result, a);
1201
1202 /* we can not handle deletion conflicts */
1203 if (is_null_oid(base))
1204 return 0;
1205 if (is_null_oid(a))
1206 return 0;
1207 if (is_null_oid(b))
1208 return 0;
1209
1210 if (add_submodule_odb(path)) {
325f3a8e 1211 output(o, 1, _("Failed to merge submodule %s (not checked out)"), path);
18cfc088
SB
1212 return 0;
1213 }
1214
d7cf3a96
NTND
1215 if (!(commit_base = lookup_commit_reference(o->repo, base)) ||
1216 !(commit_a = lookup_commit_reference(o->repo, a)) ||
1217 !(commit_b = lookup_commit_reference(o->repo, b))) {
325f3a8e 1218 output(o, 1, _("Failed to merge submodule %s (commits not present)"), path);
18cfc088
SB
1219 return 0;
1220 }
1221
1222 /* check whether both changes are forward */
1223 if (!in_merge_bases(commit_base, commit_a) ||
1224 !in_merge_bases(commit_base, commit_b)) {
325f3a8e 1225 output(o, 1, _("Failed to merge submodule %s (commits don't follow merge-base)"), path);
18cfc088
SB
1226 return 0;
1227 }
1228
1229 /* Case #1: a is contained in b or vice versa */
1230 if (in_merge_bases(commit_a, commit_b)) {
1231 oidcpy(result, b);
76f42125
LM
1232 if (show(o, 3)) {
1233 output(o, 3, _("Fast-forwarding submodule %s to the following commit:"), path);
1234 output_commit_title(o, commit_b);
1235 } else if (show(o, 2))
40aac22b 1236 output(o, 2, _("Fast-forwarding submodule %s"), path);
76f42125
LM
1237 else
1238 ; /* no output */
1239
18cfc088
SB
1240 return 1;
1241 }
1242 if (in_merge_bases(commit_b, commit_a)) {
1243 oidcpy(result, a);
76f42125
LM
1244 if (show(o, 3)) {
1245 output(o, 3, _("Fast-forwarding submodule %s to the following commit:"), path);
1246 output_commit_title(o, commit_a);
1247 } else if (show(o, 2))
40aac22b 1248 output(o, 2, _("Fast-forwarding submodule %s"), path);
76f42125
LM
1249 else
1250 ; /* no output */
1251
18cfc088
SB
1252 return 1;
1253 }
1254
1255 /*
1256 * Case #2: There are one or more merges that contain a and b in
1257 * the submodule. If there is only one, then present it as a
1258 * suggestion to the user, but leave it marked unmerged so the
1259 * user needs to confirm the resolution.
1260 */
1261
1262 /* Skip the search if makes no sense to the calling context. */
1263 if (!search)
1264 return 0;
1265
1266 /* find commit which merges them */
0d6caa2d
NTND
1267 parent_count = find_first_merges(o->repo, &merges, path,
1268 commit_a, commit_b);
18cfc088
SB
1269 switch (parent_count) {
1270 case 0:
325f3a8e 1271 output(o, 1, _("Failed to merge submodule %s (merge following commits not found)"), path);
18cfc088
SB
1272 break;
1273
1274 case 1:
325f3a8e
SB
1275 output(o, 1, _("Failed to merge submodule %s (not fast-forward)"), path);
1276 output(o, 2, _("Found a possible merge resolution for the submodule:\n"));
18cfc088 1277 print_commit((struct commit *) merges.objects[0].item);
325f3a8e 1278 output(o, 2, _(
d90e759f
EN
1279 "If this is correct simply add it to the index "
1280 "for example\n"
1281 "by using:\n\n"
1282 " git update-index --cacheinfo 160000 %s \"%s\"\n\n"
1283 "which will accept this suggestion.\n"),
1284 oid_to_hex(&merges.objects[0].item->oid), path);
18cfc088
SB
1285 break;
1286
1287 default:
325f3a8e 1288 output(o, 1, _("Failed to merge submodule %s (multiple merges found)"), path);
18cfc088
SB
1289 for (i = 0; i < merges.nr; i++)
1290 print_commit((struct commit *) merges.objects[i].item);
1291 }
1292
1293 object_array_clear(&merges);
1294 return 0;
1295}
1296
d9573556
EN
1297static int merge_mode_and_contents(struct merge_options *o,
1298 const struct diff_filespec *one,
1299 const struct diff_filespec *a,
1300 const struct diff_filespec *b,
1301 const char *filename,
1302 const char *branch1,
1303 const char *branch2,
b2a7942b 1304 const int extra_marker_size,
d9573556 1305 struct merge_file_info *result)
9047ebbc 1306{
4f445453
EN
1307 if (o->branch1 != branch1) {
1308 /*
1309 * It's weird getting a reverse merge with HEAD on the bottom
1310 * side of the conflict markers and the other branch on the
1311 * top. Fix that.
1312 */
1313 return merge_mode_and_contents(o, one, b, a,
1314 filename,
b2a7942b
EN
1315 branch2, branch1,
1316 extra_marker_size, result);
4f445453
EN
1317 }
1318
3c8a51e8
JS
1319 result->merge = 0;
1320 result->clean = 1;
9047ebbc
MV
1321
1322 if ((S_IFMT & a->mode) != (S_IFMT & b->mode)) {
3c8a51e8 1323 result->clean = 0;
9047ebbc 1324 if (S_ISREG(a->mode)) {
3c8a51e8
JS
1325 result->mode = a->mode;
1326 oidcpy(&result->oid, &a->oid);
9047ebbc 1327 } else {
3c8a51e8
JS
1328 result->mode = b->mode;
1329 oidcpy(&result->oid, &b->oid);
9047ebbc
MV
1330 }
1331 } else {
b4da9d62 1332 if (!oid_eq(&a->oid, &one->oid) && !oid_eq(&b->oid, &one->oid))
3c8a51e8 1333 result->merge = 1;
9047ebbc
MV
1334
1335 /*
1336 * Merge modes
1337 */
b7fa51da 1338 if (a->mode == b->mode || a->mode == one->mode)
3c8a51e8 1339 result->mode = b->mode;
9047ebbc 1340 else {
3c8a51e8 1341 result->mode = a->mode;
b7fa51da 1342 if (b->mode != one->mode) {
3c8a51e8
JS
1343 result->clean = 0;
1344 result->merge = 1;
9047ebbc
MV
1345 }
1346 }
1347
b4da9d62 1348 if (oid_eq(&a->oid, &b->oid) || oid_eq(&a->oid, &one->oid))
3c8a51e8 1349 oidcpy(&result->oid, &b->oid);
b4da9d62 1350 else if (oid_eq(&b->oid, &one->oid))
3c8a51e8 1351 oidcpy(&result->oid, &a->oid);
9047ebbc
MV
1352 else if (S_ISREG(a->mode)) {
1353 mmbuffer_t result_buf;
6003303a 1354 int ret = 0, merge_status;
9047ebbc 1355
b7fa51da 1356 merge_status = merge_3way(o, &result_buf, one, a, b,
b2a7942b
EN
1357 branch1, branch2,
1358 extra_marker_size);
9047ebbc
MV
1359
1360 if ((merge_status < 0) || !result_buf.ptr)
bc9204d4 1361 ret = err(o, _("Failed to execute internal merge"));
9047ebbc 1362
a09c985e
PO
1363 if (!ret &&
1364 write_object_file(result_buf.ptr, result_buf.size,
1365 blob_type, &result->oid))
bc9204d4
JS
1366 ret = err(o, _("Unable to add %s to database"),
1367 a->path);
9047ebbc
MV
1368
1369 free(result_buf.ptr);
6003303a
JS
1370 if (ret)
1371 return ret;
3c8a51e8 1372 result->clean = (merge_status == 0);
9047ebbc 1373 } else if (S_ISGITLINK(a->mode)) {
325f3a8e 1374 result->clean = merge_submodule(o, &result->oid,
d90e759f
EN
1375 one->path,
1376 &one->oid,
1377 &a->oid,
1378 &b->oid);
9047ebbc 1379 } else if (S_ISLNK(a->mode)) {
fd48b464
JH
1380 switch (o->recursive_variant) {
1381 case MERGE_RECURSIVE_NORMAL:
1382 oidcpy(&result->oid, &a->oid);
1383 if (!oid_eq(&a->oid, &b->oid))
1384 result->clean = 0;
1385 break;
1386 case MERGE_RECURSIVE_OURS:
1387 oidcpy(&result->oid, &a->oid);
1388 break;
1389 case MERGE_RECURSIVE_THEIRS:
1390 oidcpy(&result->oid, &b->oid);
1391 break;
1392 }
ef1177d1 1393 } else
033abf97 1394 BUG("unsupported object type in the tree");
9047ebbc
MV
1395 }
1396
05cf21eb
EN
1397 if (result->merge)
1398 output(o, 2, _("Auto-merging %s"), filename);
1399
3c8a51e8 1400 return 0;
9047ebbc
MV
1401}
1402
8ebe7b05
EN
1403static int handle_rename_via_dir(struct merge_options *o,
1404 struct diff_filepair *pair,
b53c5028 1405 const char *rename_branch)
9c0743fe 1406{
5455c338
EN
1407 /*
1408 * Handle file adds that need to be renamed due to directory rename
1409 * detection. This differs from handle_rename_normal, because
1410 * there is no content merge to do; just move the file into the
1411 * desired final location.
1412 */
9c0743fe
EN
1413 const struct diff_filespec *dest = pair->two;
1414
0d6caa2d 1415 if (!o->call_depth && would_lose_untracked(o, dest->path)) {
79c47598
EN
1416 char *alt_path = unique_path(o, dest->path, rename_branch);
1417
1418 output(o, 1, _("Error: Refusing to lose untracked file at %s; "
1419 "writing to %s instead."),
1420 dest->path, alt_path);
1421 /*
1422 * Write the file in worktree at alt_path, but not in the
1423 * index. Instead, write to dest->path for the index but
1424 * only at the higher appropriate stage.
1425 */
1426 if (update_file(o, 0, &dest->oid, dest->mode, alt_path))
1427 return -1;
1428 free(alt_path);
1429 return update_stages(o, dest->path, NULL,
1430 rename_branch == o->branch1 ? dest : NULL,
1431 rename_branch == o->branch1 ? NULL : dest);
1432 }
1433
1434 /* Update dest->path both in index and in worktree */
9c0743fe
EN
1435 if (update_file(o, 1, &dest->oid, dest->mode, dest->path))
1436 return -1;
1437 return 0;
6bdaead1
EN
1438}
1439
75456f96 1440static int handle_change_delete(struct merge_options *o,
d90e759f
EN
1441 const char *path, const char *old_path,
1442 const struct object_id *o_oid, int o_mode,
1443 const struct object_id *changed_oid,
1444 int changed_mode,
1445 const char *change_branch,
1446 const char *delete_branch,
1447 const char *change, const char *change_past)
b7033252 1448{
b26d87f2
MM
1449 char *alt_path = NULL;
1450 const char *update_path = path;
75456f96 1451 int ret = 0;
b26d87f2 1452
0d6caa2d
NTND
1453 if (dir_in_way(o->repo->index, path, !o->call_depth, 0) ||
1454 (!o->call_depth && would_lose_untracked(o, path))) {
b26d87f2 1455 update_path = alt_path = unique_path(o, path, change_branch);
b7033252
EN
1456 }
1457
1458 if (o->call_depth) {
1459 /*
1460 * We cannot arbitrarily accept either a_sha or b_sha as
1461 * correct; since there is no true "middle point" between
1462 * them, simply reuse the base version for virtual merge base.
1463 */
0d6caa2d 1464 ret = remove_file_from_index(o->repo->index, path);
75456f96 1465 if (!ret)
b26d87f2 1466 ret = update_file(o, 0, o_oid, o_mode, update_path);
b7033252 1467 } else {
5b26c3c9
EN
1468 /*
1469 * Despite the four nearly duplicate messages and argument
1470 * lists below and the ugliness of the nested if-statements,
1471 * having complete messages makes the job easier for
1472 * translators.
1473 *
1474 * The slight variance among the cases is due to the fact
1475 * that:
1476 * 1) directory/file conflicts (in effect if
1477 * !alt_path) could cause us to need to write the
1478 * file to a different path.
1479 * 2) renames (in effect if !old_path) could mean that
1480 * there are two names for the path that the user
1481 * may know the file by.
1482 */
b26d87f2
MM
1483 if (!alt_path) {
1484 if (!old_path) {
1485 output(o, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1486 "and %s in %s. Version %s of %s left in tree."),
1487 change, path, delete_branch, change_past,
1488 change_branch, change_branch, path);
1489 } else {
1490 output(o, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1491 "and %s to %s in %s. Version %s of %s left in tree."),
1492 change, old_path, delete_branch, change_past, path,
1493 change_branch, change_branch, path);
1494 }
55653a68 1495 } else {
b26d87f2
MM
1496 if (!old_path) {
1497 output(o, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1498 "and %s in %s. Version %s of %s left in tree at %s."),
1499 change, path, delete_branch, change_past,
1500 change_branch, change_branch, path, alt_path);
1501 } else {
1502 output(o, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1503 "and %s to %s in %s. Version %s of %s left in tree at %s."),
1504 change, old_path, delete_branch, change_past, path,
1505 change_branch, change_branch, path, alt_path);
1506 }
55653a68 1507 }
35a74abf 1508 /*
b26d87f2
MM
1509 * No need to call update_file() on path when change_branch ==
1510 * o->branch1 && !alt_path, since that would needlessly touch
1511 * path. We could call update_file_flags() with update_cache=0
1512 * and update_wd=0, but that's a no-op.
35a74abf 1513 */
b26d87f2
MM
1514 if (change_branch != o->branch1 || alt_path)
1515 ret = update_file(o, 0, changed_oid, changed_mode, update_path);
b7033252 1516 }
b26d87f2 1517 free(alt_path);
75456f96
JS
1518
1519 return ret;
b7033252
EN
1520}
1521
8ebe7b05
EN
1522static int handle_rename_delete(struct merge_options *o,
1523 struct diff_filepair *pair,
1524 const char *rename_branch,
1525 const char *delete_branch)
9047ebbc 1526{
e03acb8b
EN
1527 const struct diff_filespec *orig = pair->one;
1528 const struct diff_filespec *dest = pair->two;
6ef2cb00 1529
75456f96
JS
1530 if (handle_change_delete(o,
1531 o->call_depth ? orig->path : dest->path,
b26d87f2 1532 o->call_depth ? NULL : orig->path,
75456f96 1533 &orig->oid, orig->mode,
b26d87f2
MM
1534 &dest->oid, dest->mode,
1535 rename_branch, delete_branch,
75456f96
JS
1536 _("rename"), _("renamed")))
1537 return -1;
e03acb8b 1538
75456f96 1539 if (o->call_depth)
0d6caa2d 1540 return remove_file_from_index(o->repo->index, dest->path);
75456f96 1541 else
bc9204d4 1542 return update_stages(o, dest->path, NULL,
75456f96
JS
1543 rename_branch == o->branch1 ? dest : NULL,
1544 rename_branch == o->branch1 ? NULL : dest);
6ef2cb00
EN
1545}
1546
1ac91b32
EN
1547static struct diff_filespec *filespec_from_entry(struct diff_filespec *target,
1548 struct stage_data *entry,
1549 int stage)
9047ebbc 1550{
b4da9d62 1551 struct object_id *oid = &entry->stages[stage].oid;
1ac91b32 1552 unsigned mode = entry->stages[stage].mode;
b4da9d62 1553 if (mode == 0 || is_null_oid(oid))
1ac91b32 1554 return NULL;
b4da9d62 1555 oidcpy(&target->oid, oid);
1ac91b32
EN
1556 target->mode = mode;
1557 return target;
1558}
1559
37b65ce3
EN
1560static int handle_file_collision(struct merge_options *o,
1561 const char *collide_path,
1562 const char *prev_path1,
1563 const char *prev_path2,
1564 const char *branch1, const char *branch2,
1565 const struct object_id *a_oid,
1566 unsigned int a_mode,
1567 const struct object_id *b_oid,
1568 unsigned int b_mode)
3672c971 1569{
37b65ce3
EN
1570 struct merge_file_info mfi;
1571 struct diff_filespec null, a, b;
1572 char *alt_path = NULL;
1573 const char *update_path = collide_path;
3672c971 1574
7f867165
EN
1575 /*
1576 * It's easiest to get the correct things into stage 2 and 3, and
1577 * to make sure that the content merge puts HEAD before the other
1578 * branch if we just ensure that branch1 == o->branch1. So, simply
1579 * flip arguments around if we don't have that.
1580 */
1581 if (branch1 != o->branch1) {
1582 return handle_file_collision(o, collide_path,
1583 prev_path2, prev_path1,
1584 branch2, branch1,
1585 b_oid, b_mode,
1586 a_oid, a_mode);
9047ebbc 1587 }
3672c971 1588
37b65ce3
EN
1589 /*
1590 * In the recursive case, we just opt to undo renames
1591 */
1592 if (o->call_depth && (prev_path1 || prev_path2)) {
1593 /* Put first file (a_oid, a_mode) in its original spot */
1594 if (prev_path1) {
1595 if (update_file(o, 1, a_oid, a_mode, prev_path1))
1596 return -1;
1597 } else {
1598 if (update_file(o, 1, a_oid, a_mode, collide_path))
1599 return -1;
1600 }
3672c971 1601
37b65ce3
EN
1602 /* Put second file (b_oid, b_mode) in its original spot */
1603 if (prev_path2) {
1604 if (update_file(o, 1, b_oid, b_mode, prev_path2))
1605 return -1;
1606 } else {
1607 if (update_file(o, 1, b_oid, b_mode, collide_path))
1608 return -1;
18797a3b 1609 }
37b65ce3
EN
1610
1611 /* Don't leave something at collision path if unrenaming both */
1612 if (prev_path1 && prev_path2)
1613 remove_file(o, 1, collide_path, 0);
1614
1615 return 0;
1616 }
1617
1618 /* Remove rename sources if rename/add or rename/rename(2to1) */
1619 if (prev_path1)
1620 remove_file(o, 1, prev_path1,
0d6caa2d 1621 o->call_depth || would_lose_untracked(o, prev_path1));
37b65ce3
EN
1622 if (prev_path2)
1623 remove_file(o, 1, prev_path2,
0d6caa2d 1624 o->call_depth || would_lose_untracked(o, prev_path2));
37b65ce3
EN
1625
1626 /*
1627 * Remove the collision path, if it wouldn't cause dirty contents
1628 * or an untracked file to get lost. We'll either overwrite with
1629 * merged contents, or just write out to differently named files.
1630 */
1631 if (was_dirty(o, collide_path)) {
1632 output(o, 1, _("Refusing to lose dirty file at %s"),
1633 collide_path);
1634 update_path = alt_path = unique_path(o, collide_path, "merged");
0d6caa2d 1635 } else if (would_lose_untracked(o, collide_path)) {
18797a3b 1636 /*
37b65ce3
EN
1637 * Only way we get here is if both renames were from
1638 * a directory rename AND user had an untracked file
1639 * at the location where both files end up after the
1640 * two directory renames. See testcase 10d of t6043.
18797a3b 1641 */
37b65ce3
EN
1642 output(o, 1, _("Refusing to lose untracked file at "
1643 "%s, even though it's in the way."),
1644 collide_path);
1645 update_path = alt_path = unique_path(o, collide_path, "merged");
3672c971 1646 } else {
37b65ce3
EN
1647 /*
1648 * FIXME: It's possible that the two files are identical
1649 * and that the current working copy happens to match, in
1650 * which case we are unnecessarily touching the working
1651 * tree file. It's not a likely enough scenario that I
1652 * want to code up the checks for it and a better fix is
1653 * available if we restructure how unpack_trees() and
1654 * merge-recursive interoperate anyway, so punting for
1655 * now...
1656 */
1657 remove_file(o, 0, collide_path, 0);
9047ebbc 1658 }
3672c971 1659
37b65ce3
EN
1660 /* Store things in diff_filespecs for functions that need it */
1661 memset(&a, 0, sizeof(struct diff_filespec));
1662 memset(&b, 0, sizeof(struct diff_filespec));
1663 null.path = a.path = b.path = (char *)collide_path;
1664 oidcpy(&null.oid, &null_oid);
1665 null.mode = 0;
1666 oidcpy(&a.oid, a_oid);
1667 a.mode = a_mode;
1668 a.oid_valid = 1;
1669 oidcpy(&b.oid, b_oid);
1670 b.mode = b_mode;
1671 b.oid_valid = 1;
75456f96 1672
37b65ce3
EN
1673 if (merge_mode_and_contents(o, &null, &a, &b, collide_path,
1674 branch1, branch2, o->call_depth * 2, &mfi))
1675 return -1;
1676 mfi.clean &= !alt_path;
1677 if (update_file(o, mfi.clean, &mfi.oid, mfi.mode, update_path))
1678 return -1;
1679 if (!mfi.clean && !o->call_depth &&
1680 update_stages(o, collide_path, NULL, &a, &b))
1681 return -1;
1682 free(alt_path);
1683 /*
1684 * FIXME: If both a & b both started with conflicts (only possible
1685 * if they came from a rename/rename(2to1)), but had IDENTICAL
1686 * contents including those conflicts, then in the next line we claim
1687 * it was clean. If someone cares about this case, we should have the
1688 * caller notify us if we started with conflicts.
1689 */
1690 return mfi.clean;
1691}
7f867165
EN
1692
1693static int handle_rename_add(struct merge_options *o,
1694 struct rename_conflict_info *ci)
1695{
1696 /* a was renamed to c, and a separate c was added. */
1697 struct diff_filespec *a = ci->pair1->one;
1698 struct diff_filespec *c = ci->pair1->two;
1699 char *path = c->path;
1700 char *prev_path_desc;
1701 struct merge_file_info mfi;
1702
1703 int other_stage = (ci->branch1 == o->branch1 ? 3 : 2);
1704
1705 output(o, 1, _("CONFLICT (rename/add): "
1706 "Rename %s->%s in %s. Added %s in %s"),
1707 a->path, c->path, ci->branch1,
1708 c->path, ci->branch2);
1709
1710 prev_path_desc = xstrfmt("version of %s from %s", path, a->path);
1711 if (merge_mode_and_contents(o, a, c, &ci->ren1_other, prev_path_desc,
1712 o->branch1, o->branch2,
1713 1 + o->call_depth * 2, &mfi))
1714 return -1;
1715 free(prev_path_desc);
1716
1717 return handle_file_collision(o,
1718 c->path, a->path, NULL,
1719 ci->branch1, ci->branch2,
1720 &mfi.oid, mfi.mode,
1721 &ci->dst_entry1->stages[other_stage].oid,
1722 ci->dst_entry1->stages[other_stage].mode);
1723}
37b65ce3 1724
80cee6e3
DS
1725static char *find_path_for_conflict(struct merge_options *o,
1726 const char *path,
1727 const char *branch1,
1728 const char *branch2)
1729{
1730 char *new_path = NULL;
0d6caa2d 1731 if (dir_in_way(o->repo->index, path, !o->call_depth, 0)) {
80cee6e3
DS
1732 new_path = unique_path(o, path, branch1);
1733 output(o, 1, _("%s is a directory in %s adding "
1734 "as %s instead"),
1735 path, branch2, new_path);
0d6caa2d 1736 } else if (would_lose_untracked(o, path)) {
80cee6e3
DS
1737 new_path = unique_path(o, path, branch1);
1738 output(o, 1, _("Refusing to lose untracked file"
1739 " at %s; adding as %s instead"),
1740 path, new_path);
1741 }
1742
1743 return new_path;
3672c971
EN
1744}
1745
8ebe7b05
EN
1746static int handle_rename_rename_1to2(struct merge_options *o,
1747 struct rename_conflict_info *ci)
9047ebbc 1748{
09c01f85 1749 /* One file was renamed in both branches, but to different names. */
48c9cb9d
EN
1750 struct merge_file_info mfi;
1751 struct diff_filespec other;
1752 struct diff_filespec *add;
a99b7f22
EN
1753 struct diff_filespec *one = ci->pair1->one;
1754 struct diff_filespec *a = ci->pair1->two;
1755 struct diff_filespec *b = ci->pair2->two;
48c9cb9d 1756 char *path_desc;
4f66dade 1757
55653a68 1758 output(o, 1, _("CONFLICT (rename/rename): "
4f66dade 1759 "Rename \"%s\"->\"%s\" in branch \"%s\" "
55653a68 1760 "rename \"%s\"->\"%s\" in \"%s\"%s"),
a99b7f22
EN
1761 one->path, a->path, ci->branch1,
1762 one->path, b->path, ci->branch2,
55653a68 1763 o->call_depth ? _(" (left unresolved)") : "");
75456f96 1764
48c9cb9d
EN
1765 path_desc = xstrfmt("%s and %s, both renamed from %s",
1766 a->path, b->path, one->path);
1767 if (merge_mode_and_contents(o, one, a, b, path_desc,
1768 ci->branch1, ci->branch2,
1769 o->call_depth * 2, &mfi))
1770 return -1;
1771 free(path_desc);
1772
1773 if (o->call_depth) {
9047ebbc 1774 /*
c52ff85d
EN
1775 * FIXME: For rename/add-source conflicts (if we could detect
1776 * such), this is wrong. We should instead find a unique
1777 * pathname and then either rename the add-source file to that
1778 * unique path, or use that unique path instead of src here.
9047ebbc 1779 */
75456f96
JS
1780 if (update_file(o, 0, &mfi.oid, mfi.mode, one->path))
1781 return -1;
07413c5a 1782
6d63070c
EN
1783 /*
1784 * Above, we put the merged content at the merge-base's
1785 * path. Now we usually need to delete both a->path and
1786 * b->path. However, the rename on each side of the merge
1787 * could also be involved in a rename/add conflict. In
1788 * such cases, we should keep the added file around,
1789 * resolving the conflict at that path in its favor.
1790 */
1791 add = filespec_from_entry(&other, ci->dst_entry1, 2 ^ 1);
75456f96
JS
1792 if (add) {
1793 if (update_file(o, 0, &add->oid, add->mode, a->path))
1794 return -1;
1795 }
6d63070c 1796 else
0d6caa2d 1797 remove_file_from_index(o->repo->index, a->path);
6d63070c 1798 add = filespec_from_entry(&other, ci->dst_entry2, 3 ^ 1);
75456f96
JS
1799 if (add) {
1800 if (update_file(o, 0, &add->oid, add->mode, b->path))
1801 return -1;
1802 }
6d63070c 1803 else
0d6caa2d 1804 remove_file_from_index(o->repo->index, b->path);
48c9cb9d
EN
1805 } else {
1806 /*
1807 * For each destination path, we need to see if there is a
1808 * rename/add collision. If not, we can write the file out
1809 * to the specified location.
1810 */
1811 add = filespec_from_entry(&other, ci->dst_entry1, 2 ^ 1);
1812 if (add) {
1813 if (handle_file_collision(o, a->path,
1814 NULL, NULL,
1815 ci->branch1, ci->branch2,
1816 &mfi.oid, mfi.mode,
1817 &add->oid, add->mode) < 0)
1818 return -1;
1819 } else {
80cee6e3
DS
1820 char *new_path = find_path_for_conflict(o, a->path,
1821 ci->branch1,
1822 ci->branch2);
48c9cb9d
EN
1823 if (update_file(o, 0, &mfi.oid, mfi.mode, new_path ? new_path : a->path))
1824 return -1;
1825 free(new_path);
1826 if (update_stages(o, a->path, NULL, a, NULL))
1827 return -1;
1828 }
1829
1830 add = filespec_from_entry(&other, ci->dst_entry2, 3 ^ 1);
1831 if (add) {
1832 if (handle_file_collision(o, b->path,
1833 NULL, NULL,
1834 ci->branch1, ci->branch2,
1835 &add->oid, add->mode,
1836 &mfi.oid, mfi.mode) < 0)
1837 return -1;
1838 } else {
80cee6e3
DS
1839 char *new_path = find_path_for_conflict(o, b->path,
1840 ci->branch2,
1841 ci->branch1);
48c9cb9d
EN
1842 if (update_file(o, 0, &mfi.oid, mfi.mode, new_path ? new_path : b->path))
1843 return -1;
1844 free(new_path);
1845 if (update_stages(o, b->path, NULL, NULL, b))
1846 return -1;
1847 }
1848 }
75456f96
JS
1849
1850 return 0;
9047ebbc
MV
1851}
1852
8ebe7b05
EN
1853static int handle_rename_rename_2to1(struct merge_options *o,
1854 struct rename_conflict_info *ci)
9047ebbc 1855{
461f5041
EN
1856 /* Two files, a & b, were renamed to the same thing, c. */
1857 struct diff_filespec *a = ci->pair1->one;
1858 struct diff_filespec *b = ci->pair2->one;
1859 struct diff_filespec *c1 = ci->pair1->two;
1860 struct diff_filespec *c2 = ci->pair2->two;
1861 char *path = c1->path; /* == c2->path */
05cf21eb
EN
1862 char *path_side_1_desc;
1863 char *path_side_2_desc;
434b8525
EN
1864 struct merge_file_info mfi_c1;
1865 struct merge_file_info mfi_c2;
461f5041 1866
55653a68 1867 output(o, 1, _("CONFLICT (rename/rename): "
461f5041 1868 "Rename %s->%s in %s. "
55653a68 1869 "Rename %s->%s in %s"),
461f5041
EN
1870 a->path, c1->path, ci->branch1,
1871 b->path, c2->path, ci->branch2);
1872
2b168ef3
EN
1873 path_side_1_desc = xstrfmt("version of %s from %s", path, a->path);
1874 path_side_2_desc = xstrfmt("version of %s from %s", path, b->path);
d9573556 1875 if (merge_mode_and_contents(o, a, c1, &ci->ren1_other, path_side_1_desc,
b2a7942b 1876 o->branch1, o->branch2,
bbafc9c4 1877 1 + o->call_depth * 2, &mfi_c1) ||
d9573556 1878 merge_mode_and_contents(o, b, &ci->ren2_other, c2, path_side_2_desc,
b2a7942b 1879 o->branch1, o->branch2,
bbafc9c4 1880 1 + o->call_depth * 2, &mfi_c2))
75456f96 1881 return -1;
05cf21eb
EN
1882 free(path_side_1_desc);
1883 free(path_side_2_desc);
434b8525 1884
bbafc9c4
EN
1885 return handle_file_collision(o, path, a->path, b->path,
1886 ci->branch1, ci->branch2,
1887 &mfi_c1.oid, mfi_c1.mode,
1888 &mfi_c2.oid, mfi_c2.mode);
9047ebbc
MV
1889}
1890
9ba91557 1891/*
e5257b2a 1892 * Get the diff_filepairs changed between o_tree and tree.
9ba91557 1893 */
e5257b2a
EN
1894static struct diff_queue_struct *get_diffpairs(struct merge_options *o,
1895 struct tree *o_tree,
1896 struct tree *tree)
9ba91557 1897{
e5257b2a 1898 struct diff_queue_struct *ret;
9ba91557
EN
1899 struct diff_options opts;
1900
0d6caa2d 1901 repo_diff_setup(o->repo, &opts);
9ba91557
EN
1902 opts.flags.recursive = 1;
1903 opts.flags.rename_empty = 0;
85b46030
BP
1904 opts.detect_rename = merge_detect_rename(o);
1905 /*
1906 * We do not have logic to handle the detection of copies. In
1907 * fact, it may not even make sense to add such logic: would we
1908 * really want a change to a base file to be propagated through
1909 * multiple other files by a merge?
1910 */
1911 if (opts.detect_rename > DIFF_DETECT_RENAME)
1912 opts.detect_rename = DIFF_DETECT_RENAME;
9ba91557
EN
1913 opts.rename_limit = o->merge_rename_limit >= 0 ? o->merge_rename_limit :
1914 o->diff_rename_limit >= 0 ? o->diff_rename_limit :
1915 1000;
1916 opts.rename_score = o->rename_score;
1917 opts.show_rename_progress = o->show_rename_progress;
1918 opts.output_format = DIFF_FORMAT_NO_OUTPUT;
1919 diff_setup_done(&opts);
1920 diff_tree_oid(&o_tree->object.oid, &tree->object.oid, "", &opts);
1921 diffcore_std(&opts);
1922 if (opts.needed_rename_limit > o->needed_rename_limit)
1923 o->needed_rename_limit = opts.needed_rename_limit;
e5257b2a
EN
1924
1925 ret = xmalloc(sizeof(*ret));
1926 *ret = diff_queued_diff;
1927
1928 opts.output_format = DIFF_FORMAT_NO_OUTPUT;
1929 diff_queued_diff.nr = 0;
1930 diff_queued_diff.queue = NULL;
1931 diff_flush(&opts);
1932 return ret;
1933}
1934
96e7ffbd
EN
1935static int tree_has_path(struct tree *tree, const char *path)
1936{
1937 struct object_id hashy;
5ec1e728 1938 unsigned short mode_o;
96e7ffbd
EN
1939
1940 return !get_tree_entry(&tree->object.oid, path,
1941 &hashy, &mode_o);
1942}
1943
e95ab70a
EN
1944/*
1945 * Return a new string that replaces the beginning portion (which matches
1946 * entry->dir), with entry->new_dir. In perl-speak:
1947 * new_path_name = (old_path =~ s/entry->dir/entry->new_dir/);
1948 * NOTE:
1949 * Caller must ensure that old_path starts with entry->dir + '/'.
1950 */
1951static char *apply_dir_rename(struct dir_rename_entry *entry,
1952 const char *old_path)
1953{
1954 struct strbuf new_path = STRBUF_INIT;
1955 int oldlen, newlen;
1956
1957 if (entry->non_unique_new_dir)
1958 return NULL;
1959
1960 oldlen = strlen(entry->dir);
1961 newlen = entry->new_dir.len + (strlen(old_path) - oldlen) + 1;
1962 strbuf_grow(&new_path, newlen);
1963 strbuf_addbuf(&new_path, &entry->new_dir);
1964 strbuf_addstr(&new_path, &old_path[oldlen]);
1965
1966 return strbuf_detach(&new_path, NULL);
1967}
1968
7fe40b88
EN
1969static void get_renamed_dir_portion(const char *old_path, const char *new_path,
1970 char **old_dir, char **new_dir)
1971{
1972 char *end_of_old, *end_of_new;
1973 int old_len, new_len;
1974
1975 *old_dir = NULL;
1976 *new_dir = NULL;
1977
1978 /*
1979 * For
1980 * "a/b/c/d/e/foo.c" -> "a/b/some/thing/else/e/foo.c"
1981 * the "e/foo.c" part is the same, we just want to know that
1982 * "a/b/c/d" was renamed to "a/b/some/thing/else"
1983 * so, for this example, this function returns "a/b/c/d" in
1984 * *old_dir and "a/b/some/thing/else" in *new_dir.
1985 *
1986 * Also, if the basename of the file changed, we don't care. We
1987 * want to know which portion of the directory, if any, changed.
1988 */
1989 end_of_old = strrchr(old_path, '/');
1990 end_of_new = strrchr(new_path, '/');
1991
1992 if (end_of_old == NULL || end_of_new == NULL)
1993 return;
1994 while (*--end_of_new == *--end_of_old &&
1995 end_of_old != old_path &&
1996 end_of_new != new_path)
1997 ; /* Do nothing; all in the while loop */
1998 /*
1999 * We've found the first non-matching character in the directory
2000 * paths. That means the current directory we were comparing
2001 * represents the rename. Move end_of_old and end_of_new back
2002 * to the full directory name.
2003 */
2004 if (*end_of_old == '/')
2005 end_of_old++;
2006 if (*end_of_old != '/')
2007 end_of_new++;
2008 end_of_old = strchr(end_of_old, '/');
2009 end_of_new = strchr(end_of_new, '/');
2010
2011 /*
2012 * It may have been the case that old_path and new_path were the same
2013 * directory all along. Don't claim a rename if they're the same.
2014 */
2015 old_len = end_of_old - old_path;
2016 new_len = end_of_new - new_path;
2017
2018 if (old_len != new_len || strncmp(old_path, new_path, old_len)) {
2019 *old_dir = xstrndup(old_path, old_len);
2020 *new_dir = xstrndup(new_path, new_len);
2021 }
2022}
2023
96e7ffbd
EN
2024static void remove_hashmap_entries(struct hashmap *dir_renames,
2025 struct string_list *items_to_remove)
2026{
2027 int i;
2028 struct dir_rename_entry *entry;
2029
2030 for (i = 0; i < items_to_remove->nr; i++) {
2031 entry = items_to_remove->items[i].util;
2032 hashmap_remove(dir_renames, entry, NULL);
2033 }
2034 string_list_clear(items_to_remove, 0);
2035}
2036
f6f77559
EN
2037/*
2038 * See if there is a directory rename for path, and if there are any file
2039 * level conflicts for the renamed location. If there is a rename and
2040 * there are no conflicts, return the new name. Otherwise, return NULL.
2041 */
2042static char *handle_path_level_conflicts(struct merge_options *o,
2043 const char *path,
2044 struct dir_rename_entry *entry,
2045 struct hashmap *collisions,
2046 struct tree *tree)
2047{
2048 char *new_path = NULL;
2049 struct collision_entry *collision_ent;
2050 int clean = 1;
2051 struct strbuf collision_paths = STRBUF_INIT;
2052
2053 /*
2054 * entry has the mapping of old directory name to new directory name
2055 * that we want to apply to path.
2056 */
2057 new_path = apply_dir_rename(entry, path);
2058
2059 if (!new_path) {
2060 /* This should only happen when entry->non_unique_new_dir set */
2061 if (!entry->non_unique_new_dir)
2062 BUG("entry->non_unqiue_dir not set and !new_path");
2063 output(o, 1, _("CONFLICT (directory rename split): "
2064 "Unclear where to place %s because directory "
2065 "%s was renamed to multiple other directories, "
2066 "with no destination getting a majority of the "
2067 "files."),
2068 path, entry->dir);
2069 clean = 0;
2070 return NULL;
2071 }
2072
2073 /*
2074 * The caller needs to have ensured that it has pre-populated
2075 * collisions with all paths that map to new_path. Do a quick check
2076 * to ensure that's the case.
2077 */
2078 collision_ent = collision_find_entry(collisions, new_path);
2079 if (collision_ent == NULL)
2080 BUG("collision_ent is NULL");
2081
2082 /*
2083 * Check for one-sided add/add/.../add conflicts, i.e.
2084 * where implicit renames from the other side doing
2085 * directory rename(s) can affect this side of history
2086 * to put multiple paths into the same location. Warn
2087 * and bail on directory renames for such paths.
2088 */
2089 if (collision_ent->reported_already) {
2090 clean = 0;
2091 } else if (tree_has_path(tree, new_path)) {
2092 collision_ent->reported_already = 1;
2093 strbuf_add_separated_string_list(&collision_paths, ", ",
2094 &collision_ent->source_files);
2095 output(o, 1, _("CONFLICT (implicit dir rename): Existing "
2096 "file/dir at %s in the way of implicit "
2097 "directory rename(s) putting the following "
2098 "path(s) there: %s."),
2099 new_path, collision_paths.buf);
2100 clean = 0;
2101 } else if (collision_ent->source_files.nr > 1) {
2102 collision_ent->reported_already = 1;
2103 strbuf_add_separated_string_list(&collision_paths, ", ",
2104 &collision_ent->source_files);
2105 output(o, 1, _("CONFLICT (implicit dir rename): Cannot map "
2106 "more than one path to %s; implicit directory "
2107 "renames tried to put these paths there: %s"),
2108 new_path, collision_paths.buf);
2109 clean = 0;
2110 }
2111
2112 /* Free memory we no longer need */
2113 strbuf_release(&collision_paths);
2114 if (!clean && new_path) {
2115 free(new_path);
2116 return NULL;
2117 }
2118
2119 return new_path;
2120}
2121
96e7ffbd
EN
2122/*
2123 * There are a couple things we want to do at the directory level:
2124 * 1. Check for both sides renaming to the same thing, in order to avoid
2125 * implicit renaming of files that should be left in place. (See
2126 * testcase 6b in t6043 for details.)
2127 * 2. Prune directory renames if there are still files left in the
2128 * the original directory. These represent a partial directory rename,
2129 * i.e. a rename where only some of the files within the directory
2130 * were renamed elsewhere. (Technically, this could be done earlier
2131 * in get_directory_renames(), except that would prevent us from
2132 * doing the previous check and thus failing testcase 6b.)
2133 * 3. Check for rename/rename(1to2) conflicts (at the directory level).
2134 * In the future, we could potentially record this info as well and
2135 * omit reporting rename/rename(1to2) conflicts for each path within
2136 * the affected directories, thus cleaning up the merge output.
2137 * NOTE: We do NOT check for rename/rename(2to1) conflicts at the
2138 * directory level, because merging directories is fine. If it
2139 * causes conflicts for files within those merged directories, then
2140 * that should be detected at the individual path level.
2141 */
2142static void handle_directory_level_conflicts(struct merge_options *o,
2143 struct hashmap *dir_re_head,
2144 struct tree *head,
2145 struct hashmap *dir_re_merge,
2146 struct tree *merge)
2147{
2148 struct hashmap_iter iter;
2149 struct dir_rename_entry *head_ent;
2150 struct dir_rename_entry *merge_ent;
2151
2152 struct string_list remove_from_head = STRING_LIST_INIT_NODUP;
2153 struct string_list remove_from_merge = STRING_LIST_INIT_NODUP;
2154
2155 hashmap_iter_init(dir_re_head, &iter);
2156 while ((head_ent = hashmap_iter_next(&iter))) {
2157 merge_ent = dir_rename_find_entry(dir_re_merge, head_ent->dir);
2158 if (merge_ent &&
2159 !head_ent->non_unique_new_dir &&
2160 !merge_ent->non_unique_new_dir &&
2161 !strbuf_cmp(&head_ent->new_dir, &merge_ent->new_dir)) {
2162 /* 1. Renamed identically; remove it from both sides */
2163 string_list_append(&remove_from_head,
2164 head_ent->dir)->util = head_ent;
2165 strbuf_release(&head_ent->new_dir);
2166 string_list_append(&remove_from_merge,
2167 merge_ent->dir)->util = merge_ent;
2168 strbuf_release(&merge_ent->new_dir);
2169 } else if (tree_has_path(head, head_ent->dir)) {
2170 /* 2. This wasn't a directory rename after all */
2171 string_list_append(&remove_from_head,
2172 head_ent->dir)->util = head_ent;
2173 strbuf_release(&head_ent->new_dir);
2174 }
2175 }
2176
2177 remove_hashmap_entries(dir_re_head, &remove_from_head);
2178 remove_hashmap_entries(dir_re_merge, &remove_from_merge);
2179
2180 hashmap_iter_init(dir_re_merge, &iter);
2181 while ((merge_ent = hashmap_iter_next(&iter))) {
2182 head_ent = dir_rename_find_entry(dir_re_head, merge_ent->dir);
2183 if (tree_has_path(merge, merge_ent->dir)) {
2184 /* 2. This wasn't a directory rename after all */
2185 string_list_append(&remove_from_merge,
2186 merge_ent->dir)->util = merge_ent;
2187 } else if (head_ent &&
2188 !head_ent->non_unique_new_dir &&
2189 !merge_ent->non_unique_new_dir) {
2190 /* 3. rename/rename(1to2) */
2191 /*
2192 * We can assume it's not rename/rename(1to1) because
2193 * that was case (1), already checked above. So we
2194 * know that head_ent->new_dir and merge_ent->new_dir
2195 * are different strings.
2196 */
2197 output(o, 1, _("CONFLICT (rename/rename): "
2198 "Rename directory %s->%s in %s. "
2199 "Rename directory %s->%s in %s"),
2200 head_ent->dir, head_ent->new_dir.buf, o->branch1,
2201 head_ent->dir, merge_ent->new_dir.buf, o->branch2);
2202 string_list_append(&remove_from_head,
2203 head_ent->dir)->util = head_ent;
2204 strbuf_release(&head_ent->new_dir);
2205 string_list_append(&remove_from_merge,
2206 merge_ent->dir)->util = merge_ent;
2207 strbuf_release(&merge_ent->new_dir);
2208 }
2209 }
2210
2211 remove_hashmap_entries(dir_re_head, &remove_from_head);
2212 remove_hashmap_entries(dir_re_merge, &remove_from_merge);
2213}
2214
b53c5028 2215static struct hashmap *get_directory_renames(struct diff_queue_struct *pairs)
7fe40b88
EN
2216{
2217 struct hashmap *dir_renames;
2218 struct hashmap_iter iter;
2219 struct dir_rename_entry *entry;
2220 int i;
2221
2222 /*
2223 * Typically, we think of a directory rename as all files from a
2224 * certain directory being moved to a target directory. However,
2225 * what if someone first moved two files from the original
2226 * directory in one commit, and then renamed the directory
2227 * somewhere else in a later commit? At merge time, we just know
2228 * that files from the original directory went to two different
2229 * places, and that the bulk of them ended up in the same place.
2230 * We want each directory rename to represent where the bulk of the
2231 * files from that directory end up; this function exists to find
2232 * where the bulk of the files went.
2233 *
2234 * The first loop below simply iterates through the list of file
2235 * renames, finding out how often each directory rename pair
2236 * possibility occurs.
2237 */
2238 dir_renames = xmalloc(sizeof(*dir_renames));
2239 dir_rename_init(dir_renames);
2240 for (i = 0; i < pairs->nr; ++i) {
2241 struct string_list_item *item;
2242 int *count;
2243 struct diff_filepair *pair = pairs->queue[i];
2244 char *old_dir, *new_dir;
2245
2246 /* File not part of directory rename if it wasn't renamed */
2247 if (pair->status != 'R')
2248 continue;
2249
2250 get_renamed_dir_portion(pair->one->path, pair->two->path,
2251 &old_dir, &new_dir);
2252 if (!old_dir)
2253 /* Directory didn't change at all; ignore this one. */
2254 continue;
2255
2256 entry = dir_rename_find_entry(dir_renames, old_dir);
2257 if (!entry) {
2258 entry = xmalloc(sizeof(*entry));
2259 dir_rename_entry_init(entry, old_dir);
2260 hashmap_put(dir_renames, entry);
2261 } else {
2262 free(old_dir);
2263 }
2264 item = string_list_lookup(&entry->possible_new_dirs, new_dir);
2265 if (!item) {
2266 item = string_list_insert(&entry->possible_new_dirs,
2267 new_dir);
2268 item->util = xcalloc(1, sizeof(int));
2269 } else {
2270 free(new_dir);
2271 }
2272 count = item->util;
2273 *count += 1;
2274 }
2275
2276 /*
2277 * For each directory with files moved out of it, we find out which
2278 * target directory received the most files so we can declare it to
2279 * be the "winning" target location for the directory rename. This
2280 * winner gets recorded in new_dir. If there is no winner
2281 * (multiple target directories received the same number of files),
2282 * we set non_unique_new_dir. Once we've determined the winner (or
2283 * that there is no winner), we no longer need possible_new_dirs.
2284 */
2285 hashmap_iter_init(dir_renames, &iter);
2286 while ((entry = hashmap_iter_next(&iter))) {
2287 int max = 0;
2288 int bad_max = 0;
2289 char *best = NULL;
2290
2291 for (i = 0; i < entry->possible_new_dirs.nr; i++) {
2292 int *count = entry->possible_new_dirs.items[i].util;
2293
2294 if (*count == max)
2295 bad_max = max;
2296 else if (*count > max) {
2297 max = *count;
2298 best = entry->possible_new_dirs.items[i].string;
2299 }
2300 }
2301 if (bad_max == max)
2302 entry->non_unique_new_dir = 1;
2303 else {
2304 assert(entry->new_dir.len == 0);
2305 strbuf_addstr(&entry->new_dir, best);
2306 }
2307 /*
2308 * The relevant directory sub-portion of the original full
2309 * filepaths were xstrndup'ed before inserting into
2310 * possible_new_dirs, and instead of manually iterating the
2311 * list and free'ing each, just lie and tell
2312 * possible_new_dirs that it did the strdup'ing so that it
2313 * will free them for us.
2314 */
2315 entry->possible_new_dirs.strdup_strings = 1;
2316 string_list_clear(&entry->possible_new_dirs, 1);
2317 }
2318
2319 return dir_renames;
2320}
2321
e95ab70a
EN
2322static struct dir_rename_entry *check_dir_renamed(const char *path,
2323 struct hashmap *dir_renames)
2324{
9da2d037 2325 char *temp = xstrdup(path);
e95ab70a 2326 char *end;
c3b9bc94 2327 struct dir_rename_entry *entry = NULL;
e95ab70a 2328
e95ab70a
EN
2329 while ((end = strrchr(temp, '/'))) {
2330 *end = '\0';
2331 entry = dir_rename_find_entry(dir_renames, temp);
2332 if (entry)
9da2d037 2333 break;
e95ab70a 2334 }
9da2d037
RS
2335 free(temp);
2336 return entry;
e95ab70a
EN
2337}
2338
2339static void compute_collisions(struct hashmap *collisions,
2340 struct hashmap *dir_renames,
2341 struct diff_queue_struct *pairs)
2342{
2343 int i;
2344
2345 /*
2346 * Multiple files can be mapped to the same path due to directory
2347 * renames done by the other side of history. Since that other
2348 * side of history could have merged multiple directories into one,
2349 * if our side of history added the same file basename to each of
2350 * those directories, then all N of them would get implicitly
2351 * renamed by the directory rename detection into the same path,
2352 * and we'd get an add/add/.../add conflict, and all those adds
2353 * from *this* side of history. This is not representable in the
2354 * index, and users aren't going to easily be able to make sense of
2355 * it. So we need to provide a good warning about what's
2356 * happening, and fall back to no-directory-rename detection
2357 * behavior for those paths.
2358 *
2359 * See testcases 9e and all of section 5 from t6043 for examples.
2360 */
2361 collision_init(collisions);
2362
2363 for (i = 0; i < pairs->nr; ++i) {
2364 struct dir_rename_entry *dir_rename_ent;
2365 struct collision_entry *collision_ent;
2366 char *new_path;
2367 struct diff_filepair *pair = pairs->queue[i];
2368
6e7e027f 2369 if (pair->status != 'A' && pair->status != 'R')
e95ab70a
EN
2370 continue;
2371 dir_rename_ent = check_dir_renamed(pair->two->path,
2372 dir_renames);
2373 if (!dir_rename_ent)
2374 continue;
2375
2376 new_path = apply_dir_rename(dir_rename_ent, pair->two->path);
2377 if (!new_path)
2378 /*
2379 * dir_rename_ent->non_unique_new_path is true, which
2380 * means there is no directory rename for us to use,
2381 * which means it won't cause us any additional
2382 * collisions.
2383 */
2384 continue;
2385 collision_ent = collision_find_entry(collisions, new_path);
2386 if (!collision_ent) {
2387 collision_ent = xcalloc(1,
2388 sizeof(struct collision_entry));
2389 hashmap_entry_init(collision_ent, strhash(new_path));
2390 hashmap_put(collisions, collision_ent);
2391 collision_ent->target_file = new_path;
2392 } else {
2393 free(new_path);
2394 }
2395 string_list_insert(&collision_ent->source_files,
2396 pair->two->path);
2397 }
2398}
2399
f6f77559
EN
2400static char *check_for_directory_rename(struct merge_options *o,
2401 const char *path,
2402 struct tree *tree,
2403 struct hashmap *dir_renames,
2404 struct hashmap *dir_rename_exclusions,
2405 struct hashmap *collisions,
2406 int *clean_merge)
2407{
2408 char *new_path = NULL;
2409 struct dir_rename_entry *entry = check_dir_renamed(path, dir_renames);
2410 struct dir_rename_entry *oentry = NULL;
2411
2412 if (!entry)
2413 return new_path;
2414
2415 /*
2416 * This next part is a little weird. We do not want to do an
2417 * implicit rename into a directory we renamed on our side, because
2418 * that will result in a spurious rename/rename(1to2) conflict. An
2419 * example:
2420 * Base commit: dumbdir/afile, otherdir/bfile
2421 * Side 1: smrtdir/afile, otherdir/bfile
2422 * Side 2: dumbdir/afile, dumbdir/bfile
2423 * Here, while working on Side 1, we could notice that otherdir was
2424 * renamed/merged to dumbdir, and change the diff_filepair for
2425 * otherdir/bfile into a rename into dumbdir/bfile. However, Side
2426 * 2 will notice the rename from dumbdir to smrtdir, and do the
2427 * transitive rename to move it from dumbdir/bfile to
2428 * smrtdir/bfile. That gives us bfile in dumbdir vs being in
2429 * smrtdir, a rename/rename(1to2) conflict. We really just want
2430 * the file to end up in smrtdir. And the way to achieve that is
2431 * to not let Side1 do the rename to dumbdir, since we know that is
2432 * the source of one of our directory renames.
2433 *
2434 * That's why oentry and dir_rename_exclusions is here.
2435 *
2436 * As it turns out, this also prevents N-way transient rename
2437 * confusion; See testcases 9c and 9d of t6043.
2438 */
2439 oentry = dir_rename_find_entry(dir_rename_exclusions, entry->new_dir.buf);
2440 if (oentry) {
2441 output(o, 1, _("WARNING: Avoiding applying %s -> %s rename "
2442 "to %s, because %s itself was renamed."),
2443 entry->dir, entry->new_dir.buf, path, entry->new_dir.buf);
2444 } else {
2445 new_path = handle_path_level_conflicts(o, path, entry,
2446 collisions, tree);
2447 *clean_merge &= (new_path != NULL);
2448 }
2449
2450 return new_path;
2451}
2452
9c0743fe
EN
2453static void apply_directory_rename_modifications(struct merge_options *o,
2454 struct diff_filepair *pair,
2455 char *new_path,
2456 struct rename *re,
2457 struct tree *tree,
2458 struct tree *o_tree,
2459 struct tree *a_tree,
2460 struct tree *b_tree,
b53c5028 2461 struct string_list *entries)
9c0743fe
EN
2462{
2463 struct string_list_item *item;
2464 int stage = (tree == a_tree ? 2 : 3);
18797a3b 2465 int update_wd;
9c0743fe
EN
2466
2467 /*
2468 * In all cases where we can do directory rename detection,
2469 * unpack_trees() will have read pair->two->path into the
2470 * index and the working copy. We need to remove it so that
2471 * we can instead place it at new_path. It is guaranteed to
2472 * not be untracked (unpack_trees() would have errored out
2473 * saying the file would have been overwritten), but it might
2474 * be dirty, though.
2475 */
18797a3b
EN
2476 update_wd = !was_dirty(o, pair->two->path);
2477 if (!update_wd)
2478 output(o, 1, _("Refusing to lose dirty file at %s"),
2479 pair->two->path);
2480 remove_file(o, 1, pair->two->path, !update_wd);
9c0743fe
EN
2481
2482 /* Find or create a new re->dst_entry */
2483 item = string_list_lookup(entries, new_path);
2484 if (item) {
2485 /*
2486 * Since we're renaming on this side of history, and it's
2487 * due to a directory rename on the other side of history
2488 * (which we only allow when the directory in question no
2489 * longer exists on the other side of history), the
2490 * original entry for re->dst_entry is no longer
2491 * necessary...
2492 */
2493 re->dst_entry->processed = 1;
2494
2495 /*
2496 * ...because we'll be using this new one.
2497 */
2498 re->dst_entry = item->util;
2499 } else {
2500 /*
2501 * re->dst_entry is for the before-dir-rename path, and we
2502 * need it to hold information for the after-dir-rename
2503 * path. Before creating a new entry, we need to mark the
2504 * old one as unnecessary (...unless it is shared by
2505 * src_entry, i.e. this didn't use to be a rename, in which
2506 * case we can just allow the normal processing to happen
2507 * for it).
2508 */
2509 if (pair->status == 'R')
2510 re->dst_entry->processed = 1;
2511
2512 re->dst_entry = insert_stage_data(new_path,
2513 o_tree, a_tree, b_tree,
2514 entries);
2515 item = string_list_insert(entries, new_path);
2516 item->util = re->dst_entry;
2517 }
2518
2519 /*
2520 * Update the stage_data with the information about the path we are
2521 * moving into place. That slot will be empty and available for us
2522 * to write to because of the collision checks in
2523 * handle_path_level_conflicts(). In other words,
2524 * re->dst_entry->stages[stage].oid will be the null_oid, so it's
2525 * open for us to write to.
2526 *
2527 * It may be tempting to actually update the index at this point as
2528 * well, using update_stages_for_stage_data(), but as per the big
2529 * "NOTE" in update_stages(), doing so will modify the current
2530 * in-memory index which will break calls to would_lose_untracked()
2531 * that we need to make. Instead, we need to just make sure that
8ebe7b05 2532 * the various handle_rename_*() functions update the index
9c0743fe
EN
2533 * explicitly rather than relying on unpack_trees() to have done it.
2534 */
2535 get_tree_entry(&tree->object.oid,
2536 pair->two->path,
2537 &re->dst_entry->stages[stage].oid,
2538 &re->dst_entry->stages[stage].mode);
2539
2540 /* Update pair status */
2541 if (pair->status == 'A') {
2542 /*
2543 * Recording rename information for this add makes it look
2544 * like a rename/delete conflict. Make sure we can
2545 * correctly handle this as an add that was moved to a new
2546 * directory instead of reporting a rename/delete conflict.
2547 */
2548 re->add_turned_into_rename = 1;
2549 }
2550 /*
2551 * We don't actually look at pair->status again, but it seems
2552 * pedagogically correct to adjust it.
2553 */
2554 pair->status = 'R';
2555
2556 /*
2557 * Finally, record the new location.
2558 */
2559 pair->two->path = new_path;
2560}
2561
e5257b2a
EN
2562/*
2563 * Get information of all renames which occurred in 'pairs', making use of
2564 * any implicit directory renames inferred from the other side of history.
2565 * We need the three trees in the merge ('o_tree', 'a_tree' and 'b_tree')
2566 * to be able to associate the correct cache entries with the rename
2567 * information; tree is always equal to either a_tree or b_tree.
2568 */
2569static struct string_list *get_renames(struct merge_options *o,
2570 struct diff_queue_struct *pairs,
e95ab70a 2571 struct hashmap *dir_renames,
f6f77559 2572 struct hashmap *dir_rename_exclusions,
e5257b2a
EN
2573 struct tree *tree,
2574 struct tree *o_tree,
2575 struct tree *a_tree,
2576 struct tree *b_tree,
f6f77559
EN
2577 struct string_list *entries,
2578 int *clean_merge)
e5257b2a
EN
2579{
2580 int i;
e95ab70a
EN
2581 struct hashmap collisions;
2582 struct hashmap_iter iter;
2583 struct collision_entry *e;
e5257b2a
EN
2584 struct string_list *renames;
2585
e95ab70a 2586 compute_collisions(&collisions, dir_renames, pairs);
e5257b2a
EN
2587 renames = xcalloc(1, sizeof(struct string_list));
2588
2589 for (i = 0; i < pairs->nr; ++i) {
9ba91557
EN
2590 struct string_list_item *item;
2591 struct rename *re;
e5257b2a 2592 struct diff_filepair *pair = pairs->queue[i];
f6f77559 2593 char *new_path; /* non-NULL only with directory renames */
9ba91557 2594
6e7e027f 2595 if (pair->status != 'A' && pair->status != 'R') {
9ba91557
EN
2596 diff_free_filepair(pair);
2597 continue;
2598 }
f6f77559
EN
2599 new_path = check_for_directory_rename(o, pair->two->path, tree,
2600 dir_renames,
2601 dir_rename_exclusions,
2602 &collisions,
2603 clean_merge);
2604 if (pair->status != 'R' && !new_path) {
2605 diff_free_filepair(pair);
2606 continue;
2607 }
2608
9ba91557
EN
2609 re = xmalloc(sizeof(*re));
2610 re->processed = 0;
9c0743fe 2611 re->add_turned_into_rename = 0;
9ba91557
EN
2612 re->pair = pair;
2613 item = string_list_lookup(entries, re->pair->one->path);
2614 if (!item)
2615 re->src_entry = insert_stage_data(re->pair->one->path,
2616 o_tree, a_tree, b_tree, entries);
2617 else
2618 re->src_entry = item->util;
2619
2620 item = string_list_lookup(entries, re->pair->two->path);
2621 if (!item)
2622 re->dst_entry = insert_stage_data(re->pair->two->path,
2623 o_tree, a_tree, b_tree, entries);
2624 else
2625 re->dst_entry = item->util;
2626 item = string_list_insert(renames, pair->one->path);
2627 item->util = re;
9c0743fe
EN
2628 if (new_path)
2629 apply_directory_rename_modifications(o, pair, new_path,
2630 re, tree, o_tree,
2631 a_tree, b_tree,
b53c5028 2632 entries);
9ba91557 2633 }
e95ab70a
EN
2634
2635 hashmap_iter_init(&collisions, &iter);
2636 while ((e = hashmap_iter_next(&iter))) {
2637 free(e->target_file);
2638 string_list_clear(&e->source_files, 0);
2639 }
2640 hashmap_free(&collisions, 1);
9ba91557
EN
2641 return renames;
2642}
2643
8a2fce18
MV
2644static int process_renames(struct merge_options *o,
2645 struct string_list *a_renames,
2646 struct string_list *b_renames)
9047ebbc
MV
2647{
2648 int clean_merge = 1, i, j;
183113a5
TF
2649 struct string_list a_by_dst = STRING_LIST_INIT_NODUP;
2650 struct string_list b_by_dst = STRING_LIST_INIT_NODUP;
9047ebbc
MV
2651 const struct rename *sre;
2652
2653 for (i = 0; i < a_renames->nr; i++) {
2654 sre = a_renames->items[i].util;
78a395d3 2655 string_list_insert(&a_by_dst, sre->pair->two->path)->util
0a6b8712 2656 = (void *)sre;
9047ebbc
MV
2657 }
2658 for (i = 0; i < b_renames->nr; i++) {
2659 sre = b_renames->items[i].util;
78a395d3 2660 string_list_insert(&b_by_dst, sre->pair->two->path)->util
0a6b8712 2661 = (void *)sre;
9047ebbc
MV
2662 }
2663
2664 for (i = 0, j = 0; i < a_renames->nr || j < b_renames->nr;) {
8e24cbae 2665 struct string_list *renames1, *renames2Dst;
9047ebbc
MV
2666 struct rename *ren1 = NULL, *ren2 = NULL;
2667 const char *branch1, *branch2;
2668 const char *ren1_src, *ren1_dst;
461f5041 2669 struct string_list_item *lookup;
9047ebbc
MV
2670
2671 if (i >= a_renames->nr) {
9047ebbc
MV
2672 ren2 = b_renames->items[j++].util;
2673 } else if (j >= b_renames->nr) {
9047ebbc
MV
2674 ren1 = a_renames->items[i++].util;
2675 } else {
8e24cbae
BK
2676 int compare = strcmp(a_renames->items[i].string,
2677 b_renames->items[j].string);
9047ebbc
MV
2678 if (compare <= 0)
2679 ren1 = a_renames->items[i++].util;
2680 if (compare >= 0)
2681 ren2 = b_renames->items[j++].util;
2682 }
2683
2684 /* TODO: refactor, so that 1/2 are not needed */
2685 if (ren1) {
2686 renames1 = a_renames;
9047ebbc 2687 renames2Dst = &b_by_dst;
8a2fce18
MV
2688 branch1 = o->branch1;
2689 branch2 = o->branch2;
9047ebbc 2690 } else {
9047ebbc 2691 renames1 = b_renames;
9047ebbc 2692 renames2Dst = &a_by_dst;
8a2fce18
MV
2693 branch1 = o->branch2;
2694 branch2 = o->branch1;
35d803bc 2695 SWAP(ren2, ren1);
9047ebbc 2696 }
9047ebbc 2697
9047ebbc
MV
2698 if (ren1->processed)
2699 continue;
2700 ren1->processed = 1;
9047ebbc 2701 ren1->dst_entry->processed = 1;
7769a75e
EN
2702 /* BUG: We should only mark src_entry as processed if we
2703 * are not dealing with a rename + add-source case.
2704 */
9047ebbc 2705 ren1->src_entry->processed = 1;
9047ebbc
MV
2706
2707 ren1_src = ren1->pair->one->path;
2708 ren1_dst = ren1->pair->two->path;
2709
2710 if (ren2) {
461f5041 2711 /* One file renamed on both sides */
9047ebbc
MV
2712 const char *ren2_src = ren2->pair->one->path;
2713 const char *ren2_dst = ren2->pair->two->path;
4f66dade 2714 enum rename_type rename_type;
9047ebbc 2715 if (strcmp(ren1_src, ren2_src) != 0)
033abf97 2716 BUG("ren1_src != ren2_src");
9047ebbc
MV
2717 ren2->dst_entry->processed = 1;
2718 ren2->processed = 1;
2719 if (strcmp(ren1_dst, ren2_dst) != 0) {
4f66dade 2720 rename_type = RENAME_ONE_FILE_TO_TWO;
461f5041 2721 clean_merge = 0;
9047ebbc 2722 } else {
4f66dade 2723 rename_type = RENAME_ONE_FILE_TO_ONE;
7769a75e
EN
2724 /* BUG: We should only remove ren1_src in
2725 * the base stage (think of rename +
2726 * add-source cases).
2727 */
b7fa51da 2728 remove_file(o, 1, ren1_src, 1);
b8ddf164
EN
2729 update_entry(ren1->dst_entry,
2730 ren1->pair->one,
2731 ren1->pair->two,
2732 ren2->pair->two);
9047ebbc 2733 }
4f66dade
EN
2734 setup_rename_conflict_info(rename_type,
2735 ren1->pair,
2736 ren2->pair,
2737 branch1,
2738 branch2,
2739 ren1->dst_entry,
232c635f
EN
2740 ren2->dst_entry,
2741 o,
2742 NULL,
2743 NULL);
461f5041
EN
2744 } else if ((lookup = string_list_lookup(renames2Dst, ren1_dst))) {
2745 /* Two different files renamed to the same thing */
2746 char *ren2_dst;
2747 ren2 = lookup->util;
2748 ren2_dst = ren2->pair->two->path;
2749 if (strcmp(ren1_dst, ren2_dst) != 0)
033abf97 2750 BUG("ren1_dst != ren2_dst");
461f5041
EN
2751
2752 clean_merge = 0;
2753 ren2->processed = 1;
2754 /*
2755 * BUG: We should only mark src_entry as processed
2756 * if we are not dealing with a rename + add-source
2757 * case.
2758 */
2759 ren2->src_entry->processed = 1;
2760
2761 setup_rename_conflict_info(RENAME_TWO_FILES_TO_ONE,
2762 ren1->pair,
2763 ren2->pair,
2764 branch1,
2765 branch2,
2766 ren1->dst_entry,
232c635f
EN
2767 ren2->dst_entry,
2768 o,
2769 ren1->src_entry,
2770 ren2->src_entry);
2771
9047ebbc
MV
2772 } else {
2773 /* Renamed in 1, maybe changed in 2 */
9047ebbc
MV
2774 /* we only use sha1 and mode of these */
2775 struct diff_filespec src_other, dst_other;
41d70bd6 2776 int try_merge;
9047ebbc 2777
41d70bd6
EN
2778 /*
2779 * unpack_trees loads entries from common-commit
2780 * into stage 1, from head-commit into stage 2, and
2781 * from merge-commit into stage 3. We keep track
2782 * of which side corresponds to the rename.
2783 */
2784 int renamed_stage = a_renames == renames1 ? 2 : 3;
2785 int other_stage = a_renames == renames1 ? 3 : 2;
9047ebbc 2786
7769a75e
EN
2787 /* BUG: We should only remove ren1_src in the base
2788 * stage and in other_stage (think of rename +
2789 * add-source case).
2790 */
531357a4 2791 remove_file(o, 1, ren1_src,
a35edc84 2792 renamed_stage == 2 || !was_tracked(o, ren1_src));
9047ebbc 2793
fd429e98 2794 oidcpy(&src_other.oid,
2795 &ren1->src_entry->stages[other_stage].oid);
41d70bd6 2796 src_other.mode = ren1->src_entry->stages[other_stage].mode;
fd429e98 2797 oidcpy(&dst_other.oid,
2798 &ren1->dst_entry->stages[other_stage].oid);
41d70bd6 2799 dst_other.mode = ren1->dst_entry->stages[other_stage].mode;
9047ebbc
MV
2800 try_merge = 0;
2801
9c0743fe
EN
2802 if (oid_eq(&src_other.oid, &null_oid) &&
2803 ren1->add_turned_into_rename) {
5455c338 2804 setup_rename_conflict_info(RENAME_VIA_DIR,
9c0743fe
EN
2805 ren1->pair,
2806 NULL,
2807 branch1,
2808 branch2,
2809 ren1->dst_entry,
2810 NULL,
2811 o,
2812 NULL,
2813 NULL);
2814 } else if (oid_eq(&src_other.oid, &null_oid)) {
4f66dade
EN
2815 setup_rename_conflict_info(RENAME_DELETE,
2816 ren1->pair,
2817 NULL,
2818 branch1,
2819 branch2,
2820 ren1->dst_entry,
232c635f
EN
2821 NULL,
2822 o,
2823 NULL,
4f66dade 2824 NULL);
d5af5105 2825 } else if ((dst_other.mode == ren1->pair->two->mode) &&
b4da9d62 2826 oid_eq(&dst_other.oid, &ren1->pair->two->oid)) {
35a74abf
EN
2827 /*
2828 * Added file on the other side identical to
2829 * the file being renamed: clean merge.
2830 * Also, there is no need to overwrite the
2831 * file already in the working copy, so call
2832 * update_file_flags() instead of
2833 * update_file().
2834 */
75456f96
JS
2835 if (update_file_flags(o,
2836 &ren1->pair->two->oid,
2837 ren1->pair->two->mode,
2838 ren1_dst,
2839 1, /* update_cache */
2840 0 /* update_wd */))
2841 clean_merge = -1;
b4da9d62 2842 } else if (!oid_eq(&dst_other.oid, &null_oid)) {
7f867165
EN
2843 /*
2844 * Probably not a clean merge, but it's
2845 * premature to set clean_merge to 0 here,
2846 * because if the rename merges cleanly and
2847 * the merge exactly matches the newly added
2848 * file, then the merge will be clean.
2849 */
2850 setup_rename_conflict_info(RENAME_ADD,
2851 ren1->pair,
2852 NULL,
2853 branch1,
2854 branch2,
2855 ren1->dst_entry,
2856 NULL,
2857 o,
2858 ren1->src_entry,
2859 NULL);
9047ebbc
MV
2860 } else
2861 try_merge = 1;
2862
75456f96
JS
2863 if (clean_merge < 0)
2864 goto cleanup_and_return;
9047ebbc 2865 if (try_merge) {
8a2fce18 2866 struct diff_filespec *one, *a, *b;
9047ebbc
MV
2867 src_other.path = (char *)ren1_src;
2868
8a2fce18 2869 one = ren1->pair->one;
9047ebbc
MV
2870 if (a_renames == renames1) {
2871 a = ren1->pair->two;
2872 b = &src_other;
2873 } else {
2874 b = ren1->pair->two;
2875 a = &src_other;
2876 }
b8ddf164 2877 update_entry(ren1->dst_entry, one, a, b);
4f66dade
EN
2878 setup_rename_conflict_info(RENAME_NORMAL,
2879 ren1->pair,
2880 NULL,
2881 branch1,
2882 NULL,
2883 ren1->dst_entry,
232c635f
EN
2884 NULL,
2885 o,
2886 NULL,
4f66dade 2887 NULL);
9047ebbc
MV
2888 }
2889 }
2890 }
75456f96 2891cleanup_and_return:
9047ebbc
MV
2892 string_list_clear(&a_by_dst, 0);
2893 string_list_clear(&b_by_dst, 0);
2894
2895 return clean_merge;
2896}
2897
f172589e
EN
2898struct rename_info {
2899 struct string_list *head_renames;
2900 struct string_list *merge_renames;
2901};
2902
7fe40b88
EN
2903static void initial_cleanup_rename(struct diff_queue_struct *pairs,
2904 struct hashmap *dir_renames)
ffc16c49 2905{
7fe40b88
EN
2906 struct hashmap_iter iter;
2907 struct dir_rename_entry *e;
2908
2909 hashmap_iter_init(dir_renames, &iter);
2910 while ((e = hashmap_iter_next(&iter))) {
2911 free(e->dir);
2912 strbuf_release(&e->new_dir);
2913 /* possible_new_dirs already cleared in get_directory_renames */
2914 }
2915 hashmap_free(dir_renames, 1);
2916 free(dir_renames);
2917
ffc16c49
EN
2918 free(pairs->queue);
2919 free(pairs);
2920}
2921
8ebe7b05
EN
2922static int detect_and_process_renames(struct merge_options *o,
2923 struct tree *common,
2924 struct tree *head,
2925 struct tree *merge,
2926 struct string_list *entries,
2927 struct rename_info *ri)
f172589e 2928{
e5257b2a 2929 struct diff_queue_struct *head_pairs, *merge_pairs;
7fe40b88 2930 struct hashmap *dir_re_head, *dir_re_merge;
f6f77559 2931 int clean = 1;
e5257b2a 2932
3992ff0c
EN
2933 ri->head_renames = NULL;
2934 ri->merge_renames = NULL;
2935
85b46030 2936 if (!merge_detect_rename(o))
3992ff0c
EN
2937 return 1;
2938
e5257b2a
EN
2939 head_pairs = get_diffpairs(o, common, head);
2940 merge_pairs = get_diffpairs(o, common, merge);
2941
5fdddd9b 2942 if (o->detect_directory_renames) {
b53c5028
JK
2943 dir_re_head = get_directory_renames(head_pairs);
2944 dir_re_merge = get_directory_renames(merge_pairs);
7fe40b88 2945
5fdddd9b
EN
2946 handle_directory_level_conflicts(o,
2947 dir_re_head, head,
2948 dir_re_merge, merge);
2949 } else {
2950 dir_re_head = xmalloc(sizeof(*dir_re_head));
2951 dir_re_merge = xmalloc(sizeof(*dir_re_merge));
2952 dir_rename_init(dir_re_head);
2953 dir_rename_init(dir_re_merge);
2954 }
96e7ffbd 2955
e95ab70a 2956 ri->head_renames = get_renames(o, head_pairs,
f6f77559
EN
2957 dir_re_merge, dir_re_head, head,
2958 common, head, merge, entries,
2959 &clean);
2960 if (clean < 0)
2961 goto cleanup;
e95ab70a 2962 ri->merge_renames = get_renames(o, merge_pairs,
f6f77559
EN
2963 dir_re_head, dir_re_merge, merge,
2964 common, head, merge, entries,
2965 &clean);
2966 if (clean < 0)
2967 goto cleanup;
2968 clean &= process_renames(o, ri->head_renames, ri->merge_renames);
2969
2970cleanup:
e5257b2a
EN
2971 /*
2972 * Some cleanup is deferred until cleanup_renames() because the
2973 * data structures are still needed and referenced in
2974 * process_entry(). But there are a few things we can free now.
2975 */
7fe40b88
EN
2976 initial_cleanup_rename(head_pairs, dir_re_head);
2977 initial_cleanup_rename(merge_pairs, dir_re_merge);
e5257b2a
EN
2978
2979 return clean;
f172589e
EN
2980}
2981
ffc16c49 2982static void final_cleanup_rename(struct string_list *rename)
f172589e 2983{
9cfee25a
EN
2984 const struct rename *re;
2985 int i;
f172589e 2986
3992ff0c
EN
2987 if (rename == NULL)
2988 return;
2989
9cfee25a
EN
2990 for (i = 0; i < rename->nr; i++) {
2991 re = rename->items[i].util;
2992 diff_free_filepair(re->pair);
2993 }
2994 string_list_clear(rename, 1);
2995 free(rename);
2996}
2997
ffc16c49 2998static void final_cleanup_renames(struct rename_info *re_info)
9cfee25a 2999{
ffc16c49
EN
3000 final_cleanup_rename(re_info->head_renames);
3001 final_cleanup_rename(re_info->merge_renames);
f172589e
EN
3002}
3003
b4da9d62 3004static struct object_id *stage_oid(const struct object_id *oid, unsigned mode)
9047ebbc 3005{
b4da9d62 3006 return (is_null_oid(oid) || mode == 0) ? NULL: (struct object_id *)oid;
9047ebbc
MV
3007}
3008
bc9204d4 3009static int read_oid_strbuf(struct merge_options *o,
d90e759f
EN
3010 const struct object_id *oid,
3011 struct strbuf *dst)
331a1838
EB
3012{
3013 void *buf;
3014 enum object_type type;
3015 unsigned long size;
b4f5aca4 3016 buf = read_object_file(oid, &type, &size);
331a1838 3017 if (!buf)
bc9204d4 3018 return err(o, _("cannot read object %s"), oid_to_hex(oid));
331a1838
EB
3019 if (type != OBJ_BLOB) {
3020 free(buf);
bc9204d4 3021 return err(o, _("object %s is not a blob"), oid_to_hex(oid));
331a1838
EB
3022 }
3023 strbuf_attach(dst, buf, size, size + 1);
3024 return 0;
3025}
3026
bc9204d4
JS
3027static int blob_unchanged(struct merge_options *opt,
3028 const struct object_id *o_oid,
72fac66b 3029 unsigned o_mode,
b4da9d62 3030 const struct object_id *a_oid,
72fac66b 3031 unsigned a_mode,
3e7589b7 3032 int renormalize, const char *path)
331a1838
EB
3033{
3034 struct strbuf o = STRBUF_INIT;
3035 struct strbuf a = STRBUF_INIT;
3036 int ret = 0; /* assume changed for safety */
3037
72fac66b
JK
3038 if (a_mode != o_mode)
3039 return 0;
b4da9d62 3040 if (oid_eq(o_oid, a_oid))
331a1838 3041 return 1;
3e7589b7 3042 if (!renormalize)
331a1838
EB
3043 return 0;
3044
b4da9d62 3045 assert(o_oid && a_oid);
bc9204d4 3046 if (read_oid_strbuf(opt, o_oid, &o) || read_oid_strbuf(opt, a_oid, &a))
331a1838
EB
3047 goto error_return;
3048 /*
3049 * Note: binary | is used so that both renormalizations are
3050 * performed. Comparison can be skipped if both files are
3051 * unchanged since their sha1s have already been compared.
3052 */
0d6caa2d
NTND
3053 if (renormalize_buffer(opt->repo->index, path, o.buf, o.len, &o) |
3054 renormalize_buffer(opt->repo->index, path, a.buf, a.len, &a))
331a1838
EB
3055 ret = (o.len == a.len && !memcmp(o.buf, a.buf, o.len));
3056
3057error_return:
3058 strbuf_release(&o);
3059 strbuf_release(&a);
3060 return ret;
3061}
3062
75456f96 3063static int handle_modify_delete(struct merge_options *o,
d90e759f
EN
3064 const char *path,
3065 struct object_id *o_oid, int o_mode,
3066 struct object_id *a_oid, int a_mode,
3067 struct object_id *b_oid, int b_mode)
5e3ce663 3068{
b26d87f2
MM
3069 const char *modify_branch, *delete_branch;
3070 struct object_id *changed_oid;
3071 int changed_mode;
3072
3073 if (a_oid) {
3074 modify_branch = o->branch1;
3075 delete_branch = o->branch2;
3076 changed_oid = a_oid;
3077 changed_mode = a_mode;
3078 } else {
3079 modify_branch = o->branch2;
3080 delete_branch = o->branch1;
3081 changed_oid = b_oid;
3082 changed_mode = b_mode;
3083 }
3084
75456f96 3085 return handle_change_delete(o,
b26d87f2 3086 path, NULL,
75456f96 3087 o_oid, o_mode,
b26d87f2
MM
3088 changed_oid, changed_mode,
3089 modify_branch, delete_branch,
75456f96 3090 _("modify"), _("modified"));
5e3ce663
EN
3091}
3092
d9573556
EN
3093static int handle_content_merge(struct merge_options *o,
3094 const char *path,
3095 int is_dirty,
3096 struct object_id *o_oid, int o_mode,
3097 struct object_id *a_oid, int a_mode,
3098 struct object_id *b_oid, int b_mode,
3099 struct rename_conflict_info *rename_conflict_info)
0c4918d1 3100{
55653a68 3101 const char *reason = _("content");
5b448b85 3102 const char *path1 = NULL, *path2 = NULL;
0c4918d1
EN
3103 struct merge_file_info mfi;
3104 struct diff_filespec one, a, b;
4ab9a157 3105 unsigned df_conflict_remains = 0;
0c4918d1 3106
b4da9d62 3107 if (!o_oid) {
55653a68 3108 reason = _("add/add");
b4da9d62 3109 o_oid = (struct object_id *)&null_oid;
0c4918d1
EN
3110 }
3111 one.path = a.path = b.path = (char *)path;
b4da9d62 3112 oidcpy(&one.oid, o_oid);
0c4918d1 3113 one.mode = o_mode;
b4da9d62 3114 oidcpy(&a.oid, a_oid);
0c4918d1 3115 a.mode = a_mode;
b4da9d62 3116 oidcpy(&b.oid, b_oid);
0c4918d1
EN
3117 b.mode = b_mode;
3118
3c217c07 3119 if (rename_conflict_info) {
3c217c07
EN
3120 struct diff_filepair *pair1 = rename_conflict_info->pair1;
3121
3122 path1 = (o->branch1 == rename_conflict_info->branch1) ?
3123 pair1->two->path : pair1->one->path;
3124 /* If rename_conflict_info->pair2 != NULL, we are in
3125 * RENAME_ONE_FILE_TO_ONE case. Otherwise, we have a
3126 * normal rename.
3127 */
3128 path2 = (rename_conflict_info->pair2 ||
3129 o->branch2 == rename_conflict_info->branch1) ?
3130 pair1->two->path : pair1->one->path;
52396e1d
EN
3131 one.path = pair1->one->path;
3132 a.path = (char *)path1;
3133 b.path = (char *)path2;
3c217c07 3134
0d6caa2d 3135 if (dir_in_way(o->repo->index, path, !o->call_depth,
5423d2e7 3136 S_ISGITLINK(pair1->two->mode)))
3c217c07 3137 df_conflict_remains = 1;
4ab9a157 3138 }
d9573556 3139 if (merge_mode_and_contents(o, &one, &a, &b, path,
b2a7942b
EN
3140 o->branch1, o->branch2,
3141 o->call_depth * 2, &mfi))
3c8a51e8 3142 return -1;
4ab9a157 3143
1de70dbd
EN
3144 /*
3145 * We can skip updating the working tree file iff:
3146 * a) The merge is clean
3147 * b) The merge matches what was in HEAD (content, mode, pathname)
3148 * c) The target path is usable (i.e. not involved in D/F conflict)
3149 */
3150 if (mfi.clean &&
3151 was_tracked_and_matches(o, path, &mfi.oid, mfi.mode) &&
3152 !df_conflict_remains) {
2b75fb60
EN
3153 int pos;
3154 struct cache_entry *ce;
3155
55653a68 3156 output(o, 3, _("Skipped %s (merged same as existing)"), path);
1de70dbd
EN
3157 if (add_cacheinfo(o, mfi.mode, &mfi.oid, path,
3158 0, (!o->call_depth && !is_dirty), 0))
3159 return -1;
2b75fb60
EN
3160 /*
3161 * However, add_cacheinfo() will delete the old cache entry
3162 * and add a new one. We need to copy over any skip_worktree
3163 * flag to avoid making the file appear as if it were
3164 * deleted by the user.
3165 */
3166 pos = index_name_pos(&o->orig_index, path, strlen(path));
3167 ce = o->orig_index.cache[pos];
3168 if (ce_skip_worktree(ce)) {
0d6caa2d
NTND
3169 pos = index_name_pos(o->repo->index, path, strlen(path));
3170 ce = o->repo->index->cache[pos];
2b75fb60
EN
3171 ce->ce_flags |= CE_SKIP_WORKTREE;
3172 }
1de70dbd 3173 return mfi.clean;
05cf21eb 3174 }
0c4918d1
EN
3175
3176 if (!mfi.clean) {
3177 if (S_ISGITLINK(mfi.mode))
55653a68
JX
3178 reason = _("submodule");
3179 output(o, 1, _("CONFLICT (%s): Merge conflict in %s"),
0c4918d1 3180 reason, path);
4f66dade 3181 if (rename_conflict_info && !df_conflict_remains)
bc9204d4 3182 if (update_stages(o, path, &one, &a, &b))
75456f96 3183 return -1;
0c4918d1
EN
3184 }
3185
bd42380e 3186 if (df_conflict_remains || is_dirty) {
3d6b8e88 3187 char *new_path;
51931bf0 3188 if (o->call_depth) {
0d6caa2d 3189 remove_file_from_index(o->repo->index, path);
51931bf0 3190 } else {
75456f96 3191 if (!mfi.clean) {
bc9204d4 3192 if (update_stages(o, path, &one, &a, &b))
75456f96
JS
3193 return -1;
3194 } else {
a35edc84 3195 int file_from_stage2 = was_tracked(o, path);
51931bf0 3196 struct diff_filespec merged;
9b561499 3197 oidcpy(&merged.oid, &mfi.oid);
51931bf0
EN
3198 merged.mode = mfi.mode;
3199
bc9204d4 3200 if (update_stages(o, path, NULL,
75456f96
JS
3201 file_from_stage2 ? &merged : NULL,
3202 file_from_stage2 ? NULL : &merged))
3203 return -1;
51931bf0
EN
3204 }
3205
3206 }
4f66dade 3207 new_path = unique_path(o, path, rename_conflict_info->branch1);
bd42380e
EN
3208 if (is_dirty) {
3209 output(o, 1, _("Refusing to lose dirty file at %s"),
3210 path);
3211 }
55653a68 3212 output(o, 1, _("Adding as %s instead"), new_path);
75456f96
JS
3213 if (update_file(o, 0, &mfi.oid, mfi.mode, new_path)) {
3214 free(new_path);
3215 return -1;
3216 }
3d6b8e88 3217 free(new_path);
51931bf0 3218 mfi.clean = 0;
75456f96
JS
3219 } else if (update_file(o, mfi.clean, &mfi.oid, mfi.mode, path))
3220 return -1;
bd42380e 3221 return !is_dirty && mfi.clean;
0c4918d1
EN
3222}
3223
8ebe7b05
EN
3224static int handle_rename_normal(struct merge_options *o,
3225 const char *path,
3226 struct object_id *o_oid, unsigned int o_mode,
3227 struct object_id *a_oid, unsigned int a_mode,
3228 struct object_id *b_oid, unsigned int b_mode,
3229 struct rename_conflict_info *ci)
64b1abe9 3230{
64b1abe9 3231 /* Merge the content and write it out */
d9573556
EN
3232 return handle_content_merge(o, path, was_dirty(o, path),
3233 o_oid, o_mode, a_oid, a_mode, b_oid, b_mode,
3234 ci);
0c4918d1
EN
3235}
3236
9047ebbc 3237/* Per entry merge function */
8a2fce18
MV
3238static int process_entry(struct merge_options *o,
3239 const char *path, struct stage_data *entry)
9047ebbc 3240{
9047ebbc 3241 int clean_merge = 1;
1bc0ab7c 3242 int normalize = o->renormalize;
9047ebbc
MV
3243 unsigned o_mode = entry->stages[1].mode;
3244 unsigned a_mode = entry->stages[2].mode;
3245 unsigned b_mode = entry->stages[3].mode;
b4da9d62 3246 struct object_id *o_oid = stage_oid(&entry->stages[1].oid, o_mode);
3247 struct object_id *a_oid = stage_oid(&entry->stages[2].oid, a_mode);
3248 struct object_id *b_oid = stage_oid(&entry->stages[3].oid, b_mode);
9047ebbc 3249
37348937 3250 entry->processed = 1;
4f66dade
EN
3251 if (entry->rename_conflict_info) {
3252 struct rename_conflict_info *conflict_info = entry->rename_conflict_info;
07413c5a 3253 switch (conflict_info->rename_type) {
882fd11a 3254 case RENAME_NORMAL:
4f66dade 3255 case RENAME_ONE_FILE_TO_ONE:
8ebe7b05
EN
3256 clean_merge = handle_rename_normal(o,
3257 path,
3258 o_oid, o_mode,
3259 a_oid, a_mode,
3260 b_oid, b_mode,
3261 conflict_info);
882fd11a 3262 break;
5455c338 3263 case RENAME_VIA_DIR:
9c0743fe 3264 clean_merge = 1;
8ebe7b05
EN
3265 if (handle_rename_via_dir(o,
3266 conflict_info->pair1,
b53c5028 3267 conflict_info->branch1))
9c0743fe 3268 clean_merge = -1;
882fd11a 3269 break;
7f867165
EN
3270 case RENAME_ADD:
3271 /*
3272 * Probably unclean merge, but if the renamed file
3273 * merges cleanly and the result can then be
3274 * two-way merged cleanly with the added file, I
3275 * guess it's a clean merge?
3276 */
3277 clean_merge = handle_rename_add(o, conflict_info);
3278 break;
3b130adf
EN
3279 case RENAME_DELETE:
3280 clean_merge = 0;
8ebe7b05
EN
3281 if (handle_rename_delete(o,
3282 conflict_info->pair1,
3283 conflict_info->branch1,
3284 conflict_info->branch2))
75456f96 3285 clean_merge = -1;
3b130adf 3286 break;
07413c5a 3287 case RENAME_ONE_FILE_TO_TWO:
07413c5a 3288 clean_merge = 0;
8ebe7b05 3289 if (handle_rename_rename_1to2(o, conflict_info))
75456f96 3290 clean_merge = -1;
07413c5a 3291 break;
461f5041 3292 case RENAME_TWO_FILES_TO_ONE:
bbafc9c4
EN
3293 /*
3294 * Probably unclean merge, but if the two renamed
3295 * files merge cleanly and the two resulting files
3296 * can then be two-way merged cleanly, I guess it's
3297 * a clean merge?
3298 */
3299 clean_merge = handle_rename_rename_2to1(o,
3300 conflict_info);
07413c5a
EN
3301 break;
3302 default:
3303 entry->processed = 0;
3304 break;
3305 }
b4da9d62 3306 } else if (o_oid && (!a_oid || !b_oid)) {
edd2faf5 3307 /* Case A: Deleted in one */
b4da9d62 3308 if ((!a_oid && !b_oid) ||
bc9204d4
JS
3309 (!b_oid && blob_unchanged(o, o_oid, o_mode, a_oid, a_mode, normalize, path)) ||
3310 (!a_oid && blob_unchanged(o, o_oid, o_mode, b_oid, b_mode, normalize, path))) {
edd2faf5
EN
3311 /* Deleted in both or deleted in one and
3312 * unchanged in the other */
b4da9d62 3313 if (a_oid)
55653a68 3314 output(o, 2, _("Removing %s"), path);
edd2faf5 3315 /* do not touch working file if it did not exist */
b4da9d62 3316 remove_file(o, 1, path, !a_oid);
edd2faf5
EN
3317 } else {
3318 /* Modify/delete; deleted side may have put a directory in the way */
edd2faf5 3319 clean_merge = 0;
75456f96
JS
3320 if (handle_modify_delete(o, path, o_oid, o_mode,
3321 a_oid, a_mode, b_oid, b_mode))
3322 clean_merge = -1;
3d6b8e88 3323 }
b4da9d62 3324 } else if ((!o_oid && a_oid && !b_oid) ||
3325 (!o_oid && !a_oid && b_oid)) {
edd2faf5
EN
3326 /* Case B: Added in one. */
3327 /* [nothing|directory] -> ([nothing|directory], file) */
3328
9c0bbb50
EN
3329 const char *add_branch;
3330 const char *other_branch;
3331 unsigned mode;
b4da9d62 3332 const struct object_id *oid;
9c0bbb50 3333 const char *conf;
37348937 3334
b4da9d62 3335 if (a_oid) {
9c0bbb50
EN
3336 add_branch = o->branch1;
3337 other_branch = o->branch2;
3338 mode = a_mode;
b4da9d62 3339 oid = a_oid;
55653a68 3340 conf = _("file/directory");
9c0bbb50
EN
3341 } else {
3342 add_branch = o->branch2;
3343 other_branch = o->branch1;
3344 mode = b_mode;
b4da9d62 3345 oid = b_oid;
55653a68 3346 conf = _("directory/file");
9c0bbb50 3347 }
0d6caa2d 3348 if (dir_in_way(o->repo->index, path,
c641ca67
EN
3349 !o->call_depth && !S_ISGITLINK(a_mode),
3350 0)) {
3d6b8e88 3351 char *new_path = unique_path(o, path, add_branch);
9c0bbb50 3352 clean_merge = 0;
55653a68
JX
3353 output(o, 1, _("CONFLICT (%s): There is a directory with name %s in %s. "
3354 "Adding %s as %s"),
9c0bbb50 3355 conf, path, other_branch, path, new_path);
75456f96
JS
3356 if (update_file(o, 0, oid, mode, new_path))
3357 clean_merge = -1;
3358 else if (o->call_depth)
0d6caa2d 3359 remove_file_from_index(o->repo->index, path);
3d6b8e88 3360 free(new_path);
9c0bbb50 3361 } else {
55653a68 3362 output(o, 2, _("Adding %s"), path);
35a74abf 3363 /* do not overwrite file if already present */
75456f96
JS
3364 if (update_file_flags(o, oid, mode, path, 1, !a_oid))
3365 clean_merge = -1;
9c0bbb50 3366 }
b4da9d62 3367 } else if (a_oid && b_oid) {
dcf28150
EN
3368 if (!o_oid) {
3369 /* Case C: Added in both (check for same permissions) */
3370 output(o, 1,
3371 _("CONFLICT (add/add): Merge conflict in %s"),
3372 path);
3373 clean_merge = handle_file_collision(o,
3374 path, NULL, NULL,
3375 o->branch1,
3376 o->branch2,
3377 a_oid, a_mode,
3378 b_oid, b_mode);
3379 } else {
3380 /* case D: Modified in both, but differently. */
3381 int is_dirty = 0; /* unpack_trees would have bailed if dirty */
3382 clean_merge = handle_content_merge(o, path,
3383 is_dirty,
3384 o_oid, o_mode,
3385 a_oid, a_mode,
3386 b_oid, b_mode,
3387 NULL);
3388 }
b4da9d62 3389 } else if (!o_oid && !a_oid && !b_oid) {
edd2faf5
EN
3390 /*
3391 * this entry was deleted altogether. a_mode == 0 means
3392 * we had that path and want to actively remove it.
3393 */
3394 remove_file(o, 1, path, !a_mode);
3395 } else
033abf97 3396 BUG("fatal merge failure, shouldn't happen.");
37348937
EN
3397
3398 return clean_merge;
3399}
3400
8a2fce18
MV
3401int merge_trees(struct merge_options *o,
3402 struct tree *head,
9047ebbc
MV
3403 struct tree *merge,
3404 struct tree *common,
9047ebbc
MV
3405 struct tree **result)
3406{
0d6caa2d 3407 struct index_state *istate = o->repo->index;
9047ebbc 3408 int code, clean;
eddd1a41
EN
3409 struct strbuf sb = STRBUF_INIT;
3410
150fe065 3411 if (!o->call_depth && repo_index_has_changes(o->repo, head, &sb)) {
eddd1a41
EN
3412 err(o, _("Your local changes to the following files would be overwritten by merge:\n %s"),
3413 sb.buf);
3414 return -1;
3415 }
9047ebbc 3416
85e51b78 3417 if (o->subtree_shift) {
d7cf3a96
NTND
3418 merge = shift_tree_object(o->repo, head, merge, o->subtree_shift);
3419 common = shift_tree_object(o->repo, head, common, o->subtree_shift);
9047ebbc
MV
3420 }
3421
b4da9d62 3422 if (oid_eq(&common->object.oid, &merge->object.oid)) {
7560f547 3423 output(o, 0, _("Already up to date!"));
9047ebbc
MV
3424 *result = head;
3425 return 1;
3426 }
3427
3f1c1c36 3428 code = unpack_trees_start(o, common, head, merge);
9047ebbc 3429
fadd069d
JH
3430 if (code != 0) {
3431 if (show(o, 4) || o->call_depth)
bc9204d4 3432 err(o, _("merging of trees %s and %s failed"),
f2fd0760 3433 oid_to_hex(&head->object.oid),
3434 oid_to_hex(&merge->object.oid));
3f1c1c36 3435 unpack_trees_finish(o);
6003303a 3436 return -1;
fadd069d 3437 }
9047ebbc 3438
0d6caa2d 3439 if (unmerged_index(istate)) {
f172589e
EN
3440 struct string_list *entries;
3441 struct rename_info re_info;
9047ebbc 3442 int i;
fc65b00d
KW
3443 /*
3444 * Only need the hashmap while processing entries, so
3445 * initialize it here and free it when we are done running
3446 * through the entries. Keeping it in the merge_options as
3447 * opposed to decaring a local hashmap is for convenience
3448 * so that we don't have to pass it to around.
3449 */
3450 hashmap_init(&o->current_file_dir_set, path_hashmap_cmp, NULL, 512);
696ee23c
MV
3451 get_files_dirs(o, head);
3452 get_files_dirs(o, merge);
9047ebbc 3453
0d6caa2d 3454 entries = get_unmerged(o->repo->index);
8ebe7b05
EN
3455 clean = detect_and_process_renames(o, common, head, merge,
3456 entries, &re_info);
6c8647da 3457 record_df_conflict_files(o, entries);
75456f96 3458 if (clean < 0)
e336bdc5 3459 goto cleanup;
edd2faf5 3460 for (i = entries->nr-1; 0 <= i; i--) {
9047ebbc
MV
3461 const char *path = entries->items[i].string;
3462 struct stage_data *e = entries->items[i].util;
75456f96
JS
3463 if (!e->processed) {
3464 int ret = process_entry(o, path, e);
3465 if (!ret)
3466 clean = 0;
e336bdc5
KW
3467 else if (ret < 0) {
3468 clean = ret;
3469 goto cleanup;
3470 }
75456f96 3471 }
9047ebbc 3472 }
7edba4c4
JH
3473 for (i = 0; i < entries->nr; i++) {
3474 struct stage_data *e = entries->items[i].util;
3475 if (!e->processed)
033abf97 3476 BUG("unprocessed path??? %s",
7edba4c4
JH
3477 entries->items[i].string);
3478 }
9047ebbc