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