merge-recursive: add computation of collisions due to dir rename & merging
[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
MV
10#include "cache-tree.h"
11#include "commit.h"
12#include "blob.h"
13#include "builtin.h"
14#include "tree-walk.h"
15#include "diff.h"
16#include "diffcore.h"
17#include "tag.h"
18#include "unpack-trees.h"
19#include "string-list.h"
20#include "xdiff-interface.h"
21#include "ll-merge.h"
9047ebbc
MV
22#include "attr.h"
23#include "merge-recursive.h"
9800c0df 24#include "dir.h"
68d03e4a 25#include "submodule.h"
9047ebbc 26
fc65b00d
KW
27struct path_hashmap_entry {
28 struct hashmap_entry e;
29 char path[FLEX_ARRAY];
30};
31
32static int path_hashmap_cmp(const void *cmp_data,
33 const void *entry,
34 const void *entry_or_key,
35 const void *keydata)
36{
37 const struct path_hashmap_entry *a = entry;
38 const struct path_hashmap_entry *b = entry_or_key;
39 const char *key = keydata;
40
41 if (ignore_case)
42 return strcasecmp(a->path, key ? key : b->path);
43 else
44 return strcmp(a->path, key ? key : b->path);
45}
46
47static unsigned int path_hash(const char *path)
48{
49 return ignore_case ? strihash(path) : strhash(path);
50}
51
7fe40b88
EN
52static struct dir_rename_entry *dir_rename_find_entry(struct hashmap *hashmap,
53 char *dir)
54{
55 struct dir_rename_entry key;
56
57 if (dir == NULL)
58 return NULL;
59 hashmap_entry_init(&key, strhash(dir));
60 key.dir = dir;
61 return hashmap_get(hashmap, &key, NULL);
62}
63
64static int dir_rename_cmp(const void *unused_cmp_data,
65 const void *entry,
66 const void *entry_or_key,
67 const void *unused_keydata)
68{
69 const struct dir_rename_entry *e1 = entry;
70 const struct dir_rename_entry *e2 = entry_or_key;
71
72 return strcmp(e1->dir, e2->dir);
73}
74
75static void dir_rename_init(struct hashmap *map)
76{
77 hashmap_init(map, dir_rename_cmp, NULL, 0);
78}
79
80static void dir_rename_entry_init(struct dir_rename_entry *entry,
81 char *directory)
82{
83 hashmap_entry_init(entry, strhash(directory));
84 entry->dir = directory;
85 entry->non_unique_new_dir = 0;
86 strbuf_init(&entry->new_dir, 0);
87 string_list_init(&entry->possible_new_dirs, 0);
88}
89
e95ab70a
EN
90static struct collision_entry *collision_find_entry(struct hashmap *hashmap,
91 char *target_file)
92{
93 struct collision_entry key;
94
95 hashmap_entry_init(&key, strhash(target_file));
96 key.target_file = target_file;
97 return hashmap_get(hashmap, &key, NULL);
98}
99
100static int collision_cmp(void *unused_cmp_data,
101 const struct collision_entry *e1,
102 const struct collision_entry *e2,
103 const void *unused_keydata)
104{
105 return strcmp(e1->target_file, e2->target_file);
106}
107
108static void collision_init(struct hashmap *map)
109{
110 hashmap_init(map, (hashmap_cmp_fn) collision_cmp, NULL, 0);
111}
112
bc9204d4
JS
113static void flush_output(struct merge_options *o)
114{
f1e2426b 115 if (o->buffer_output < 2 && o->obuf.len) {
bc9204d4
JS
116 fputs(o->obuf.buf, stdout);
117 strbuf_reset(&o->obuf);
118 }
119}
120
121static int err(struct merge_options *o, const char *err, ...)
122{
123 va_list params;
124
f1e2426b
JS
125 if (o->buffer_output < 2)
126 flush_output(o);
127 else {
128 strbuf_complete(&o->obuf, '\n');
129 strbuf_addstr(&o->obuf, "error: ");
130 }
bc9204d4
JS
131 va_start(params, err);
132 strbuf_vaddf(&o->obuf, err, params);
133 va_end(params);
f1e2426b
JS
134 if (o->buffer_output > 1)
135 strbuf_addch(&o->obuf, '\n');
136 else {
137 error("%s", o->obuf.buf);
138 strbuf_reset(&o->obuf);
139 }
bc9204d4
JS
140
141 return -1;
142}
143
85e51b78
JH
144static struct tree *shift_tree_object(struct tree *one, struct tree *two,
145 const char *subtree_shift)
9047ebbc 146{
f2fd0760 147 struct object_id shifted;
9047ebbc 148
85e51b78 149 if (!*subtree_shift) {
82db3d44 150 shift_tree(&one->object.oid, &two->object.oid, &shifted, 0);
85e51b78 151 } else {
82db3d44 152 shift_tree_by(&one->object.oid, &two->object.oid, &shifted,
85e51b78
JH
153 subtree_shift);
154 }
f2fd0760 155 if (!oidcmp(&two->object.oid, &shifted))
9047ebbc 156 return two;
740ee055 157 return lookup_tree(&shifted);
9047ebbc
MV
158}
159
2af202be 160static struct commit *make_virtual_commit(struct tree *tree, const char *comment)
9047ebbc 161{
10322a0a 162 struct commit *commit = alloc_commit_node();
ae8e4c9c 163
a2571653 164 set_merge_remote_desc(commit, comment, (struct object *)commit);
9047ebbc 165 commit->tree = tree;
9047ebbc
MV
166 commit->object.parsed = 1;
167 return commit;
168}
169
170/*
171 * Since we use get_tree_entry(), which does not put the read object into
172 * the object pool, we cannot rely on a == b.
173 */
b4da9d62 174static int oid_eq(const struct object_id *a, const struct object_id *b)
9047ebbc
MV
175{
176 if (!a && !b)
177 return 2;
b4da9d62 178 return a && b && oidcmp(a, b) == 0;
9047ebbc
MV
179}
180
25c39363
EN
181enum rename_type {
182 RENAME_NORMAL = 0,
183 RENAME_DELETE,
4f66dade 184 RENAME_ONE_FILE_TO_ONE,
461f5041
EN
185 RENAME_ONE_FILE_TO_TWO,
186 RENAME_TWO_FILES_TO_ONE
25c39363
EN
187};
188
4f66dade 189struct rename_conflict_info {
25c39363
EN
190 enum rename_type rename_type;
191 struct diff_filepair *pair1;
192 struct diff_filepair *pair2;
193 const char *branch1;
194 const char *branch2;
195 struct stage_data *dst_entry1;
196 struct stage_data *dst_entry2;
232c635f
EN
197 struct diff_filespec ren1_other;
198 struct diff_filespec ren2_other;
25c39363
EN
199};
200
9047ebbc
MV
201/*
202 * Since we want to write the index eventually, we cannot reuse the index
203 * for these (temporary) data.
204 */
9cba13ca
JN
205struct stage_data {
206 struct {
9047ebbc 207 unsigned mode;
fd429e98 208 struct object_id oid;
9047ebbc 209 } stages[4];
4f66dade 210 struct rename_conflict_info *rename_conflict_info;
9047ebbc
MV
211 unsigned processed:1;
212};
213
4f66dade
EN
214static inline void setup_rename_conflict_info(enum rename_type rename_type,
215 struct diff_filepair *pair1,
216 struct diff_filepair *pair2,
217 const char *branch1,
218 const char *branch2,
219 struct stage_data *dst_entry1,
232c635f
EN
220 struct stage_data *dst_entry2,
221 struct merge_options *o,
222 struct stage_data *src_entry1,
223 struct stage_data *src_entry2)
25c39363 224{
4f66dade 225 struct rename_conflict_info *ci = xcalloc(1, sizeof(struct rename_conflict_info));
25c39363
EN
226 ci->rename_type = rename_type;
227 ci->pair1 = pair1;
228 ci->branch1 = branch1;
229 ci->branch2 = branch2;
230
231 ci->dst_entry1 = dst_entry1;
4f66dade 232 dst_entry1->rename_conflict_info = ci;
25c39363
EN
233 dst_entry1->processed = 0;
234
235 assert(!pair2 == !dst_entry2);
236 if (dst_entry2) {
237 ci->dst_entry2 = dst_entry2;
238 ci->pair2 = pair2;
4f66dade 239 dst_entry2->rename_conflict_info = ci;
25c39363 240 }
232c635f
EN
241
242 if (rename_type == RENAME_TWO_FILES_TO_ONE) {
243 /*
244 * For each rename, there could have been
245 * modifications on the side of history where that
246 * file was not renamed.
247 */
248 int ostage1 = o->branch1 == branch1 ? 3 : 2;
249 int ostage2 = ostage1 ^ 1;
250
251 ci->ren1_other.path = pair1->one->path;
fd429e98 252 oidcpy(&ci->ren1_other.oid, &src_entry1->stages[ostage1].oid);
232c635f
EN
253 ci->ren1_other.mode = src_entry1->stages[ostage1].mode;
254
255 ci->ren2_other.path = pair2->one->path;
fd429e98 256 oidcpy(&ci->ren2_other.oid, &src_entry2->stages[ostage2].oid);
232c635f 257 ci->ren2_other.mode = src_entry2->stages[ostage2].mode;
25c39363
EN
258 }
259}
260
8a2fce18 261static int show(struct merge_options *o, int v)
9047ebbc 262{
5033639c 263 return (!o->call_depth && o->verbosity >= v) || o->verbosity >= 5;
9047ebbc
MV
264}
265
28bea9e5 266__attribute__((format (printf, 3, 4)))
8a2fce18 267static void output(struct merge_options *o, int v, const char *fmt, ...)
9047ebbc 268{
9047ebbc
MV
269 va_list ap;
270
8a2fce18 271 if (!show(o, v))
9047ebbc
MV
272 return;
273
415792ed 274 strbuf_addchars(&o->obuf, ' ', o->call_depth * 2);
9047ebbc
MV
275
276 va_start(ap, fmt);
ebeb6090 277 strbuf_vaddf(&o->obuf, fmt, ap);
9047ebbc
MV
278 va_end(ap);
279
294b2680 280 strbuf_addch(&o->obuf, '\n');
8a2fce18 281 if (!o->buffer_output)
c7d84924 282 flush_output(o);
9047ebbc
MV
283}
284
5033639c 285static void output_commit_title(struct merge_options *o, struct commit *commit)
9047ebbc 286{
dde75cb0 287 strbuf_addchars(&o->obuf, ' ', o->call_depth * 2);
9047ebbc 288 if (commit->util)
dde75cb0
JS
289 strbuf_addf(&o->obuf, "virtual %s\n",
290 merge_remote_util(commit)->name);
9047ebbc 291 else {
30e677e0 292 strbuf_add_unique_abbrev(&o->obuf, &commit->object.oid,
a94bb683
RS
293 DEFAULT_ABBREV);
294 strbuf_addch(&o->obuf, ' ');
9047ebbc 295 if (parse_commit(commit) != 0)
a22ae753 296 strbuf_addstr(&o->obuf, _("(bad commit)\n"));
9047ebbc 297 else {
49b7120e 298 const char *title;
8597ea3a 299 const char *msg = get_commit_buffer(commit, NULL);
bc6b8fc1 300 int len = find_commit_subject(msg, &title);
49b7120e 301 if (len)
dde75cb0 302 strbuf_addf(&o->obuf, "%.*s\n", len, title);
bc6b8fc1 303 unuse_commit_buffer(commit, msg);
9047ebbc
MV
304 }
305 }
dde75cb0 306 flush_output(o);
9047ebbc
MV
307}
308
bc9204d4
JS
309static int add_cacheinfo(struct merge_options *o,
310 unsigned int mode, const struct object_id *oid,
9047ebbc
MV
311 const char *path, int stage, int refresh, int options)
312{
313 struct cache_entry *ce;
1335d76e
JH
314 int ret;
315
21bed620 316 ce = make_cache_entry(mode, oid ? oid->hash : null_sha1, path, stage, 0);
9047ebbc 317 if (!ce)
bc9204d4 318 return err(o, _("addinfo_cache failed for path '%s'"), path);
1335d76e
JH
319
320 ret = add_cache_entry(ce, options);
321 if (refresh) {
322 struct cache_entry *nce;
323
324 nce = refresh_cache_entry(ce, CE_MATCH_REFRESH | CE_MATCH_IGNORE_MISSING);
55e9f0e5 325 if (!nce)
1749053d 326 return err(o, _("addinfo_cache failed for path '%s'"), path);
1335d76e
JH
327 if (nce != ce)
328 ret = add_cache_entry(nce, options);
329 }
330 return ret;
9047ebbc
MV
331}
332
9047ebbc
MV
333static void init_tree_desc_from_tree(struct tree_desc *desc, struct tree *tree)
334{
335 parse_tree(tree);
336 init_tree_desc(desc, tree->buffer, tree->size);
337}
338
8b026eda 339static int git_merge_trees(int index_only,
9047ebbc
MV
340 struct tree *common,
341 struct tree *head,
342 struct tree *merge)
343{
344 int rc;
345 struct tree_desc t[3];
8b026eda 346 struct unpack_trees_options opts;
9047ebbc 347
8b026eda
JH
348 memset(&opts, 0, sizeof(opts));
349 if (index_only)
350 opts.index_only = 1;
9047ebbc 351 else
8b026eda
JH
352 opts.update = 1;
353 opts.merge = 1;
354 opts.head_idx = 2;
355 opts.fn = threeway_merge;
356 opts.src_index = &the_index;
357 opts.dst_index = &the_index;
358 setup_unpack_trees_porcelain(&opts, "merge");
9047ebbc
MV
359
360 init_tree_desc_from_tree(t+0, common);
361 init_tree_desc_from_tree(t+1, head);
362 init_tree_desc_from_tree(t+2, merge);
363
8b026eda 364 rc = unpack_trees(3, t, &opts);
9047ebbc
MV
365 cache_tree_free(&active_cache_tree);
366 return rc;
367}
368
8a2fce18 369struct tree *write_tree_from_memory(struct merge_options *o)
9047ebbc
MV
370{
371 struct tree *result = NULL;
372
373 if (unmerged_cache()) {
374 int i;
19c6a4f8 375 fprintf(stderr, "BUG: There are unmerged index entries:\n");
9047ebbc 376 for (i = 0; i < active_nr; i++) {
9c5e6c80 377 const struct cache_entry *ce = active_cache[i];
9047ebbc 378 if (ce_stage(ce))
c43ba42e 379 fprintf(stderr, "BUG: %d %.*s\n", ce_stage(ce),
19c6a4f8 380 (int)ce_namelen(ce), ce->name);
9047ebbc 381 }
ef1177d1 382 die("BUG: unmerged index entries in merge-recursive.c");
9047ebbc
MV
383 }
384
385 if (!active_cache_tree)
386 active_cache_tree = cache_tree();
387
388 if (!cache_tree_fully_valid(active_cache_tree) &&
6003303a 389 cache_tree_update(&the_index, 0) < 0) {
bc9204d4 390 err(o, _("error building trees"));
6003303a
JS
391 return NULL;
392 }
9047ebbc 393
740ee055 394 result = lookup_tree(&active_cache_tree->oid);
9047ebbc
MV
395
396 return result;
397}
398
df46d77e 399static int save_files_dirs(const struct object_id *oid,
6a0b0b6d 400 struct strbuf *base, const char *path,
9047ebbc
MV
401 unsigned int mode, int stage, void *context)
402{
fc65b00d 403 struct path_hashmap_entry *entry;
6a0b0b6d 404 int baselen = base->len;
696ee23c
MV
405 struct merge_options *o = context;
406
6a0b0b6d 407 strbuf_addstr(base, path);
9047ebbc 408
fc65b00d
KW
409 FLEX_ALLOC_MEM(entry, path, base->buf, base->len);
410 hashmap_entry_init(entry, path_hash(entry->path));
411 hashmap_add(&o->current_file_dir_set, entry);
9047ebbc 412
6a0b0b6d 413 strbuf_setlen(base, baselen);
d3bee161 414 return (S_ISDIR(mode) ? READ_TREE_RECURSIVE : 0);
9047ebbc
MV
415}
416
ef9c4dc3 417static void get_files_dirs(struct merge_options *o, struct tree *tree)
9047ebbc 418{
f0096c06 419 struct pathspec match_all;
9a087274 420 memset(&match_all, 0, sizeof(match_all));
ef9c4dc3 421 read_tree_recursive(tree, "", 0, 0, &match_all, save_files_dirs, o);
9047ebbc
MV
422}
423
424/*
425 * Returns an index_entry instance which doesn't have to correspond to
426 * a real cache entry in Git's index.
427 */
428static struct stage_data *insert_stage_data(const char *path,
429 struct tree *o, struct tree *a, struct tree *b,
430 struct string_list *entries)
431{
432 struct string_list_item *item;
433 struct stage_data *e = xcalloc(1, sizeof(struct stage_data));
8b026eda
JH
434 get_tree_entry(&o->object.oid, path,
435 &e->stages[1].oid, &e->stages[1].mode);
436 get_tree_entry(&a->object.oid, path,
437 &e->stages[2].oid, &e->stages[2].mode);
438 get_tree_entry(&b->object.oid, path,
439 &e->stages[3].oid, &e->stages[3].mode);
78a395d3 440 item = string_list_insert(entries, path);
9047ebbc
MV
441 item->util = e;
442 return e;
443}
444
445/*
446 * Create a dictionary mapping file names to stage_data objects. The
447 * dictionary contains one entry for every path with a non-zero stage entry.
448 */
449static struct string_list *get_unmerged(void)
450{
451 struct string_list *unmerged = xcalloc(1, sizeof(struct string_list));
452 int i;
453
454 unmerged->strdup_strings = 1;
455
456 for (i = 0; i < active_nr; i++) {
457 struct string_list_item *item;
458 struct stage_data *e;
9c5e6c80 459 const struct cache_entry *ce = active_cache[i];
9047ebbc
MV
460 if (!ce_stage(ce))
461 continue;
462
e8c8b713 463 item = string_list_lookup(unmerged, ce->name);
9047ebbc 464 if (!item) {
78a395d3 465 item = string_list_insert(unmerged, ce->name);
9047ebbc
MV
466 item->util = xcalloc(1, sizeof(struct stage_data));
467 }
468 e = item->util;
469 e->stages[ce_stage(ce)].mode = ce->ce_mode;
99d1a986 470 oidcpy(&e->stages[ce_stage(ce)].oid, &ce->oid);
9047ebbc
MV
471 }
472
473 return unmerged;
474}
475
fa6ca111 476static int string_list_df_name_compare(const char *one, const char *two)
ef02b317 477{
fa6ca111
NTND
478 int onelen = strlen(one);
479 int twolen = strlen(two);
f0fd4d05
EN
480 /*
481 * Here we only care that entries for D/F conflicts are
482 * adjacent, in particular with the file of the D/F conflict
483 * appearing before files below the corresponding directory.
484 * The order of the rest of the list is irrelevant for us.
ef02b317 485 *
f0fd4d05
EN
486 * To achieve this, we sort with df_name_compare and provide
487 * the mode S_IFDIR so that D/F conflicts will sort correctly.
488 * We use the mode S_IFDIR for everything else for simplicity,
489 * since in other cases any changes in their order due to
490 * sorting cause no problems for us.
491 */
fa6ca111
NTND
492 int cmp = df_name_compare(one, onelen, S_IFDIR,
493 two, twolen, S_IFDIR);
f0fd4d05
EN
494 /*
495 * Now that 'foo' and 'foo/bar' compare equal, we have to make sure
496 * that 'foo' comes before 'foo/bar'.
ef02b317 497 */
f0fd4d05
EN
498 if (cmp)
499 return cmp;
500 return onelen - twolen;
501}
502
70cc3d36
EN
503static void record_df_conflict_files(struct merge_options *o,
504 struct string_list *entries)
ef02b317 505{
70cc3d36 506 /* If there is a D/F conflict and the file for such a conflict
f7d650c0 507 * currently exist in the working tree, we want to allow it to be
edd2faf5
EN
508 * removed to make room for the corresponding directory if needed.
509 * The files underneath the directories of such D/F conflicts will
510 * be processed before the corresponding file involved in the D/F
511 * conflict. If the D/F directory ends up being removed by the
512 * merge, then we won't have to touch the D/F file. If the D/F
513 * directory needs to be written to the working copy, then the D/F
514 * file will simply be removed (in make_room_for_path()) to make
515 * room for the necessary paths. Note that if both the directory
516 * and the file need to be present, then the D/F file will be
517 * reinstated with a new unique name at the time it is processed.
ef02b317 518 */
af4941d4 519 struct string_list df_sorted_entries = STRING_LIST_INIT_NODUP;
ef02b317 520 const char *last_file = NULL;
c8516500 521 int last_len = 0;
ef02b317
EN
522 int i;
523
0b30e812
EN
524 /*
525 * If we're merging merge-bases, we don't want to bother with
526 * any working directory changes.
527 */
528 if (o->call_depth)
529 return;
530
f0fd4d05 531 /* Ensure D/F conflicts are adjacent in the entries list. */
ef02b317 532 for (i = 0; i < entries->nr; i++) {
f701aae0
EN
533 struct string_list_item *next = &entries->items[i];
534 string_list_append(&df_sorted_entries, next->string)->util =
535 next->util;
536 }
fa6ca111
NTND
537 df_sorted_entries.cmp = string_list_df_name_compare;
538 string_list_sort(&df_sorted_entries);
f0fd4d05 539
70cc3d36 540 string_list_clear(&o->df_conflict_file_set, 1);
f701aae0
EN
541 for (i = 0; i < df_sorted_entries.nr; i++) {
542 const char *path = df_sorted_entries.items[i].string;
ef02b317 543 int len = strlen(path);
f701aae0 544 struct stage_data *e = df_sorted_entries.items[i].util;
ef02b317
EN
545
546 /*
547 * Check if last_file & path correspond to a D/F conflict;
548 * i.e. whether path is last_file+'/'+<something>.
70cc3d36
EN
549 * If so, record that it's okay to remove last_file to make
550 * room for path and friends if needed.
ef02b317
EN
551 */
552 if (last_file &&
553 len > last_len &&
554 memcmp(path, last_file, last_len) == 0 &&
555 path[last_len] == '/') {
70cc3d36 556 string_list_insert(&o->df_conflict_file_set, last_file);
ef02b317
EN
557 }
558
559 /*
560 * Determine whether path could exist as a file in the
561 * working directory as a possible D/F conflict. This
562 * will only occur when it exists in stage 2 as a
563 * file.
564 */
565 if (S_ISREG(e->stages[2].mode) || S_ISLNK(e->stages[2].mode)) {
566 last_file = path;
567 last_len = len;
ef02b317
EN
568 } else {
569 last_file = NULL;
570 }
571 }
f701aae0 572 string_list_clear(&df_sorted_entries, 0);
ef02b317
EN
573}
574
9cba13ca 575struct rename {
9047ebbc 576 struct diff_filepair *pair;
379fc378
EN
577 /*
578 * Purpose of src_entry and dst_entry:
579 *
580 * If 'before' is renamed to 'after' then src_entry will contain
581 * the versions of 'before' from the merge_base, HEAD, and MERGE in
582 * stages 1, 2, and 3; dst_entry will contain the respective
583 * versions of 'after' in corresponding locations. Thus, we have a
584 * total of six modes and oids, though some will be null. (Stage 0
585 * is ignored; we're interested in handling conflicts.)
586 *
587 * Since we don't turn on break-rewrites by default, neither
588 * src_entry nor dst_entry can have all three of their stages have
589 * non-null oids, meaning at most four of the six will be non-null.
590 * Also, since this is a rename, both src_entry and dst_entry will
591 * have at least one non-null oid, meaning at least two will be
592 * non-null. Of the six oids, a typical rename will have three be
593 * non-null. Only two implies a rename/delete, and four implies a
594 * rename/add.
595 */
9047ebbc
MV
596 struct stage_data *src_entry;
597 struct stage_data *dst_entry;
598 unsigned processed:1;
599};
600
bc9204d4
JS
601static int update_stages(struct merge_options *opt, const char *path,
602 const struct diff_filespec *o,
650467cf
EN
603 const struct diff_filespec *a,
604 const struct diff_filespec *b)
9047ebbc 605{
f53d3977
EN
606
607 /*
608 * NOTE: It is usually a bad idea to call update_stages on a path
609 * before calling update_file on that same path, since it can
610 * sometimes lead to spurious "refusing to lose untracked file..."
611 * messages from update_file (via make_room_for path via
612 * would_lose_untracked). Instead, reverse the order of the calls
613 * (executing update_file first and then update_stages).
614 */
650467cf
EN
615 int clear = 1;
616 int options = ADD_CACHE_OK_TO_ADD | ADD_CACHE_SKIP_DFCHECK;
9047ebbc
MV
617 if (clear)
618 if (remove_file_from_cache(path))
619 return -1;
620 if (o)
bc9204d4 621 if (add_cacheinfo(opt, o->mode, &o->oid, path, 1, 0, options))
9047ebbc
MV
622 return -1;
623 if (a)
bc9204d4 624 if (add_cacheinfo(opt, a->mode, &a->oid, path, 2, 0, options))
9047ebbc
MV
625 return -1;
626 if (b)
bc9204d4 627 if (add_cacheinfo(opt, b->mode, &b->oid, path, 3, 0, options))
9047ebbc
MV
628 return -1;
629 return 0;
630}
631
b8ddf164
EN
632static void update_entry(struct stage_data *entry,
633 struct diff_filespec *o,
634 struct diff_filespec *a,
635 struct diff_filespec *b)
2ff739f9 636{
2ff739f9
EN
637 entry->processed = 0;
638 entry->stages[1].mode = o->mode;
639 entry->stages[2].mode = a->mode;
640 entry->stages[3].mode = b->mode;
fd429e98 641 oidcpy(&entry->stages[1].oid, &o->oid);
642 oidcpy(&entry->stages[2].oid, &a->oid);
643 oidcpy(&entry->stages[3].oid, &b->oid);
2ff739f9
EN
644}
645
b7fa51da
MV
646static int remove_file(struct merge_options *o, int clean,
647 const char *path, int no_wd)
9047ebbc 648{
b7fa51da
MV
649 int update_cache = o->call_depth || clean;
650 int update_working_directory = !o->call_depth && !no_wd;
9047ebbc
MV
651
652 if (update_cache) {
653 if (remove_file_from_cache(path))
654 return -1;
655 }
656 if (update_working_directory) {
ae352c7f
DT
657 if (ignore_case) {
658 struct cache_entry *ce;
659 ce = cache_file_exists(path, strlen(path), ignore_case);
4cba2b01 660 if (ce && ce_stage(ce) == 0 && strcmp(path, ce->name))
ae352c7f
DT
661 return 0;
662 }
25755e84 663 if (remove_path(path))
9047ebbc 664 return -1;
9047ebbc
MV
665 }
666 return 0;
667}
668
45bc131d
JK
669/* add a string to a strbuf, but converting "/" to "_" */
670static void add_flattened_path(struct strbuf *out, const char *s)
671{
672 size_t i = out->len;
673 strbuf_addstr(out, s);
674 for (; i < out->len; i++)
675 if (out->buf[i] == '/')
676 out->buf[i] = '_';
677}
678
696ee23c 679static char *unique_path(struct merge_options *o, const char *path, const char *branch)
9047ebbc 680{
fc65b00d 681 struct path_hashmap_entry *entry;
45bc131d 682 struct strbuf newpath = STRBUF_INIT;
9047ebbc 683 int suffix = 0;
45bc131d
JK
684 size_t base_len;
685
686 strbuf_addf(&newpath, "%s~", path);
687 add_flattened_path(&newpath, branch);
688
689 base_len = newpath.len;
fc65b00d
KW
690 while (hashmap_get_from_hash(&o->current_file_dir_set,
691 path_hash(newpath.buf), newpath.buf) ||
8e1b62f1 692 (!o->call_depth && file_exists(newpath.buf))) {
45bc131d
JK
693 strbuf_setlen(&newpath, base_len);
694 strbuf_addf(&newpath, "_%d", suffix++);
695 }
696
fc65b00d
KW
697 FLEX_ALLOC_MEM(entry, path, newpath.buf, newpath.len);
698 hashmap_entry_init(entry, path_hash(entry->path));
699 hashmap_add(&o->current_file_dir_set, entry);
45bc131d 700 return strbuf_detach(&newpath, NULL);
9047ebbc
MV
701}
702
5423d2e7
DT
703/**
704 * Check whether a directory in the index is in the way of an incoming
705 * file. Return 1 if so. If check_working_copy is non-zero, also
706 * check the working directory. If empty_ok is non-zero, also return
707 * 0 in the case where the working-tree dir exists but is empty.
708 */
709static int dir_in_way(const char *path, int check_working_copy, int empty_ok)
f2507b4e 710{
b4600fbe
JK
711 int pos;
712 struct strbuf dirpath = STRBUF_INIT;
f2507b4e
EN
713 struct stat st;
714
b4600fbe
JK
715 strbuf_addstr(&dirpath, path);
716 strbuf_addch(&dirpath, '/');
f2507b4e 717
b4600fbe 718 pos = cache_name_pos(dirpath.buf, dirpath.len);
f2507b4e
EN
719
720 if (pos < 0)
721 pos = -1 - pos;
722 if (pos < active_nr &&
b4600fbe
JK
723 !strncmp(dirpath.buf, active_cache[pos]->name, dirpath.len)) {
724 strbuf_release(&dirpath);
f2507b4e
EN
725 return 1;
726 }
727
b4600fbe 728 strbuf_release(&dirpath);
5423d2e7
DT
729 return check_working_copy && !lstat(path, &st) && S_ISDIR(st.st_mode) &&
730 !(empty_ok && is_empty_dir(path));
f2507b4e
EN
731}
732
aacb82de 733static int was_tracked(const char *path)
60c91181
JH
734{
735 int pos = cache_name_pos(path, strlen(path));
736
f8d83fb6
JS
737 if (0 <= pos)
738 /* we have been tracking this path */
739 return 1;
740
741 /*
742 * Look for an unmerged entry for the path,
743 * specifically stage #2, which would indicate
744 * that "our" side before the merge started
745 * had the path tracked (and resulted in a conflict).
746 */
747 for (pos = -1 - pos;
748 pos < active_nr && !strcmp(path, active_cache[pos]->name);
749 pos++)
750 if (ce_stage(active_cache[pos]) == 2)
aacb82de 751 return 1;
aacb82de 752 return 0;
60c91181
JH
753}
754
aacb82de 755static int would_lose_untracked(const char *path)
9047ebbc 756{
aacb82de 757 return !was_tracked(path) && file_exists(path);
60c91181
JH
758}
759
ed0148a5 760static int make_room_for_path(struct merge_options *o, const char *path)
9047ebbc 761{
ed0148a5 762 int status, i;
55653a68 763 const char *msg = _("failed to create path '%s'%s");
9047ebbc 764
ed0148a5
EN
765 /* Unlink any D/F conflict files that are in the way */
766 for (i = 0; i < o->df_conflict_file_set.nr; i++) {
767 const char *df_path = o->df_conflict_file_set.items[i].string;
768 size_t pathlen = strlen(path);
769 size_t df_pathlen = strlen(df_path);
770 if (df_pathlen < pathlen &&
771 path[df_pathlen] == '/' &&
772 strncmp(path, df_path, df_pathlen) == 0) {
773 output(o, 3,
55653a68 774 _("Removing %s to make room for subdirectory\n"),
ed0148a5
EN
775 df_path);
776 unlink(df_path);
777 unsorted_string_list_delete_item(&o->df_conflict_file_set,
778 i, 0);
779 break;
780 }
781 }
782
783 /* Make sure leading directories are created */
9047ebbc
MV
784 status = safe_create_leading_directories_const(path);
785 if (status) {
6003303a 786 if (status == SCLD_EXISTS)
9047ebbc 787 /* something else exists */
bc9204d4
JS
788 return err(o, msg, path, _(": perhaps a D/F conflict?"));
789 return err(o, msg, path, "");
9047ebbc
MV
790 }
791
60c91181
JH
792 /*
793 * Do not unlink a file in the work tree if we are not
794 * tracking it.
795 */
796 if (would_lose_untracked(path))
bc9204d4 797 return err(o, _("refusing to lose untracked file at '%s'"),
60c91181
JH
798 path);
799
9047ebbc
MV
800 /* Successful unlink is good.. */
801 if (!unlink(path))
802 return 0;
803 /* .. and so is no existing file */
804 if (errno == ENOENT)
805 return 0;
806 /* .. but not some other error (who really cares what?) */
bc9204d4 807 return err(o, msg, path, _(": perhaps a D/F conflict?"));
9047ebbc
MV
808}
809
75456f96
JS
810static int update_file_flags(struct merge_options *o,
811 const struct object_id *oid,
812 unsigned mode,
813 const char *path,
814 int update_cache,
815 int update_wd)
9047ebbc 816{
6003303a
JS
817 int ret = 0;
818
b7fa51da 819 if (o->call_depth)
9047ebbc
MV
820 update_wd = 0;
821
822 if (update_wd) {
823 enum object_type type;
824 void *buf;
825 unsigned long size;
826
68d03e4a 827 if (S_ISGITLINK(mode)) {
0c44c943
JH
828 /*
829 * We may later decide to recursively descend into
830 * the submodule directory and update its index
831 * and/or work tree, but we do not do that now.
832 */
68d03e4a 833 update_wd = 0;
0c44c943 834 goto update_index;
68d03e4a 835 }
9047ebbc 836
b4f5aca4 837 buf = read_object_file(oid, &type, &size);
9047ebbc 838 if (!buf)
bc9204d4 839 return err(o, _("cannot read object %s '%s'"), oid_to_hex(oid), path);
6003303a 840 if (type != OBJ_BLOB) {
bc9204d4 841 ret = err(o, _("blob expected for %s '%s'"), oid_to_hex(oid), path);
6003303a
JS
842 goto free_buf;
843 }
9047ebbc 844 if (S_ISREG(mode)) {
f285a2d7 845 struct strbuf strbuf = STRBUF_INIT;
9047ebbc
MV
846 if (convert_to_working_tree(path, buf, size, &strbuf)) {
847 free(buf);
848 size = strbuf.len;
849 buf = strbuf_detach(&strbuf, NULL);
850 }
851 }
852
ed0148a5 853 if (make_room_for_path(o, path) < 0) {
9047ebbc 854 update_wd = 0;
75456f96 855 goto free_buf;
9047ebbc
MV
856 }
857 if (S_ISREG(mode) || (!has_symlinks && S_ISLNK(mode))) {
858 int fd;
859 if (mode & 0100)
860 mode = 0777;
861 else
862 mode = 0666;
863 fd = open(path, O_WRONLY | O_TRUNC | O_CREAT, mode);
6003303a 864 if (fd < 0) {
bc9204d4
JS
865 ret = err(o, _("failed to open '%s': %s"),
866 path, strerror(errno));
6003303a
JS
867 goto free_buf;
868 }
f633ea2c 869 write_in_full(fd, buf, size);
9047ebbc
MV
870 close(fd);
871 } else if (S_ISLNK(mode)) {
872 char *lnk = xmemdupz(buf, size);
873 safe_create_leading_directories_const(path);
874 unlink(path);
304dcf26 875 if (symlink(lnk, path))
bc9204d4
JS
876 ret = err(o, _("failed to symlink '%s': %s"),
877 path, strerror(errno));
9047ebbc
MV
878 free(lnk);
879 } else
bc9204d4
JS
880 ret = err(o,
881 _("do not know what to do with %06o %s '%s'"),
882 mode, oid_to_hex(oid), path);
75456f96 883 free_buf:
9047ebbc
MV
884 free(buf);
885 }
886 update_index:
6003303a 887 if (!ret && update_cache)
bc9204d4 888 add_cacheinfo(o, mode, oid, path, 0, update_wd, ADD_CACHE_OK_TO_ADD);
6003303a 889 return ret;
9047ebbc
MV
890}
891
75456f96
JS
892static int update_file(struct merge_options *o,
893 int clean,
894 const struct object_id *oid,
895 unsigned mode,
896 const char *path)
9047ebbc 897{
75456f96 898 return update_file_flags(o, oid, mode, path, o->call_depth || clean, !o->call_depth);
9047ebbc
MV
899}
900
901/* Low level file merging, update and removal */
902
9cba13ca 903struct merge_file_info {
9b561499 904 struct object_id oid;
9047ebbc
MV
905 unsigned mode;
906 unsigned clean:1,
907 merge:1;
908};
909
b7fa51da
MV
910static int merge_3way(struct merge_options *o,
911 mmbuffer_t *result_buf,
0c059420
EN
912 const struct diff_filespec *one,
913 const struct diff_filespec *a,
914 const struct diff_filespec *b,
9047ebbc
MV
915 const char *branch1,
916 const char *branch2)
917{
918 mmfile_t orig, src1, src2;
712516bc 919 struct ll_merge_options ll_opts = {0};
4c5868f4 920 char *base_name, *name1, *name2;
9047ebbc 921 int merge_status;
8cc5b290 922
712516bc 923 ll_opts.renormalize = o->renormalize;
58a1ece4 924 ll_opts.xdl_opts = o->xdl_opts;
712516bc
JN
925
926 if (o->call_depth) {
927 ll_opts.virtual_ancestor = 1;
928 ll_opts.variant = 0;
929 } else {
8cc5b290
AP
930 switch (o->recursive_variant) {
931 case MERGE_RECURSIVE_OURS:
712516bc 932 ll_opts.variant = XDL_MERGE_FAVOR_OURS;
8cc5b290
AP
933 break;
934 case MERGE_RECURSIVE_THEIRS:
712516bc 935 ll_opts.variant = XDL_MERGE_FAVOR_THEIRS;
8cc5b290
AP
936 break;
937 default:
712516bc 938 ll_opts.variant = 0;
8cc5b290
AP
939 break;
940 }
941 }
9047ebbc 942
4c5868f4
JN
943 if (strcmp(a->path, b->path) ||
944 (o->ancestor != NULL && strcmp(a->path, one->path) != 0)) {
945 base_name = o->ancestor == NULL ? NULL :
4e2d094d
RJ
946 mkpathdup("%s:%s", o->ancestor, one->path);
947 name1 = mkpathdup("%s:%s", branch1, a->path);
948 name2 = mkpathdup("%s:%s", branch2, b->path);
606475f3 949 } else {
4c5868f4 950 base_name = o->ancestor == NULL ? NULL :
4e2d094d
RJ
951 mkpathdup("%s", o->ancestor);
952 name1 = mkpathdup("%s", branch1);
953 name2 = mkpathdup("%s", branch2);
606475f3 954 }
9047ebbc 955
d449347d 956 read_mmblob(&orig, &one->oid);
957 read_mmblob(&src1, &a->oid);
958 read_mmblob(&src2, &b->oid);
9047ebbc 959
4c5868f4 960 merge_status = ll_merge(result_buf, a->path, &orig, base_name,
712516bc 961 &src1, name1, &src2, name2, &ll_opts);
9047ebbc 962
4e2d094d 963 free(base_name);
9047ebbc
MV
964 free(name1);
965 free(name2);
966 free(orig.ptr);
967 free(src1.ptr);
968 free(src2.ptr);
969 return merge_status;
970}
971
3c8a51e8 972static int merge_file_1(struct merge_options *o,
6bdaead1
EN
973 const struct diff_filespec *one,
974 const struct diff_filespec *a,
975 const struct diff_filespec *b,
976 const char *branch1,
3c8a51e8
JS
977 const char *branch2,
978 struct merge_file_info *result)
9047ebbc 979{
3c8a51e8
JS
980 result->merge = 0;
981 result->clean = 1;
9047ebbc
MV
982
983 if ((S_IFMT & a->mode) != (S_IFMT & b->mode)) {
3c8a51e8 984 result->clean = 0;
9047ebbc 985 if (S_ISREG(a->mode)) {
3c8a51e8
JS
986 result->mode = a->mode;
987 oidcpy(&result->oid, &a->oid);
9047ebbc 988 } else {
3c8a51e8
JS
989 result->mode = b->mode;
990 oidcpy(&result->oid, &b->oid);
9047ebbc
MV
991 }
992 } else {
b4da9d62 993 if (!oid_eq(&a->oid, &one->oid) && !oid_eq(&b->oid, &one->oid))
3c8a51e8 994 result->merge = 1;
9047ebbc
MV
995
996 /*
997 * Merge modes
998 */
b7fa51da 999 if (a->mode == b->mode || a->mode == one->mode)
3c8a51e8 1000 result->mode = b->mode;
9047ebbc 1001 else {
3c8a51e8 1002 result->mode = a->mode;
b7fa51da 1003 if (b->mode != one->mode) {
3c8a51e8
JS
1004 result->clean = 0;
1005 result->merge = 1;
9047ebbc
MV
1006 }
1007 }
1008
b4da9d62 1009 if (oid_eq(&a->oid, &b->oid) || oid_eq(&a->oid, &one->oid))
3c8a51e8 1010 oidcpy(&result->oid, &b->oid);
b4da9d62 1011 else if (oid_eq(&b->oid, &one->oid))
3c8a51e8 1012 oidcpy(&result->oid, &a->oid);
9047ebbc
MV
1013 else if (S_ISREG(a->mode)) {
1014 mmbuffer_t result_buf;
6003303a 1015 int ret = 0, merge_status;
9047ebbc 1016
b7fa51da 1017 merge_status = merge_3way(o, &result_buf, one, a, b,
9047ebbc
MV
1018 branch1, branch2);
1019
1020 if ((merge_status < 0) || !result_buf.ptr)
bc9204d4 1021 ret = err(o, _("Failed to execute internal merge"));
9047ebbc 1022
a09c985e
PO
1023 if (!ret &&
1024 write_object_file(result_buf.ptr, result_buf.size,
1025 blob_type, &result->oid))
bc9204d4
JS
1026 ret = err(o, _("Unable to add %s to database"),
1027 a->path);
9047ebbc
MV
1028
1029 free(result_buf.ptr);
6003303a
JS
1030 if (ret)
1031 return ret;
3c8a51e8 1032 result->clean = (merge_status == 0);
9047ebbc 1033 } else if (S_ISGITLINK(a->mode)) {
71f35d5c 1034 result->clean = merge_submodule(&result->oid,
a0d12c44 1035 one->path,
71f35d5c 1036 &one->oid,
1037 &a->oid,
1038 &b->oid,
80988783 1039 !o->call_depth);
9047ebbc 1040 } else if (S_ISLNK(a->mode)) {
fd48b464
JH
1041 switch (o->recursive_variant) {
1042 case MERGE_RECURSIVE_NORMAL:
1043 oidcpy(&result->oid, &a->oid);
1044 if (!oid_eq(&a->oid, &b->oid))
1045 result->clean = 0;
1046 break;
1047 case MERGE_RECURSIVE_OURS:
1048 oidcpy(&result->oid, &a->oid);
1049 break;
1050 case MERGE_RECURSIVE_THEIRS:
1051 oidcpy(&result->oid, &b->oid);
1052 break;
1053 }
ef1177d1 1054 } else
7e97e100 1055 die("BUG: unsupported object type in the tree");
9047ebbc
MV
1056 }
1057
3c8a51e8 1058 return 0;
9047ebbc
MV
1059}
1060
3c8a51e8 1061static int merge_file_special_markers(struct merge_options *o,
dac47415
EN
1062 const struct diff_filespec *one,
1063 const struct diff_filespec *a,
1064 const struct diff_filespec *b,
1065 const char *branch1,
1066 const char *filename1,
1067 const char *branch2,
3c8a51e8
JS
1068 const char *filename2,
1069 struct merge_file_info *mfi)
dac47415
EN
1070{
1071 char *side1 = NULL;
1072 char *side2 = NULL;
3c8a51e8 1073 int ret;
dac47415 1074
28310186
JK
1075 if (filename1)
1076 side1 = xstrfmt("%s:%s", branch1, filename1);
1077 if (filename2)
1078 side2 = xstrfmt("%s:%s", branch2, filename2);
dac47415 1079
3c8a51e8
JS
1080 ret = merge_file_1(o, one, a, b,
1081 side1 ? side1 : branch1,
1082 side2 ? side2 : branch2, mfi);
dac47415
EN
1083 free(side1);
1084 free(side2);
3c8a51e8 1085 return ret;
dac47415
EN
1086}
1087
3c8a51e8 1088static int merge_file_one(struct merge_options *o,
6bdaead1 1089 const char *path,
b4da9d62 1090 const struct object_id *o_oid, int o_mode,
1091 const struct object_id *a_oid, int a_mode,
1092 const struct object_id *b_oid, int b_mode,
6bdaead1 1093 const char *branch1,
3c8a51e8
JS
1094 const char *branch2,
1095 struct merge_file_info *mfi)
6bdaead1
EN
1096{
1097 struct diff_filespec one, a, b;
1098
1099 one.path = a.path = b.path = (char *)path;
b4da9d62 1100 oidcpy(&one.oid, o_oid);
6bdaead1 1101 one.mode = o_mode;
b4da9d62 1102 oidcpy(&a.oid, a_oid);
6bdaead1 1103 a.mode = a_mode;
b4da9d62 1104 oidcpy(&b.oid, b_oid);
6bdaead1 1105 b.mode = b_mode;
3c8a51e8 1106 return merge_file_1(o, &one, &a, &b, branch1, branch2, mfi);
6bdaead1
EN
1107}
1108
75456f96 1109static int handle_change_delete(struct merge_options *o,
b26d87f2 1110 const char *path, const char *old_path,
b4da9d62 1111 const struct object_id *o_oid, int o_mode,
b26d87f2
MM
1112 const struct object_id *changed_oid,
1113 int changed_mode,
1114 const char *change_branch,
1115 const char *delete_branch,
b7033252
EN
1116 const char *change, const char *change_past)
1117{
b26d87f2
MM
1118 char *alt_path = NULL;
1119 const char *update_path = path;
75456f96 1120 int ret = 0;
b26d87f2 1121
8b026eda 1122 if (dir_in_way(path, !o->call_depth, 0)) {
b26d87f2 1123 update_path = alt_path = unique_path(o, path, change_branch);
b7033252
EN
1124 }
1125
1126 if (o->call_depth) {
1127 /*
1128 * We cannot arbitrarily accept either a_sha or b_sha as
1129 * correct; since there is no true "middle point" between
1130 * them, simply reuse the base version for virtual merge base.
1131 */
75456f96
JS
1132 ret = remove_file_from_cache(path);
1133 if (!ret)
b26d87f2 1134 ret = update_file(o, 0, o_oid, o_mode, update_path);
b7033252 1135 } else {
b26d87f2
MM
1136 if (!alt_path) {
1137 if (!old_path) {
1138 output(o, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1139 "and %s in %s. Version %s of %s left in tree."),
1140 change, path, delete_branch, change_past,
1141 change_branch, change_branch, path);
1142 } else {
1143 output(o, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1144 "and %s to %s in %s. Version %s of %s left in tree."),
1145 change, old_path, delete_branch, change_past, path,
1146 change_branch, change_branch, path);
1147 }
55653a68 1148 } else {
b26d87f2
MM
1149 if (!old_path) {
1150 output(o, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1151 "and %s in %s. Version %s of %s left in tree at %s."),
1152 change, path, delete_branch, change_past,
1153 change_branch, change_branch, path, alt_path);
1154 } else {
1155 output(o, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1156 "and %s to %s in %s. Version %s of %s left in tree at %s."),
1157 change, old_path, delete_branch, change_past, path,
1158 change_branch, change_branch, path, alt_path);
1159 }
55653a68 1160 }
35a74abf 1161 /*
b26d87f2
MM
1162 * No need to call update_file() on path when change_branch ==
1163 * o->branch1 && !alt_path, since that would needlessly touch
1164 * path. We could call update_file_flags() with update_cache=0
1165 * and update_wd=0, but that's a no-op.
35a74abf 1166 */
b26d87f2
MM
1167 if (change_branch != o->branch1 || alt_path)
1168 ret = update_file(o, 0, changed_oid, changed_mode, update_path);
b7033252 1169 }
b26d87f2 1170 free(alt_path);
75456f96
JS
1171
1172 return ret;
b7033252
EN
1173}
1174
75456f96 1175static int conflict_rename_delete(struct merge_options *o,
6ef2cb00
EN
1176 struct diff_filepair *pair,
1177 const char *rename_branch,
b26d87f2 1178 const char *delete_branch)
9047ebbc 1179{
e03acb8b
EN
1180 const struct diff_filespec *orig = pair->one;
1181 const struct diff_filespec *dest = pair->two;
6ef2cb00 1182
75456f96
JS
1183 if (handle_change_delete(o,
1184 o->call_depth ? orig->path : dest->path,
b26d87f2 1185 o->call_depth ? NULL : orig->path,
75456f96 1186 &orig->oid, orig->mode,
b26d87f2
MM
1187 &dest->oid, dest->mode,
1188 rename_branch, delete_branch,
75456f96
JS
1189 _("rename"), _("renamed")))
1190 return -1;
e03acb8b 1191
75456f96
JS
1192 if (o->call_depth)
1193 return remove_file_from_cache(dest->path);
1194 else
bc9204d4 1195 return update_stages(o, dest->path, NULL,
75456f96
JS
1196 rename_branch == o->branch1 ? dest : NULL,
1197 rename_branch == o->branch1 ? NULL : dest);
6ef2cb00
EN
1198}
1199
1ac91b32
EN
1200static struct diff_filespec *filespec_from_entry(struct diff_filespec *target,
1201 struct stage_data *entry,
1202 int stage)
9047ebbc 1203{
b4da9d62 1204 struct object_id *oid = &entry->stages[stage].oid;
1ac91b32 1205 unsigned mode = entry->stages[stage].mode;
b4da9d62 1206 if (mode == 0 || is_null_oid(oid))
1ac91b32 1207 return NULL;
b4da9d62 1208 oidcpy(&target->oid, oid);
1ac91b32
EN
1209 target->mode = mode;
1210 return target;
1211}
1212
75456f96 1213static int handle_file(struct merge_options *o,
3672c971
EN
1214 struct diff_filespec *rename,
1215 int stage,
1216 struct rename_conflict_info *ci)
1217{
1218 char *dst_name = rename->path;
1219 struct stage_data *dst_entry;
1220 const char *cur_branch, *other_branch;
1221 struct diff_filespec other;
1222 struct diff_filespec *add;
75456f96 1223 int ret;
3672c971
EN
1224
1225 if (stage == 2) {
1226 dst_entry = ci->dst_entry1;
1227 cur_branch = ci->branch1;
1228 other_branch = ci->branch2;
1229 } else {
1230 dst_entry = ci->dst_entry2;
1231 cur_branch = ci->branch2;
1232 other_branch = ci->branch1;
9047ebbc 1233 }
3672c971
EN
1234
1235 add = filespec_from_entry(&other, dst_entry, stage ^ 1);
3672c971
EN
1236 if (add) {
1237 char *add_name = unique_path(o, rename->path, other_branch);
75456f96
JS
1238 if (update_file(o, 0, &add->oid, add->mode, add_name))
1239 return -1;
3672c971 1240
8b026eda 1241 remove_file(o, 0, rename->path, 0);
3672c971
EN
1242 dst_name = unique_path(o, rename->path, cur_branch);
1243 } else {
5423d2e7 1244 if (dir_in_way(rename->path, !o->call_depth, 0)) {
3672c971 1245 dst_name = unique_path(o, rename->path, cur_branch);
55653a68 1246 output(o, 1, _("%s is a directory in %s adding as %s instead"),
3672c971
EN
1247 rename->path, other_branch, dst_name);
1248 }
9047ebbc 1249 }
75456f96
JS
1250 if ((ret = update_file(o, 0, &rename->oid, rename->mode, dst_name)))
1251 ; /* fall through, do allow dst_name to be released */
1252 else if (stage == 2)
bc9204d4 1253 ret = update_stages(o, rename->path, NULL, rename, add);
f53d3977 1254 else
bc9204d4 1255 ret = update_stages(o, rename->path, NULL, add, rename);
3672c971
EN
1256
1257 if (dst_name != rename->path)
1258 free(dst_name);
75456f96
JS
1259
1260 return ret;
3672c971
EN
1261}
1262
75456f96 1263static int conflict_rename_rename_1to2(struct merge_options *o,
a99b7f22 1264 struct rename_conflict_info *ci)
9047ebbc 1265{
09c01f85 1266 /* One file was renamed in both branches, but to different names. */
a99b7f22
EN
1267 struct diff_filespec *one = ci->pair1->one;
1268 struct diff_filespec *a = ci->pair1->two;
1269 struct diff_filespec *b = ci->pair2->two;
4f66dade 1270
55653a68 1271 output(o, 1, _("CONFLICT (rename/rename): "
4f66dade 1272 "Rename \"%s\"->\"%s\" in branch \"%s\" "
55653a68 1273 "rename \"%s\"->\"%s\" in \"%s\"%s"),
a99b7f22
EN
1274 one->path, a->path, ci->branch1,
1275 one->path, b->path, ci->branch2,
55653a68 1276 o->call_depth ? _(" (left unresolved)") : "");
b7fa51da 1277 if (o->call_depth) {
c52ff85d 1278 struct merge_file_info mfi;
6d63070c
EN
1279 struct diff_filespec other;
1280 struct diff_filespec *add;
3c8a51e8 1281 if (merge_file_one(o, one->path,
b4da9d62 1282 &one->oid, one->mode,
1283 &a->oid, a->mode,
1284 &b->oid, b->mode,
3c8a51e8 1285 ci->branch1, ci->branch2, &mfi))
75456f96
JS
1286 return -1;
1287
9047ebbc 1288 /*
c52ff85d
EN
1289 * FIXME: For rename/add-source conflicts (if we could detect
1290 * such), this is wrong. We should instead find a unique
1291 * pathname and then either rename the add-source file to that
1292 * unique path, or use that unique path instead of src here.
9047ebbc 1293 */
75456f96
JS
1294 if (update_file(o, 0, &mfi.oid, mfi.mode, one->path))
1295 return -1;
07413c5a 1296
6d63070c
EN
1297 /*
1298 * Above, we put the merged content at the merge-base's
1299 * path. Now we usually need to delete both a->path and
1300 * b->path. However, the rename on each side of the merge
1301 * could also be involved in a rename/add conflict. In
1302 * such cases, we should keep the added file around,
1303 * resolving the conflict at that path in its favor.
1304 */
1305 add = filespec_from_entry(&other, ci->dst_entry1, 2 ^ 1);
75456f96
JS
1306 if (add) {
1307 if (update_file(o, 0, &add->oid, add->mode, a->path))
1308 return -1;
1309 }
6d63070c
EN
1310 else
1311 remove_file_from_cache(a->path);
1312 add = filespec_from_entry(&other, ci->dst_entry2, 3 ^ 1);
75456f96
JS
1313 if (add) {
1314 if (update_file(o, 0, &add->oid, add->mode, b->path))
1315 return -1;
1316 }
6d63070c
EN
1317 else
1318 remove_file_from_cache(b->path);
75456f96
JS
1319 } else if (handle_file(o, a, 2, ci) || handle_file(o, b, 3, ci))
1320 return -1;
1321
1322 return 0;
9047ebbc
MV
1323}
1324
75456f96 1325static int conflict_rename_rename_2to1(struct merge_options *o,
461f5041 1326 struct rename_conflict_info *ci)
9047ebbc 1327{
461f5041
EN
1328 /* Two files, a & b, were renamed to the same thing, c. */
1329 struct diff_filespec *a = ci->pair1->one;
1330 struct diff_filespec *b = ci->pair2->one;
1331 struct diff_filespec *c1 = ci->pair1->two;
1332 struct diff_filespec *c2 = ci->pair2->two;
1333 char *path = c1->path; /* == c2->path */
434b8525
EN
1334 struct merge_file_info mfi_c1;
1335 struct merge_file_info mfi_c2;
75456f96 1336 int ret;
461f5041 1337
55653a68 1338 output(o, 1, _("CONFLICT (rename/rename): "
461f5041 1339 "Rename %s->%s in %s. "
55653a68 1340 "Rename %s->%s in %s"),
461f5041
EN
1341 a->path, c1->path, ci->branch1,
1342 b->path, c2->path, ci->branch2);
1343
8e1b62f1
EN
1344 remove_file(o, 1, a->path, o->call_depth || would_lose_untracked(a->path));
1345 remove_file(o, 1, b->path, o->call_depth || would_lose_untracked(b->path));
461f5041 1346
3c8a51e8
JS
1347 if (merge_file_special_markers(o, a, c1, &ci->ren1_other,
1348 o->branch1, c1->path,
1349 o->branch2, ci->ren1_other.path, &mfi_c1) ||
1350 merge_file_special_markers(o, b, &ci->ren2_other, c2,
1351 o->branch1, ci->ren2_other.path,
1352 o->branch2, c2->path, &mfi_c2))
75456f96 1353 return -1;
434b8525 1354
0a6b8712 1355 if (o->call_depth) {
434b8525
EN
1356 /*
1357 * If mfi_c1.clean && mfi_c2.clean, then it might make
1358 * sense to do a two-way merge of those results. But, I
1359 * think in all cases, it makes sense to have the virtual
1360 * merge base just undo the renames; they can be detected
1361 * again later for the non-recursive merge.
1362 */
1363 remove_file(o, 0, path, 0);
75456f96
JS
1364 ret = update_file(o, 0, &mfi_c1.oid, mfi_c1.mode, a->path);
1365 if (!ret)
1366 ret = update_file(o, 0, &mfi_c2.oid, mfi_c2.mode,
1367 b->path);
0a6b8712 1368 } else {
461f5041
EN
1369 char *new_path1 = unique_path(o, path, ci->branch1);
1370 char *new_path2 = unique_path(o, path, ci->branch2);
55653a68 1371 output(o, 1, _("Renaming %s to %s and %s to %s instead"),
461f5041 1372 a->path, new_path1, b->path, new_path2);
8b026eda 1373 remove_file(o, 0, path, 0);
75456f96
JS
1374 ret = update_file(o, 0, &mfi_c1.oid, mfi_c1.mode, new_path1);
1375 if (!ret)
1376 ret = update_file(o, 0, &mfi_c2.oid, mfi_c2.mode,
1377 new_path2);
0a6b8712
EN
1378 free(new_path2);
1379 free(new_path1);
1380 }
75456f96
JS
1381
1382 return ret;
9047ebbc
MV
1383}
1384
9ba91557 1385/*
e5257b2a 1386 * Get the diff_filepairs changed between o_tree and tree.
9ba91557 1387 */
e5257b2a
EN
1388static struct diff_queue_struct *get_diffpairs(struct merge_options *o,
1389 struct tree *o_tree,
1390 struct tree *tree)
9ba91557 1391{
e5257b2a 1392 struct diff_queue_struct *ret;
9ba91557
EN
1393 struct diff_options opts;
1394
9ba91557
EN
1395 diff_setup(&opts);
1396 opts.flags.recursive = 1;
1397 opts.flags.rename_empty = 0;
1398 opts.detect_rename = DIFF_DETECT_RENAME;
1399 opts.rename_limit = o->merge_rename_limit >= 0 ? o->merge_rename_limit :
1400 o->diff_rename_limit >= 0 ? o->diff_rename_limit :
1401 1000;
1402 opts.rename_score = o->rename_score;
1403 opts.show_rename_progress = o->show_rename_progress;
1404 opts.output_format = DIFF_FORMAT_NO_OUTPUT;
1405 diff_setup_done(&opts);
1406 diff_tree_oid(&o_tree->object.oid, &tree->object.oid, "", &opts);
1407 diffcore_std(&opts);
1408 if (opts.needed_rename_limit > o->needed_rename_limit)
1409 o->needed_rename_limit = opts.needed_rename_limit;
e5257b2a
EN
1410
1411 ret = xmalloc(sizeof(*ret));
1412 *ret = diff_queued_diff;
1413
1414 opts.output_format = DIFF_FORMAT_NO_OUTPUT;
1415 diff_queued_diff.nr = 0;
1416 diff_queued_diff.queue = NULL;
1417 diff_flush(&opts);
1418 return ret;
1419}
1420
96e7ffbd
EN
1421static int tree_has_path(struct tree *tree, const char *path)
1422{
1423 struct object_id hashy;
1424 unsigned int mode_o;
1425
1426 return !get_tree_entry(&tree->object.oid, path,
1427 &hashy, &mode_o);
1428}
1429
e95ab70a
EN
1430/*
1431 * Return a new string that replaces the beginning portion (which matches
1432 * entry->dir), with entry->new_dir. In perl-speak:
1433 * new_path_name = (old_path =~ s/entry->dir/entry->new_dir/);
1434 * NOTE:
1435 * Caller must ensure that old_path starts with entry->dir + '/'.
1436 */
1437static char *apply_dir_rename(struct dir_rename_entry *entry,
1438 const char *old_path)
1439{
1440 struct strbuf new_path = STRBUF_INIT;
1441 int oldlen, newlen;
1442
1443 if (entry->non_unique_new_dir)
1444 return NULL;
1445
1446 oldlen = strlen(entry->dir);
1447 newlen = entry->new_dir.len + (strlen(old_path) - oldlen) + 1;
1448 strbuf_grow(&new_path, newlen);
1449 strbuf_addbuf(&new_path, &entry->new_dir);
1450 strbuf_addstr(&new_path, &old_path[oldlen]);
1451
1452 return strbuf_detach(&new_path, NULL);
1453}
1454
7fe40b88
EN
1455static void get_renamed_dir_portion(const char *old_path, const char *new_path,
1456 char **old_dir, char **new_dir)
1457{
1458 char *end_of_old, *end_of_new;
1459 int old_len, new_len;
1460
1461 *old_dir = NULL;
1462 *new_dir = NULL;
1463
1464 /*
1465 * For
1466 * "a/b/c/d/e/foo.c" -> "a/b/some/thing/else/e/foo.c"
1467 * the "e/foo.c" part is the same, we just want to know that
1468 * "a/b/c/d" was renamed to "a/b/some/thing/else"
1469 * so, for this example, this function returns "a/b/c/d" in
1470 * *old_dir and "a/b/some/thing/else" in *new_dir.
1471 *
1472 * Also, if the basename of the file changed, we don't care. We
1473 * want to know which portion of the directory, if any, changed.
1474 */
1475 end_of_old = strrchr(old_path, '/');
1476 end_of_new = strrchr(new_path, '/');
1477
1478 if (end_of_old == NULL || end_of_new == NULL)
1479 return;
1480 while (*--end_of_new == *--end_of_old &&
1481 end_of_old != old_path &&
1482 end_of_new != new_path)
1483 ; /* Do nothing; all in the while loop */
1484 /*
1485 * We've found the first non-matching character in the directory
1486 * paths. That means the current directory we were comparing
1487 * represents the rename. Move end_of_old and end_of_new back
1488 * to the full directory name.
1489 */
1490 if (*end_of_old == '/')
1491 end_of_old++;
1492 if (*end_of_old != '/')
1493 end_of_new++;
1494 end_of_old = strchr(end_of_old, '/');
1495 end_of_new = strchr(end_of_new, '/');
1496
1497 /*
1498 * It may have been the case that old_path and new_path were the same
1499 * directory all along. Don't claim a rename if they're the same.
1500 */
1501 old_len = end_of_old - old_path;
1502 new_len = end_of_new - new_path;
1503
1504 if (old_len != new_len || strncmp(old_path, new_path, old_len)) {
1505 *old_dir = xstrndup(old_path, old_len);
1506 *new_dir = xstrndup(new_path, new_len);
1507 }
1508}
1509
96e7ffbd
EN
1510static void remove_hashmap_entries(struct hashmap *dir_renames,
1511 struct string_list *items_to_remove)
1512{
1513 int i;
1514 struct dir_rename_entry *entry;
1515
1516 for (i = 0; i < items_to_remove->nr; i++) {
1517 entry = items_to_remove->items[i].util;
1518 hashmap_remove(dir_renames, entry, NULL);
1519 }
1520 string_list_clear(items_to_remove, 0);
1521}
1522
1523/*
1524 * There are a couple things we want to do at the directory level:
1525 * 1. Check for both sides renaming to the same thing, in order to avoid
1526 * implicit renaming of files that should be left in place. (See
1527 * testcase 6b in t6043 for details.)
1528 * 2. Prune directory renames if there are still files left in the
1529 * the original directory. These represent a partial directory rename,
1530 * i.e. a rename where only some of the files within the directory
1531 * were renamed elsewhere. (Technically, this could be done earlier
1532 * in get_directory_renames(), except that would prevent us from
1533 * doing the previous check and thus failing testcase 6b.)
1534 * 3. Check for rename/rename(1to2) conflicts (at the directory level).
1535 * In the future, we could potentially record this info as well and
1536 * omit reporting rename/rename(1to2) conflicts for each path within
1537 * the affected directories, thus cleaning up the merge output.
1538 * NOTE: We do NOT check for rename/rename(2to1) conflicts at the
1539 * directory level, because merging directories is fine. If it
1540 * causes conflicts for files within those merged directories, then
1541 * that should be detected at the individual path level.
1542 */
1543static void handle_directory_level_conflicts(struct merge_options *o,
1544 struct hashmap *dir_re_head,
1545 struct tree *head,
1546 struct hashmap *dir_re_merge,
1547 struct tree *merge)
1548{
1549 struct hashmap_iter iter;
1550 struct dir_rename_entry *head_ent;
1551 struct dir_rename_entry *merge_ent;
1552
1553 struct string_list remove_from_head = STRING_LIST_INIT_NODUP;
1554 struct string_list remove_from_merge = STRING_LIST_INIT_NODUP;
1555
1556 hashmap_iter_init(dir_re_head, &iter);
1557 while ((head_ent = hashmap_iter_next(&iter))) {
1558 merge_ent = dir_rename_find_entry(dir_re_merge, head_ent->dir);
1559 if (merge_ent &&
1560 !head_ent->non_unique_new_dir &&
1561 !merge_ent->non_unique_new_dir &&
1562 !strbuf_cmp(&head_ent->new_dir, &merge_ent->new_dir)) {
1563 /* 1. Renamed identically; remove it from both sides */
1564 string_list_append(&remove_from_head,
1565 head_ent->dir)->util = head_ent;
1566 strbuf_release(&head_ent->new_dir);
1567 string_list_append(&remove_from_merge,
1568 merge_ent->dir)->util = merge_ent;
1569 strbuf_release(&merge_ent->new_dir);
1570 } else if (tree_has_path(head, head_ent->dir)) {
1571 /* 2. This wasn't a directory rename after all */
1572 string_list_append(&remove_from_head,
1573 head_ent->dir)->util = head_ent;
1574 strbuf_release(&head_ent->new_dir);
1575 }
1576 }
1577
1578 remove_hashmap_entries(dir_re_head, &remove_from_head);
1579 remove_hashmap_entries(dir_re_merge, &remove_from_merge);
1580
1581 hashmap_iter_init(dir_re_merge, &iter);
1582 while ((merge_ent = hashmap_iter_next(&iter))) {
1583 head_ent = dir_rename_find_entry(dir_re_head, merge_ent->dir);
1584 if (tree_has_path(merge, merge_ent->dir)) {
1585 /* 2. This wasn't a directory rename after all */
1586 string_list_append(&remove_from_merge,
1587 merge_ent->dir)->util = merge_ent;
1588 } else if (head_ent &&
1589 !head_ent->non_unique_new_dir &&
1590 !merge_ent->non_unique_new_dir) {
1591 /* 3. rename/rename(1to2) */
1592 /*
1593 * We can assume it's not rename/rename(1to1) because
1594 * that was case (1), already checked above. So we
1595 * know that head_ent->new_dir and merge_ent->new_dir
1596 * are different strings.
1597 */
1598 output(o, 1, _("CONFLICT (rename/rename): "
1599 "Rename directory %s->%s in %s. "
1600 "Rename directory %s->%s in %s"),
1601 head_ent->dir, head_ent->new_dir.buf, o->branch1,
1602 head_ent->dir, merge_ent->new_dir.buf, o->branch2);
1603 string_list_append(&remove_from_head,
1604 head_ent->dir)->util = head_ent;
1605 strbuf_release(&head_ent->new_dir);
1606 string_list_append(&remove_from_merge,
1607 merge_ent->dir)->util = merge_ent;
1608 strbuf_release(&merge_ent->new_dir);
1609 }
1610 }
1611
1612 remove_hashmap_entries(dir_re_head, &remove_from_head);
1613 remove_hashmap_entries(dir_re_merge, &remove_from_merge);
1614}
1615
7fe40b88
EN
1616static struct hashmap *get_directory_renames(struct diff_queue_struct *pairs,
1617 struct tree *tree)
1618{
1619 struct hashmap *dir_renames;
1620 struct hashmap_iter iter;
1621 struct dir_rename_entry *entry;
1622 int i;
1623
1624 /*
1625 * Typically, we think of a directory rename as all files from a
1626 * certain directory being moved to a target directory. However,
1627 * what if someone first moved two files from the original
1628 * directory in one commit, and then renamed the directory
1629 * somewhere else in a later commit? At merge time, we just know
1630 * that files from the original directory went to two different
1631 * places, and that the bulk of them ended up in the same place.
1632 * We want each directory rename to represent where the bulk of the
1633 * files from that directory end up; this function exists to find
1634 * where the bulk of the files went.
1635 *
1636 * The first loop below simply iterates through the list of file
1637 * renames, finding out how often each directory rename pair
1638 * possibility occurs.
1639 */
1640 dir_renames = xmalloc(sizeof(*dir_renames));
1641 dir_rename_init(dir_renames);
1642 for (i = 0; i < pairs->nr; ++i) {
1643 struct string_list_item *item;
1644 int *count;
1645 struct diff_filepair *pair = pairs->queue[i];
1646 char *old_dir, *new_dir;
1647
1648 /* File not part of directory rename if it wasn't renamed */
1649 if (pair->status != 'R')
1650 continue;
1651
1652 get_renamed_dir_portion(pair->one->path, pair->two->path,
1653 &old_dir, &new_dir);
1654 if (!old_dir)
1655 /* Directory didn't change at all; ignore this one. */
1656 continue;
1657
1658 entry = dir_rename_find_entry(dir_renames, old_dir);
1659 if (!entry) {
1660 entry = xmalloc(sizeof(*entry));
1661 dir_rename_entry_init(entry, old_dir);
1662 hashmap_put(dir_renames, entry);
1663 } else {
1664 free(old_dir);
1665 }
1666 item = string_list_lookup(&entry->possible_new_dirs, new_dir);
1667 if (!item) {
1668 item = string_list_insert(&entry->possible_new_dirs,
1669 new_dir);
1670 item->util = xcalloc(1, sizeof(int));
1671 } else {
1672 free(new_dir);
1673 }
1674 count = item->util;
1675 *count += 1;
1676 }
1677
1678 /*
1679 * For each directory with files moved out of it, we find out which
1680 * target directory received the most files so we can declare it to
1681 * be the "winning" target location for the directory rename. This
1682 * winner gets recorded in new_dir. If there is no winner
1683 * (multiple target directories received the same number of files),
1684 * we set non_unique_new_dir. Once we've determined the winner (or
1685 * that there is no winner), we no longer need possible_new_dirs.
1686 */
1687 hashmap_iter_init(dir_renames, &iter);
1688 while ((entry = hashmap_iter_next(&iter))) {
1689 int max = 0;
1690 int bad_max = 0;
1691 char *best = NULL;
1692
1693 for (i = 0; i < entry->possible_new_dirs.nr; i++) {
1694 int *count = entry->possible_new_dirs.items[i].util;
1695
1696 if (*count == max)
1697 bad_max = max;
1698 else if (*count > max) {
1699 max = *count;
1700 best = entry->possible_new_dirs.items[i].string;
1701 }
1702 }
1703 if (bad_max == max)
1704 entry->non_unique_new_dir = 1;
1705 else {
1706 assert(entry->new_dir.len == 0);
1707 strbuf_addstr(&entry->new_dir, best);
1708 }
1709 /*
1710 * The relevant directory sub-portion of the original full
1711 * filepaths were xstrndup'ed before inserting into
1712 * possible_new_dirs, and instead of manually iterating the
1713 * list and free'ing each, just lie and tell
1714 * possible_new_dirs that it did the strdup'ing so that it
1715 * will free them for us.
1716 */
1717 entry->possible_new_dirs.strdup_strings = 1;
1718 string_list_clear(&entry->possible_new_dirs, 1);
1719 }
1720
1721 return dir_renames;
1722}
1723
e95ab70a
EN
1724static struct dir_rename_entry *check_dir_renamed(const char *path,
1725 struct hashmap *dir_renames)
1726{
1727 char temp[PATH_MAX];
1728 char *end;
1729 struct dir_rename_entry *entry;
1730
1731 strcpy(temp, path);
1732 while ((end = strrchr(temp, '/'))) {
1733 *end = '\0';
1734 entry = dir_rename_find_entry(dir_renames, temp);
1735 if (entry)
1736 return entry;
1737 }
1738 return NULL;
1739}
1740
1741static void compute_collisions(struct hashmap *collisions,
1742 struct hashmap *dir_renames,
1743 struct diff_queue_struct *pairs)
1744{
1745 int i;
1746
1747 /*
1748 * Multiple files can be mapped to the same path due to directory
1749 * renames done by the other side of history. Since that other
1750 * side of history could have merged multiple directories into one,
1751 * if our side of history added the same file basename to each of
1752 * those directories, then all N of them would get implicitly
1753 * renamed by the directory rename detection into the same path,
1754 * and we'd get an add/add/.../add conflict, and all those adds
1755 * from *this* side of history. This is not representable in the
1756 * index, and users aren't going to easily be able to make sense of
1757 * it. So we need to provide a good warning about what's
1758 * happening, and fall back to no-directory-rename detection
1759 * behavior for those paths.
1760 *
1761 * See testcases 9e and all of section 5 from t6043 for examples.
1762 */
1763 collision_init(collisions);
1764
1765 for (i = 0; i < pairs->nr; ++i) {
1766 struct dir_rename_entry *dir_rename_ent;
1767 struct collision_entry *collision_ent;
1768 char *new_path;
1769 struct diff_filepair *pair = pairs->queue[i];
1770
1771 if (pair->status == 'D')
1772 continue;
1773 dir_rename_ent = check_dir_renamed(pair->two->path,
1774 dir_renames);
1775 if (!dir_rename_ent)
1776 continue;
1777
1778 new_path = apply_dir_rename(dir_rename_ent, pair->two->path);
1779 if (!new_path)
1780 /*
1781 * dir_rename_ent->non_unique_new_path is true, which
1782 * means there is no directory rename for us to use,
1783 * which means it won't cause us any additional
1784 * collisions.
1785 */
1786 continue;
1787 collision_ent = collision_find_entry(collisions, new_path);
1788 if (!collision_ent) {
1789 collision_ent = xcalloc(1,
1790 sizeof(struct collision_entry));
1791 hashmap_entry_init(collision_ent, strhash(new_path));
1792 hashmap_put(collisions, collision_ent);
1793 collision_ent->target_file = new_path;
1794 } else {
1795 free(new_path);
1796 }
1797 string_list_insert(&collision_ent->source_files,
1798 pair->two->path);
1799 }
1800}
1801
e5257b2a
EN
1802/*
1803 * Get information of all renames which occurred in 'pairs', making use of
1804 * any implicit directory renames inferred from the other side of history.
1805 * We need the three trees in the merge ('o_tree', 'a_tree' and 'b_tree')
1806 * to be able to associate the correct cache entries with the rename
1807 * information; tree is always equal to either a_tree or b_tree.
1808 */
1809static struct string_list *get_renames(struct merge_options *o,
1810 struct diff_queue_struct *pairs,
e95ab70a 1811 struct hashmap *dir_renames,
e5257b2a
EN
1812 struct tree *tree,
1813 struct tree *o_tree,
1814 struct tree *a_tree,
1815 struct tree *b_tree,
1816 struct string_list *entries)
1817{
1818 int i;
e95ab70a
EN
1819 struct hashmap collisions;
1820 struct hashmap_iter iter;
1821 struct collision_entry *e;
e5257b2a
EN
1822 struct string_list *renames;
1823
e95ab70a 1824 compute_collisions(&collisions, dir_renames, pairs);
e5257b2a
EN
1825 renames = xcalloc(1, sizeof(struct string_list));
1826
1827 for (i = 0; i < pairs->nr; ++i) {
9ba91557
EN
1828 struct string_list_item *item;
1829 struct rename *re;
e5257b2a 1830 struct diff_filepair *pair = pairs->queue[i];
9ba91557
EN
1831
1832 if (pair->status != 'R') {
1833 diff_free_filepair(pair);
1834 continue;
1835 }
1836 re = xmalloc(sizeof(*re));
1837 re->processed = 0;
1838 re->pair = pair;
1839 item = string_list_lookup(entries, re->pair->one->path);
1840 if (!item)
1841 re->src_entry = insert_stage_data(re->pair->one->path,
1842 o_tree, a_tree, b_tree, entries);
1843 else
1844 re->src_entry = item->util;
1845
1846 item = string_list_lookup(entries, re->pair->two->path);
1847 if (!item)
1848 re->dst_entry = insert_stage_data(re->pair->two->path,
1849 o_tree, a_tree, b_tree, entries);
1850 else
1851 re->dst_entry = item->util;
1852 item = string_list_insert(renames, pair->one->path);
1853 item->util = re;
1854 }
e95ab70a
EN
1855
1856 hashmap_iter_init(&collisions, &iter);
1857 while ((e = hashmap_iter_next(&iter))) {
1858 free(e->target_file);
1859 string_list_clear(&e->source_files, 0);
1860 }
1861 hashmap_free(&collisions, 1);
9ba91557
EN
1862 return renames;
1863}
1864
8a2fce18
MV
1865static int process_renames(struct merge_options *o,
1866 struct string_list *a_renames,
1867 struct string_list *b_renames)
9047ebbc
MV
1868{
1869 int clean_merge = 1, i, j;
183113a5
TF
1870 struct string_list a_by_dst = STRING_LIST_INIT_NODUP;
1871 struct string_list b_by_dst = STRING_LIST_INIT_NODUP;
9047ebbc
MV
1872 const struct rename *sre;
1873
1874 for (i = 0; i < a_renames->nr; i++) {
1875 sre = a_renames->items[i].util;
78a395d3 1876 string_list_insert(&a_by_dst, sre->pair->two->path)->util
0a6b8712 1877 = (void *)sre;
9047ebbc
MV
1878 }
1879 for (i = 0; i < b_renames->nr; i++) {
1880 sre = b_renames->items[i].util;
78a395d3 1881 string_list_insert(&b_by_dst, sre->pair->two->path)->util
0a6b8712 1882 = (void *)sre;
9047ebbc
MV
1883 }
1884
1885 for (i = 0, j = 0; i < a_renames->nr || j < b_renames->nr;) {
8e24cbae 1886 struct string_list *renames1, *renames2Dst;
9047ebbc
MV
1887 struct rename *ren1 = NULL, *ren2 = NULL;
1888 const char *branch1, *branch2;
1889 const char *ren1_src, *ren1_dst;
461f5041 1890 struct string_list_item *lookup;
9047ebbc
MV
1891
1892 if (i >= a_renames->nr) {
9047ebbc
MV
1893 ren2 = b_renames->items[j++].util;
1894 } else if (j >= b_renames->nr) {
9047ebbc
MV
1895 ren1 = a_renames->items[i++].util;
1896 } else {
8e24cbae
BK
1897 int compare = strcmp(a_renames->items[i].string,
1898 b_renames->items[j].string);
9047ebbc
MV
1899 if (compare <= 0)
1900 ren1 = a_renames->items[i++].util;
1901 if (compare >= 0)
1902 ren2 = b_renames->items[j++].util;
1903 }
1904
1905 /* TODO: refactor, so that 1/2 are not needed */
1906 if (ren1) {
1907 renames1 = a_renames;
9047ebbc 1908 renames2Dst = &b_by_dst;
8a2fce18
MV
1909 branch1 = o->branch1;
1910 branch2 = o->branch2;
9047ebbc 1911 } else {
9047ebbc 1912 renames1 = b_renames;
9047ebbc 1913 renames2Dst = &a_by_dst;
8a2fce18
MV
1914 branch1 = o->branch2;
1915 branch2 = o->branch1;
35d803bc 1916 SWAP(ren2, ren1);
9047ebbc 1917 }
9047ebbc 1918
9047ebbc
MV
1919 if (ren1->processed)
1920 continue;
1921 ren1->processed = 1;
9047ebbc 1922 ren1->dst_entry->processed = 1;
7769a75e
EN
1923 /* BUG: We should only mark src_entry as processed if we
1924 * are not dealing with a rename + add-source case.
1925 */
9047ebbc 1926 ren1->src_entry->processed = 1;
9047ebbc
MV
1927
1928 ren1_src = ren1->pair->one->path;
1929 ren1_dst = ren1->pair->two->path;
1930
1931 if (ren2) {
461f5041 1932 /* One file renamed on both sides */
9047ebbc
MV
1933 const char *ren2_src = ren2->pair->one->path;
1934 const char *ren2_dst = ren2->pair->two->path;
4f66dade 1935 enum rename_type rename_type;
9047ebbc 1936 if (strcmp(ren1_src, ren2_src) != 0)
ef1177d1 1937 die("BUG: ren1_src != ren2_src");
9047ebbc
MV
1938 ren2->dst_entry->processed = 1;
1939 ren2->processed = 1;
1940 if (strcmp(ren1_dst, ren2_dst) != 0) {
4f66dade 1941 rename_type = RENAME_ONE_FILE_TO_TWO;
461f5041 1942 clean_merge = 0;
9047ebbc 1943 } else {
4f66dade 1944 rename_type = RENAME_ONE_FILE_TO_ONE;
7769a75e
EN
1945 /* BUG: We should only remove ren1_src in
1946 * the base stage (think of rename +
1947 * add-source cases).
1948 */
b7fa51da 1949 remove_file(o, 1, ren1_src, 1);
b8ddf164
EN
1950 update_entry(ren1->dst_entry,
1951 ren1->pair->one,
1952 ren1->pair->two,
1953 ren2->pair->two);
9047ebbc 1954 }
4f66dade
EN
1955 setup_rename_conflict_info(rename_type,
1956 ren1->pair,
1957 ren2->pair,
1958 branch1,
1959 branch2,
1960 ren1->dst_entry,
232c635f
EN
1961 ren2->dst_entry,
1962 o,
1963 NULL,
1964 NULL);
461f5041
EN
1965 } else if ((lookup = string_list_lookup(renames2Dst, ren1_dst))) {
1966 /* Two different files renamed to the same thing */
1967 char *ren2_dst;
1968 ren2 = lookup->util;
1969 ren2_dst = ren2->pair->two->path;
1970 if (strcmp(ren1_dst, ren2_dst) != 0)
ef1177d1 1971 die("BUG: ren1_dst != ren2_dst");
461f5041
EN
1972
1973 clean_merge = 0;
1974 ren2->processed = 1;
1975 /*
1976 * BUG: We should only mark src_entry as processed
1977 * if we are not dealing with a rename + add-source
1978 * case.
1979 */
1980 ren2->src_entry->processed = 1;
1981
1982 setup_rename_conflict_info(RENAME_TWO_FILES_TO_ONE,
1983 ren1->pair,
1984 ren2->pair,
1985 branch1,
1986 branch2,
1987 ren1->dst_entry,
232c635f
EN
1988 ren2->dst_entry,
1989 o,
1990 ren1->src_entry,
1991 ren2->src_entry);
1992
9047ebbc
MV
1993 } else {
1994 /* Renamed in 1, maybe changed in 2 */
9047ebbc
MV
1995 /* we only use sha1 and mode of these */
1996 struct diff_filespec src_other, dst_other;
41d70bd6 1997 int try_merge;
9047ebbc 1998
41d70bd6
EN
1999 /*
2000 * unpack_trees loads entries from common-commit
2001 * into stage 1, from head-commit into stage 2, and
2002 * from merge-commit into stage 3. We keep track
2003 * of which side corresponds to the rename.
2004 */
2005 int renamed_stage = a_renames == renames1 ? 2 : 3;
2006 int other_stage = a_renames == renames1 ? 3 : 2;
9047ebbc 2007
7769a75e
EN
2008 /* BUG: We should only remove ren1_src in the base
2009 * stage and in other_stage (think of rename +
2010 * add-source case).
2011 */
531357a4
EN
2012 remove_file(o, 1, ren1_src,
2013 renamed_stage == 2 || !was_tracked(ren1_src));
9047ebbc 2014
fd429e98 2015 oidcpy(&src_other.oid,
2016 &ren1->src_entry->stages[other_stage].oid);
41d70bd6 2017 src_other.mode = ren1->src_entry->stages[other_stage].mode;
fd429e98 2018 oidcpy(&dst_other.oid,
2019 &ren1->dst_entry->stages[other_stage].oid);
41d70bd6 2020 dst_other.mode = ren1->dst_entry->stages[other_stage].mode;
9047ebbc
MV
2021 try_merge = 0;
2022
8b026eda 2023 if (oid_eq(&src_other.oid, &null_oid)) {
4f66dade
EN
2024 setup_rename_conflict_info(RENAME_DELETE,
2025 ren1->pair,
2026 NULL,
2027 branch1,
2028 branch2,
2029 ren1->dst_entry,
232c635f
EN
2030 NULL,
2031 o,
2032 NULL,
4f66dade 2033 NULL);
d5af5105 2034 } else if ((dst_other.mode == ren1->pair->two->mode) &&
b4da9d62 2035 oid_eq(&dst_other.oid, &ren1->pair->two->oid)) {
35a74abf
EN
2036 /*
2037 * Added file on the other side identical to
2038 * the file being renamed: clean merge.
2039 * Also, there is no need to overwrite the
2040 * file already in the working copy, so call
2041 * update_file_flags() instead of
2042 * update_file().
2043 */
75456f96
JS
2044 if (update_file_flags(o,
2045 &ren1->pair->two->oid,
2046 ren1->pair->two->mode,
2047 ren1_dst,
2048 1, /* update_cache */
2049 0 /* update_wd */))
2050 clean_merge = -1;
b4da9d62 2051 } else if (!oid_eq(&dst_other.oid, &null_oid)) {
9047ebbc
MV
2052 clean_merge = 0;
2053 try_merge = 1;
55653a68
JX
2054 output(o, 1, _("CONFLICT (rename/add): Rename %s->%s in %s. "
2055 "%s added in %s"),
9047ebbc
MV
2056 ren1_src, ren1_dst, branch1,
2057 ren1_dst, branch2);
c94736a2
JH
2058 if (o->call_depth) {
2059 struct merge_file_info mfi;
3c8a51e8
JS
2060 if (merge_file_one(o, ren1_dst, &null_oid, 0,
2061 &ren1->pair->two->oid,
2062 ren1->pair->two->mode,
2063 &dst_other.oid,
2064 dst_other.mode,
75456f96
JS
2065 branch1, branch2, &mfi)) {
2066 clean_merge = -1;
2067 goto cleanup_and_return;
2068 }
55653a68 2069 output(o, 1, _("Adding merged %s"), ren1_dst);
75456f96
JS
2070 if (update_file(o, 0, &mfi.oid,
2071 mfi.mode, ren1_dst))
2072 clean_merge = -1;
2a669c34 2073 try_merge = 0;
c94736a2 2074 } else {
3d6b8e88 2075 char *new_path = unique_path(o, ren1_dst, branch2);
55653a68 2076 output(o, 1, _("Adding as %s instead"), new_path);
75456f96
JS
2077 if (update_file(o, 0, &dst_other.oid,
2078 dst_other.mode, new_path))
2079 clean_merge = -1;
3d6b8e88 2080 free(new_path);
c94736a2 2081 }
9047ebbc
MV
2082 } else
2083 try_merge = 1;
2084
75456f96
JS
2085 if (clean_merge < 0)
2086 goto cleanup_and_return;
9047ebbc 2087 if (try_merge) {
8a2fce18 2088 struct diff_filespec *one, *a, *b;
9047ebbc
MV
2089 src_other.path = (char *)ren1_src;
2090
8a2fce18 2091 one = ren1->pair->one;
9047ebbc
MV
2092 if (a_renames == renames1) {
2093 a = ren1->pair->two;
2094 b = &src_other;
2095 } else {
2096 b = ren1->pair->two;
2097 a = &src_other;
2098 }
b8ddf164 2099 update_entry(ren1->dst_entry, one, a, b);
4f66dade
EN
2100 setup_rename_conflict_info(RENAME_NORMAL,
2101 ren1->pair,
2102 NULL,
2103 branch1,
2104 NULL,
2105 ren1->dst_entry,
232c635f
EN
2106 NULL,
2107 o,
2108 NULL,
4f66dade 2109 NULL);
9047ebbc
MV
2110 }
2111 }
2112 }
75456f96 2113cleanup_and_return:
9047ebbc
MV
2114 string_list_clear(&a_by_dst, 0);
2115 string_list_clear(&b_by_dst, 0);
2116
2117 return clean_merge;
2118}
2119
f172589e
EN
2120struct rename_info {
2121 struct string_list *head_renames;
2122 struct string_list *merge_renames;
2123};
2124
7fe40b88
EN
2125static void initial_cleanup_rename(struct diff_queue_struct *pairs,
2126 struct hashmap *dir_renames)
ffc16c49 2127{
7fe40b88
EN
2128 struct hashmap_iter iter;
2129 struct dir_rename_entry *e;
2130
2131 hashmap_iter_init(dir_renames, &iter);
2132 while ((e = hashmap_iter_next(&iter))) {
2133 free(e->dir);
2134 strbuf_release(&e->new_dir);
2135 /* possible_new_dirs already cleared in get_directory_renames */
2136 }
2137 hashmap_free(dir_renames, 1);
2138 free(dir_renames);
2139
ffc16c49
EN
2140 free(pairs->queue);
2141 free(pairs);
2142}
2143
f172589e
EN
2144static int handle_renames(struct merge_options *o,
2145 struct tree *common,
2146 struct tree *head,
2147 struct tree *merge,
2148 struct string_list *entries,
2149 struct rename_info *ri)
2150{
e5257b2a 2151 struct diff_queue_struct *head_pairs, *merge_pairs;
7fe40b88 2152 struct hashmap *dir_re_head, *dir_re_merge;
e5257b2a
EN
2153 int clean;
2154
3992ff0c
EN
2155 ri->head_renames = NULL;
2156 ri->merge_renames = NULL;
2157
2158 if (!o->detect_rename)
2159 return 1;
2160
e5257b2a
EN
2161 head_pairs = get_diffpairs(o, common, head);
2162 merge_pairs = get_diffpairs(o, common, merge);
2163
7fe40b88
EN
2164 dir_re_head = get_directory_renames(head_pairs, head);
2165 dir_re_merge = get_directory_renames(merge_pairs, merge);
2166
96e7ffbd
EN
2167 handle_directory_level_conflicts(o,
2168 dir_re_head, head,
2169 dir_re_merge, merge);
2170
e95ab70a
EN
2171 ri->head_renames = get_renames(o, head_pairs,
2172 dir_re_merge, head,
2173 common, head, merge, entries);
2174 ri->merge_renames = get_renames(o, merge_pairs,
2175 dir_re_head, merge,
e5257b2a
EN
2176 common, head, merge, entries);
2177 clean = process_renames(o, ri->head_renames, ri->merge_renames);
2178
2179 /*
2180 * Some cleanup is deferred until cleanup_renames() because the
2181 * data structures are still needed and referenced in
2182 * process_entry(). But there are a few things we can free now.
2183 */
7fe40b88
EN
2184 initial_cleanup_rename(head_pairs, dir_re_head);
2185 initial_cleanup_rename(merge_pairs, dir_re_merge);
e5257b2a
EN
2186
2187 return clean;
f172589e
EN
2188}
2189
ffc16c49 2190static void final_cleanup_rename(struct string_list *rename)
f172589e 2191{
9cfee25a
EN
2192 const struct rename *re;
2193 int i;
f172589e 2194
3992ff0c
EN
2195 if (rename == NULL)
2196 return;
2197
9cfee25a
EN
2198 for (i = 0; i < rename->nr; i++) {
2199 re = rename->items[i].util;
2200 diff_free_filepair(re->pair);
2201 }
2202 string_list_clear(rename, 1);
2203 free(rename);
2204}
2205
ffc16c49 2206static void final_cleanup_renames(struct rename_info *re_info)
9cfee25a 2207{
ffc16c49
EN
2208 final_cleanup_rename(re_info->head_renames);
2209 final_cleanup_rename(re_info->merge_renames);
f172589e
EN
2210}
2211
b4da9d62 2212static struct object_id *stage_oid(const struct object_id *oid, unsigned mode)
9047ebbc 2213{
b4da9d62 2214 return (is_null_oid(oid) || mode == 0) ? NULL: (struct object_id *)oid;
9047ebbc
MV
2215}
2216
bc9204d4
JS
2217static int read_oid_strbuf(struct merge_options *o,
2218 const struct object_id *oid, struct strbuf *dst)
331a1838
EB
2219{
2220 void *buf;
2221 enum object_type type;
2222 unsigned long size;
b4f5aca4 2223 buf = read_object_file(oid, &type, &size);
331a1838 2224 if (!buf)
bc9204d4 2225 return err(o, _("cannot read object %s"), oid_to_hex(oid));
331a1838
EB
2226 if (type != OBJ_BLOB) {
2227 free(buf);
bc9204d4 2228 return err(o, _("object %s is not a blob"), oid_to_hex(oid));
331a1838
EB
2229 }
2230 strbuf_attach(dst, buf, size, size + 1);
2231 return 0;
2232}
2233
bc9204d4
JS
2234static int blob_unchanged(struct merge_options *opt,
2235 const struct object_id *o_oid,
72fac66b 2236 unsigned o_mode,
b4da9d62 2237 const struct object_id *a_oid,
72fac66b 2238 unsigned a_mode,
3e7589b7 2239 int renormalize, const char *path)
331a1838
EB
2240{
2241 struct strbuf o = STRBUF_INIT;
2242 struct strbuf a = STRBUF_INIT;
2243 int ret = 0; /* assume changed for safety */
2244
72fac66b
JK
2245 if (a_mode != o_mode)
2246 return 0;
b4da9d62 2247 if (oid_eq(o_oid, a_oid))
331a1838 2248 return 1;
3e7589b7 2249 if (!renormalize)
331a1838
EB
2250 return 0;
2251
b4da9d62 2252 assert(o_oid && a_oid);
bc9204d4 2253 if (read_oid_strbuf(opt, o_oid, &o) || read_oid_strbuf(opt, a_oid, &a))
331a1838
EB
2254 goto error_return;
2255 /*
2256 * Note: binary | is used so that both renormalizations are
2257 * performed. Comparison can be skipped if both files are
2258 * unchanged since their sha1s have already been compared.
2259 */
a33e0b2a
BW
2260 if (renormalize_buffer(&the_index, path, o.buf, o.len, &o) |
2261 renormalize_buffer(&the_index, path, a.buf, a.len, &a))
331a1838
EB
2262 ret = (o.len == a.len && !memcmp(o.buf, a.buf, o.len));
2263
2264error_return:
2265 strbuf_release(&o);
2266 strbuf_release(&a);
2267 return ret;
2268}
2269
75456f96 2270static int handle_modify_delete(struct merge_options *o,
5e3ce663 2271 const char *path,
b4da9d62 2272 struct object_id *o_oid, int o_mode,
2273 struct object_id *a_oid, int a_mode,
2274 struct object_id *b_oid, int b_mode)
5e3ce663 2275{
b26d87f2
MM
2276 const char *modify_branch, *delete_branch;
2277 struct object_id *changed_oid;
2278 int changed_mode;
2279
2280 if (a_oid) {
2281 modify_branch = o->branch1;
2282 delete_branch = o->branch2;
2283 changed_oid = a_oid;
2284 changed_mode = a_mode;
2285 } else {
2286 modify_branch = o->branch2;
2287 delete_branch = o->branch1;
2288 changed_oid = b_oid;
2289 changed_mode = b_mode;
2290 }
2291
75456f96 2292 return handle_change_delete(o,
b26d87f2 2293 path, NULL,
75456f96 2294 o_oid, o_mode,
b26d87f2
MM
2295 changed_oid, changed_mode,
2296 modify_branch, delete_branch,
75456f96 2297 _("modify"), _("modified"));
5e3ce663
EN
2298}
2299
0c4918d1
EN
2300static int merge_content(struct merge_options *o,
2301 const char *path,
b4da9d62 2302 struct object_id *o_oid, int o_mode,
2303 struct object_id *a_oid, int a_mode,
2304 struct object_id *b_oid, int b_mode,
4f66dade 2305 struct rename_conflict_info *rename_conflict_info)
0c4918d1 2306{
55653a68 2307 const char *reason = _("content");
5b448b85 2308 const char *path1 = NULL, *path2 = NULL;
0c4918d1
EN
2309 struct merge_file_info mfi;
2310 struct diff_filespec one, a, b;
4ab9a157 2311 unsigned df_conflict_remains = 0;
0c4918d1 2312
b4da9d62 2313 if (!o_oid) {
55653a68 2314 reason = _("add/add");
b4da9d62 2315 o_oid = (struct object_id *)&null_oid;
0c4918d1
EN
2316 }
2317 one.path = a.path = b.path = (char *)path;
b4da9d62 2318 oidcpy(&one.oid, o_oid);
0c4918d1 2319 one.mode = o_mode;
b4da9d62 2320 oidcpy(&a.oid, a_oid);
0c4918d1 2321 a.mode = a_mode;
b4da9d62 2322 oidcpy(&b.oid, b_oid);
0c4918d1
EN
2323 b.mode = b_mode;
2324
3c217c07 2325 if (rename_conflict_info) {
3c217c07
EN
2326 struct diff_filepair *pair1 = rename_conflict_info->pair1;
2327
2328 path1 = (o->branch1 == rename_conflict_info->branch1) ?
2329 pair1->two->path : pair1->one->path;
2330 /* If rename_conflict_info->pair2 != NULL, we are in
2331 * RENAME_ONE_FILE_TO_ONE case. Otherwise, we have a
2332 * normal rename.
2333 */
2334 path2 = (rename_conflict_info->pair2 ||
2335 o->branch2 == rename_conflict_info->branch1) ?
2336 pair1->two->path : pair1->one->path;
3c217c07 2337
5423d2e7
DT
2338 if (dir_in_way(path, !o->call_depth,
2339 S_ISGITLINK(pair1->two->mode)))
3c217c07 2340 df_conflict_remains = 1;
4ab9a157 2341 }
3c8a51e8
JS
2342 if (merge_file_special_markers(o, &one, &a, &b,
2343 o->branch1, path1,
2344 o->branch2, path2, &mfi))
2345 return -1;
4ab9a157
EN
2346
2347 if (mfi.clean && !df_conflict_remains &&
b4da9d62 2348 oid_eq(&mfi.oid, a_oid) && mfi.mode == a_mode) {
8b026eda 2349 int path_renamed_outside_HEAD;
55653a68 2350 output(o, 3, _("Skipped %s (merged same as existing)"), path);
5b448b85
EN
2351 /*
2352 * The content merge resulted in the same file contents we
2353 * already had. We can return early if those file contents
2354 * are recorded at the correct path (which may not be true
2355 * if the merge involves a rename).
2356 */
8b026eda
JH
2357 path_renamed_outside_HEAD = !path2 || !strcmp(path, path2);
2358 if (!path_renamed_outside_HEAD) {
bc9204d4 2359 add_cacheinfo(o, mfi.mode, &mfi.oid, path,
d45b7f40 2360 0, (!o->call_depth), 0);
5b448b85
EN
2361 return mfi.clean;
2362 }
2363 } else
55653a68 2364 output(o, 2, _("Auto-merging %s"), path);
0c4918d1
EN
2365
2366 if (!mfi.clean) {
2367 if (S_ISGITLINK(mfi.mode))
55653a68
JX
2368 reason = _("submodule");
2369 output(o, 1, _("CONFLICT (%s): Merge conflict in %s"),
0c4918d1 2370 reason, path);
4f66dade 2371 if (rename_conflict_info && !df_conflict_remains)
bc9204d4 2372 if (update_stages(o, path, &one, &a, &b))
75456f96 2373 return -1;
0c4918d1
EN
2374 }
2375
8b026eda 2376 if (df_conflict_remains) {
3d6b8e88 2377 char *new_path;
51931bf0
EN
2378 if (o->call_depth) {
2379 remove_file_from_cache(path);
2380 } else {
75456f96 2381 if (!mfi.clean) {
bc9204d4 2382 if (update_stages(o, path, &one, &a, &b))
75456f96
JS
2383 return -1;
2384 } else {
51931bf0
EN
2385 int file_from_stage2 = was_tracked(path);
2386 struct diff_filespec merged;
9b561499 2387 oidcpy(&merged.oid, &mfi.oid);
51931bf0
EN
2388 merged.mode = mfi.mode;
2389
bc9204d4 2390 if (update_stages(o, path, NULL,
75456f96
JS
2391 file_from_stage2 ? &merged : NULL,
2392 file_from_stage2 ? NULL : &merged))
2393 return -1;
51931bf0
EN
2394 }
2395
2396 }
4f66dade 2397 new_path = unique_path(o, path, rename_conflict_info->branch1);
55653a68 2398 output(o, 1, _("Adding as %s instead"), new_path);
75456f96
JS
2399 if (update_file(o, 0, &mfi.oid, mfi.mode, new_path)) {
2400 free(new_path);
2401 return -1;
2402 }
3d6b8e88 2403 free(new_path);
51931bf0 2404 mfi.clean = 0;
75456f96
JS
2405 } else if (update_file(o, mfi.clean, &mfi.oid, mfi.mode, path))
2406 return -1;
0c4918d1 2407 return mfi.clean;
0c4918d1
EN
2408}
2409
9047ebbc 2410/* Per entry merge function */
8a2fce18
MV
2411static int process_entry(struct merge_options *o,
2412 const char *path, struct stage_data *entry)
9047ebbc 2413{
9047ebbc 2414 int clean_merge = 1;
1bc0ab7c 2415 int normalize = o->renormalize;
9047ebbc
MV
2416 unsigned o_mode = entry->stages[1].mode;
2417 unsigned a_mode = entry->stages[2].mode;
2418 unsigned b_mode = entry->stages[3].mode;
b4da9d62 2419 struct object_id *o_oid = stage_oid(&entry->stages[1].oid, o_mode);
2420 struct object_id *a_oid = stage_oid(&entry->stages[2].oid, a_mode);
2421 struct object_id *b_oid = stage_oid(&entry->stages[3].oid, b_mode);
9047ebbc 2422
37348937 2423 entry->processed = 1;
4f66dade
EN
2424 if (entry->rename_conflict_info) {
2425 struct rename_conflict_info *conflict_info = entry->rename_conflict_info;
07413c5a 2426 switch (conflict_info->rename_type) {
882fd11a 2427 case RENAME_NORMAL:
4f66dade 2428 case RENAME_ONE_FILE_TO_ONE:
8b026eda
JH
2429 clean_merge = merge_content(o, path,
2430 o_oid, o_mode, a_oid, a_mode, b_oid, b_mode,
2431 conflict_info);
882fd11a 2432 break;
3b130adf
EN
2433 case RENAME_DELETE:
2434 clean_merge = 0;
75456f96
JS
2435 if (conflict_rename_delete(o,
2436 conflict_info->pair1,
2437 conflict_info->branch1,
2438 conflict_info->branch2))
2439 clean_merge = -1;
3b130adf 2440 break;
07413c5a 2441 case RENAME_ONE_FILE_TO_TWO:
07413c5a 2442 clean_merge = 0;
75456f96
JS
2443 if (conflict_rename_rename_1to2(o, conflict_info))
2444 clean_merge = -1;
07413c5a 2445 break;
461f5041
EN
2446 case RENAME_TWO_FILES_TO_ONE:
2447 clean_merge = 0;
75456f96
JS
2448 if (conflict_rename_rename_2to1(o, conflict_info))
2449 clean_merge = -1;
07413c5a
EN
2450 break;
2451 default:
2452 entry->processed = 0;
2453 break;
2454 }
b4da9d62 2455 } else if (o_oid && (!a_oid || !b_oid)) {
edd2faf5 2456 /* Case A: Deleted in one */
b4da9d62 2457 if ((!a_oid && !b_oid) ||
bc9204d4
JS
2458 (!b_oid && blob_unchanged(o, o_oid, o_mode, a_oid, a_mode, normalize, path)) ||
2459 (!a_oid && blob_unchanged(o, o_oid, o_mode, b_oid, b_mode, normalize, path))) {
edd2faf5
EN
2460 /* Deleted in both or deleted in one and
2461 * unchanged in the other */
b4da9d62 2462 if (a_oid)
55653a68 2463 output(o, 2, _("Removing %s"), path);
edd2faf5 2464 /* do not touch working file if it did not exist */
b4da9d62 2465 remove_file(o, 1, path, !a_oid);
edd2faf5
EN
2466 } else {
2467 /* Modify/delete; deleted side may have put a directory in the way */
edd2faf5 2468 clean_merge = 0;
75456f96
JS
2469 if (handle_modify_delete(o, path, o_oid, o_mode,
2470 a_oid, a_mode, b_oid, b_mode))
2471 clean_merge = -1;
3d6b8e88 2472 }
b4da9d62 2473 } else if ((!o_oid && a_oid && !b_oid) ||
2474 (!o_oid && !a_oid && b_oid)) {
edd2faf5
EN
2475 /* Case B: Added in one. */
2476 /* [nothing|directory] -> ([nothing|directory], file) */
2477
9c0bbb50
EN
2478 const char *add_branch;
2479 const char *other_branch;
2480 unsigned mode;
b4da9d62 2481 const struct object_id *oid;
9c0bbb50 2482 const char *conf;
37348937 2483
b4da9d62 2484 if (a_oid) {
9c0bbb50
EN
2485 add_branch = o->branch1;
2486 other_branch = o->branch2;
2487 mode = a_mode;
b4da9d62 2488 oid = a_oid;
55653a68 2489 conf = _("file/directory");
9c0bbb50
EN
2490 } else {
2491 add_branch = o->branch2;
2492 other_branch = o->branch1;
2493 mode = b_mode;
b4da9d62 2494 oid = b_oid;
55653a68 2495 conf = _("directory/file");
9c0bbb50 2496 }
c641ca67
EN
2497 if (dir_in_way(path,
2498 !o->call_depth && !S_ISGITLINK(a_mode),
2499 0)) {
3d6b8e88 2500 char *new_path = unique_path(o, path, add_branch);
9c0bbb50 2501 clean_merge = 0;
55653a68
JX
2502 output(o, 1, _("CONFLICT (%s): There is a directory with name %s in %s. "
2503 "Adding %s as %s"),
9c0bbb50 2504 conf, path, other_branch, path, new_path);
75456f96
JS
2505 if (update_file(o, 0, oid, mode, new_path))
2506 clean_merge = -1;
2507 else if (o->call_depth)
7b1c610f 2508 remove_file_from_cache(path);
3d6b8e88 2509 free(new_path);
9c0bbb50 2510 } else {
55653a68 2511 output(o, 2, _("Adding %s"), path);
35a74abf 2512 /* do not overwrite file if already present */
75456f96
JS
2513 if (update_file_flags(o, oid, mode, path, 1, !a_oid))
2514 clean_merge = -1;
9c0bbb50 2515 }
b4da9d62 2516 } else if (a_oid && b_oid) {
edd2faf5
EN
2517 /* Case C: Added in both (check for same permissions) and */
2518 /* case D: Modified in both, but differently. */
8b026eda 2519 clean_merge = merge_content(o, path,
b4da9d62 2520 o_oid, o_mode, a_oid, a_mode, b_oid, b_mode,
edd2faf5 2521 NULL);
b4da9d62 2522 } else if (!o_oid && !a_oid && !b_oid) {
edd2faf5
EN
2523 /*
2524 * this entry was deleted altogether. a_mode == 0 means
2525 * we had that path and want to actively remove it.
2526 */
2527 remove_file(o, 1, path, !a_mode);
2528 } else
7e97e100 2529 die("BUG: fatal merge failure, shouldn't happen.");
37348937
EN
2530
2531 return clean_merge;
2532}
2533
8a2fce18
MV
2534int merge_trees(struct merge_options *o,
2535 struct tree *head,
9047ebbc
MV
2536 struct tree *merge,
2537 struct tree *common,
9047ebbc
MV
2538 struct tree **result)
2539{
2540 int code, clean;
2541
85e51b78
JH
2542 if (o->subtree_shift) {
2543 merge = shift_tree_object(head, merge, o->subtree_shift);
2544 common = shift_tree_object(head, common, o->subtree_shift);
9047ebbc
MV
2545 }
2546
b4da9d62 2547 if (oid_eq(&common->object.oid, &merge->object.oid)) {
65170c07
EN
2548 struct strbuf sb = STRBUF_INIT;
2549
f309e8e7 2550 if (!o->call_depth && index_has_changes(&sb)) {
65170c07
EN
2551 err(o, _("Dirty index: cannot merge (dirty: %s)"),
2552 sb.buf);
2553 return 0;
2554 }
7560f547 2555 output(o, 0, _("Already up to date!"));
9047ebbc
MV
2556 *result = head;
2557 return 1;
2558 }
2559
8b026eda 2560 code = git_merge_trees(o->call_depth, common, head, merge);
9047ebbc 2561
fadd069d
JH
2562 if (code != 0) {
2563 if (show(o, 4) || o->call_depth)
bc9204d4 2564 err(o, _("merging of trees %s and %s failed"),
f2fd0760 2565 oid_to_hex(&head->object.oid),
2566 oid_to_hex(&merge->object.oid));
6003303a 2567 return -1;
fadd069d 2568 }
9047ebbc
MV
2569
2570 if (unmerged_cache()) {
f172589e
EN
2571 struct string_list *entries;
2572 struct rename_info re_info;
9047ebbc 2573 int i;
fc65b00d
KW
2574 /*
2575 * Only need the hashmap while processing entries, so
2576 * initialize it here and free it when we are done running
2577 * through the entries. Keeping it in the merge_options as
2578 * opposed to decaring a local hashmap is for convenience
2579 * so that we don't have to pass it to around.
2580 */
2581 hashmap_init(&o->current_file_dir_set, path_hashmap_cmp, NULL, 512);
696ee23c
MV
2582 get_files_dirs(o, head);
2583 get_files_dirs(o, merge);
9047ebbc
MV
2584
2585 entries = get_unmerged();
f172589e
EN
2586 clean = handle_renames(o, common, head, merge, entries,
2587 &re_info);
6c8647da 2588 record_df_conflict_files(o, entries);
75456f96 2589 if (clean < 0)
e336bdc5 2590 goto cleanup;
edd2faf5 2591 for (i = entries->nr-1; 0 <= i; i--) {
9047ebbc
MV
2592 const char *path = entries->items[i].string;
2593 struct stage_data *e = entries->items[i].util;
75456f96
JS
2594 if (!e->processed) {
2595 int ret = process_entry(o, path, e);
2596 if (!ret)
2597 clean = 0;
e336bdc5
KW
2598 else if (ret < 0) {
2599 clean = ret;
2600 goto cleanup;
2601 }
75456f96 2602 }
9047ebbc 2603 }
7edba4c4
JH
2604 for (i = 0; i < entries->nr; i++) {
2605 struct stage_data *e = entries->items[i].util;
2606 if (!e->processed)
7e97e100 2607 die("BUG: unprocessed path??? %s",
7edba4c4
JH
2608 entries->items[i].string);
2609 }
9047ebbc 2610
e336bdc5 2611cleanup:
ffc16c49 2612 final_cleanup_renames(&re_info);
f172589e 2613
9047ebbc 2614 string_list_clear(entries, 1);
f172589e 2615 free(entries);
9047ebbc 2616
fc65b00d
KW
2617 hashmap_free(&o->current_file_dir_set, 1);
2618
e336bdc5
KW
2619 if (clean < 0)
2620 return clean;
9047ebbc
MV
2621 }
2622 else
2623 clean = 1;
2624
fbc87eb5
JS
2625 if (o->call_depth && !(*result = write_tree_from_memory(o)))
2626 return -1;
9047ebbc
MV
2627
2628 return clean;
2629}
2630
2631static struct commit_list *reverse_commit_list(struct commit_list *list)
2632{
2633 struct commit_list *next = NULL, *current, *backup;
2634 for (current = list; current; current = backup) {
2635 backup = current->next;
2636 current->next = next;
2637 next = current;
2638 }
2639 return next;
2640}
2641
2642/*
2643 * Merge the commits h1 and h2, return the resulting virtual
2644 * commit object and a flag indicating the cleanness of the merge.
2645 */
8a2fce18
MV
2646int merge_recursive(struct merge_options *o,
2647 struct commit *h1,
9047ebbc 2648 struct commit *h2,
9047ebbc
MV
2649 struct commit_list *ca,
2650 struct commit **result)
2651{
2652 struct commit_list *iter;
2653 struct commit *merged_common_ancestors;
156e1782 2654 struct tree *mrtree;
9047ebbc
MV
2655 int clean;
2656
8a2fce18 2657 if (show(o, 4)) {
55653a68 2658 output(o, 4, _("Merging:"));
5033639c
MV
2659 output_commit_title(o, h1);
2660 output_commit_title(o, h2);
9047ebbc
MV
2661 }
2662
2663 if (!ca) {
2ce406cc 2664 ca = get_merge_bases(h1, h2);
9047ebbc
MV
2665 ca = reverse_commit_list(ca);
2666 }
2667
8a2fce18 2668 if (show(o, 5)) {
e0453cd8
RT
2669 unsigned cnt = commit_list_count(ca);
2670
2671 output(o, 5, Q_("found %u common ancestor:",
2672 "found %u common ancestors:", cnt), cnt);
9047ebbc 2673 for (iter = ca; iter; iter = iter->next)
5033639c 2674 output_commit_title(o, iter->item);
9047ebbc
MV
2675 }
2676
2677 merged_common_ancestors = pop_commit(&ca);
2678 if (merged_common_ancestors == NULL) {
03f622c8
JN
2679 /* if there is no common ancestor, use an empty tree */
2680 struct tree *tree;
9047ebbc 2681
eb0ccfd7 2682 tree = lookup_tree(the_hash_algo->empty_tree);
9047ebbc
MV
2683 merged_common_ancestors = make_virtual_commit(tree, "ancestor");
2684 }
2685
2686 for (iter = ca; iter; iter = iter->next) {
8a2fce18 2687 const char *saved_b1, *saved_b2;
5033639c 2688 o->call_depth++;
9047ebbc
MV
2689 /*
2690 * When the merge fails, the result contains files
2691 * with conflict markers. The cleanness flag is
de8946de
JS
2692 * ignored (unless indicating an error), it was never
2693 * actually used, as result of merge_trees has always
2694 * overwritten it: the committed "conflicts" were
2695 * already resolved.
9047ebbc
MV
2696 */
2697 discard_cache();
8a2fce18
MV
2698 saved_b1 = o->branch1;
2699 saved_b2 = o->branch2;
2700 o->branch1 = "Temporary merge branch 1";
2701 o->branch2 = "Temporary merge branch 2";
de8946de
JS
2702 if (merge_recursive(o, merged_common_ancestors, iter->item,
2703 NULL, &merged_common_ancestors) < 0)
2704 return -1;
8a2fce18
MV
2705 o->branch1 = saved_b1;
2706 o->branch2 = saved_b2;
5033639c 2707 o->call_depth--;
9047ebbc
MV
2708
2709 if (!merged_common_ancestors)
bc9204d4 2710 return err(o, _("merge returned no commit"));
9047ebbc
MV
2711 }
2712
2713 discard_cache();
b7fa51da 2714 if (!o->call_depth)
9047ebbc 2715 read_cache();
9047ebbc 2716
7ca56aa0 2717 o->ancestor = "merged common ancestors";
8a2fce18
MV
2718 clean = merge_trees(o, h1->tree, h2->tree, merged_common_ancestors->tree,
2719 &mrtree);
6999bc70
JS
2720 if (clean < 0) {
2721 flush_output(o);
de8946de 2722 return clean;
6999bc70 2723 }
9047ebbc 2724
b7fa51da 2725 if (o->call_depth) {
9047ebbc
MV
2726 *result = make_virtual_commit(mrtree, "merged tree");
2727 commit_list_insert(h1, &(*result)->parents);
2728 commit_list_insert(h2, &(*result)->parents->next);
2729 }
c7d84924 2730 flush_output(o);
548009c0
JS
2731 if (!o->call_depth && o->buffer_output < 2)
2732 strbuf_release(&o->obuf);
f31027c9
JH
2733 if (show(o, 2))
2734 diff_warn_rename_limit("merge.renamelimit",
2735 o->needed_rename_limit, 0);
9047ebbc
MV
2736 return clean;
2737}
2738
4e8161a8 2739static struct commit *get_ref(const struct object_id *oid, const char *name)
73118f89
SB
2740{
2741 struct object *object;
2742
c251c83d 2743 object = deref_tag(parse_object(oid), name, strlen(name));
73118f89
SB
2744 if (!object)
2745 return NULL;
2746 if (object->type == OBJ_TREE)
2747 return make_virtual_commit((struct tree*)object, name);
2748 if (object->type != OBJ_COMMIT)
2749 return NULL;
2750 if (parse_commit((struct commit *)object))
2751 return NULL;
2752 return (struct commit *)object;
2753}
2754
8a2fce18 2755int merge_recursive_generic(struct merge_options *o,
4e8161a8 2756 const struct object_id *head,
2757 const struct object_id *merge,
8a2fce18 2758 int num_base_list,
4e8161a8 2759 const struct object_id **base_list,
8a2fce18 2760 struct commit **result)
73118f89 2761{
03b86647 2762 int clean;
837e34eb 2763 struct lock_file lock = LOCK_INIT;
8a2fce18
MV
2764 struct commit *head_commit = get_ref(head, o->branch1);
2765 struct commit *next_commit = get_ref(merge, o->branch2);
73118f89
SB
2766 struct commit_list *ca = NULL;
2767
2768 if (base_list) {
2769 int i;
8a2fce18 2770 for (i = 0; i < num_base_list; ++i) {
73118f89 2771 struct commit *base;
4e8161a8 2772 if (!(base = get_ref(base_list[i], oid_to_hex(base_list[i]))))
bc9204d4 2773 return err(o, _("Could not parse object '%s'"),
4e8161a8 2774 oid_to_hex(base_list[i]));
73118f89
SB
2775 commit_list_insert(base, &ca);
2776 }
2777 }
2778
837e34eb 2779 hold_locked_index(&lock, LOCK_DIE_ON_ERROR);
8a2fce18
MV
2780 clean = merge_recursive(o, head_commit, next_commit, ca,
2781 result);
51d3f43d
2782 if (clean < 0) {
2783 rollback_lock_file(&lock);
de8946de 2784 return clean;
51d3f43d 2785 }
de8946de 2786
61000814
2787 if (write_locked_index(&the_index, &lock,
2788 COMMIT_LOCK | SKIP_IF_UNCHANGED))
bc9204d4 2789 return err(o, _("Unable to write index."));
73118f89
SB
2790
2791 return clean ? 0 : 1;
2792}
2793
0e7bcb1b 2794static void merge_recursive_config(struct merge_options *o)
9047ebbc 2795{
0e7bcb1b
TA
2796 git_config_get_int("merge.verbosity", &o->verbosity);
2797 git_config_get_int("diff.renamelimit", &o->diff_rename_limit);
2798 git_config_get_int("merge.renamelimit", &o->merge_rename_limit);
2799 git_config(git_xmerge_config, NULL);
9047ebbc
MV
2800}
2801
8a2fce18 2802void init_merge_options(struct merge_options *o)
9047ebbc 2803{
80486220 2804 const char *merge_verbosity;
8a2fce18
MV
2805 memset(o, 0, sizeof(struct merge_options));
2806 o->verbosity = 2;
2807 o->buffer_output = 1;
2808 o->diff_rename_limit = -1;
2809 o->merge_rename_limit = -1;
7610fa57 2810 o->renormalize = 0;
d2b11eca 2811 o->detect_rename = 1;
0e7bcb1b 2812 merge_recursive_config(o);
80486220
AO
2813 merge_verbosity = getenv("GIT_MERGE_VERBOSITY");
2814 if (merge_verbosity)
2815 o->verbosity = strtol(merge_verbosity, NULL, 10);
8a2fce18
MV
2816 if (o->verbosity >= 5)
2817 o->buffer_output = 0;
c7d84924 2818 strbuf_init(&o->obuf, 0);
f93d7c6f 2819 string_list_init(&o->df_conflict_file_set, 1);
9047ebbc 2820}
635a7bb1
JN
2821
2822int parse_merge_opt(struct merge_options *o, const char *s)
2823{
95b567c7
JK
2824 const char *arg;
2825
635a7bb1
JN
2826 if (!s || !*s)
2827 return -1;
2828 if (!strcmp(s, "ours"))
2829 o->recursive_variant = MERGE_RECURSIVE_OURS;
2830 else if (!strcmp(s, "theirs"))
2831 o->recursive_variant = MERGE_RECURSIVE_THEIRS;
2832 else if (!strcmp(s, "subtree"))
2833 o->subtree_shift = "";
95b567c7
JK
2834 else if (skip_prefix(s, "subtree=", &arg))
2835 o->subtree_shift = arg;
58a1ece4 2836 else if (!strcmp(s, "patience"))
307ab20b 2837 o->xdl_opts = DIFF_WITH_ALG(o, PATIENCE_DIFF);
8c912eea 2838 else if (!strcmp(s, "histogram"))
307ab20b 2839 o->xdl_opts = DIFF_WITH_ALG(o, HISTOGRAM_DIFF);
95b567c7
JK
2840 else if (skip_prefix(s, "diff-algorithm=", &arg)) {
2841 long value = parse_algorithm_value(arg);
07924d4d
MP
2842 if (value < 0)
2843 return -1;
2844 /* clear out previous settings */
2845 DIFF_XDL_CLR(o, NEED_MINIMAL);
2846 o->xdl_opts &= ~XDF_DIFF_ALGORITHM_MASK;
2847 o->xdl_opts |= value;
2848 }
4e5dd044 2849 else if (!strcmp(s, "ignore-space-change"))
c2d4b4cd 2850 DIFF_XDL_SET(o, IGNORE_WHITESPACE_CHANGE);
4e5dd044 2851 else if (!strcmp(s, "ignore-all-space"))
c2d4b4cd 2852 DIFF_XDL_SET(o, IGNORE_WHITESPACE);
4e5dd044 2853 else if (!strcmp(s, "ignore-space-at-eol"))
c2d4b4cd 2854 DIFF_XDL_SET(o, IGNORE_WHITESPACE_AT_EOL);
e9282f02
JH
2855 else if (!strcmp(s, "ignore-cr-at-eol"))
2856 DIFF_XDL_SET(o, IGNORE_CR_AT_EOL);
635a7bb1
JN
2857 else if (!strcmp(s, "renormalize"))
2858 o->renormalize = 1;
2859 else if (!strcmp(s, "no-renormalize"))
2860 o->renormalize = 0;
d2b11eca
FGA
2861 else if (!strcmp(s, "no-renames"))
2862 o->detect_rename = 0;
87892f60 2863 else if (!strcmp(s, "find-renames")) {
1b47ad16 2864 o->detect_rename = 1;
87892f60
FGA
2865 o->rename_score = 0;
2866 }
1b47ad16
FGA
2867 else if (skip_prefix(s, "find-renames=", &arg) ||
2868 skip_prefix(s, "rename-threshold=", &arg)) {
95b567c7 2869 if ((o->rename_score = parse_rename_score(&arg)) == -1 || *arg != 0)
10ae7526 2870 return -1;
d2b11eca 2871 o->detect_rename = 1;
10ae7526 2872 }
635a7bb1
JN
2873 else
2874 return -1;
2875 return 0;
2876}