Git 2.10.2
[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"
1c4b6604 7#include "advice.h"
697cc8ef 8#include "lockfile.h"
9047ebbc
MV
9#include "cache-tree.h"
10#include "commit.h"
11#include "blob.h"
12#include "builtin.h"
13#include "tree-walk.h"
14#include "diff.h"
15#include "diffcore.h"
16#include "tag.h"
17#include "unpack-trees.h"
18#include "string-list.h"
19#include "xdiff-interface.h"
20#include "ll-merge.h"
9047ebbc
MV
21#include "attr.h"
22#include "merge-recursive.h"
9800c0df 23#include "dir.h"
68d03e4a 24#include "submodule.h"
9047ebbc 25
bc9204d4
JS
26static void flush_output(struct merge_options *o)
27{
f1e2426b 28 if (o->buffer_output < 2 && o->obuf.len) {
bc9204d4
JS
29 fputs(o->obuf.buf, stdout);
30 strbuf_reset(&o->obuf);
31 }
32}
33
34static int err(struct merge_options *o, const char *err, ...)
35{
36 va_list params;
37
f1e2426b
JS
38 if (o->buffer_output < 2)
39 flush_output(o);
40 else {
41 strbuf_complete(&o->obuf, '\n');
42 strbuf_addstr(&o->obuf, "error: ");
43 }
bc9204d4
JS
44 va_start(params, err);
45 strbuf_vaddf(&o->obuf, err, params);
46 va_end(params);
f1e2426b
JS
47 if (o->buffer_output > 1)
48 strbuf_addch(&o->obuf, '\n');
49 else {
50 error("%s", o->obuf.buf);
51 strbuf_reset(&o->obuf);
52 }
bc9204d4
JS
53
54 return -1;
55}
56
85e51b78
JH
57static struct tree *shift_tree_object(struct tree *one, struct tree *two,
58 const char *subtree_shift)
9047ebbc 59{
f2fd0760 60 struct object_id shifted;
9047ebbc 61
85e51b78 62 if (!*subtree_shift) {
82db3d44 63 shift_tree(&one->object.oid, &two->object.oid, &shifted, 0);
85e51b78 64 } else {
82db3d44 65 shift_tree_by(&one->object.oid, &two->object.oid, &shifted,
85e51b78
JH
66 subtree_shift);
67 }
f2fd0760 68 if (!oidcmp(&two->object.oid, &shifted))
9047ebbc 69 return two;
f2fd0760 70 return lookup_tree(shifted.hash);
9047ebbc
MV
71}
72
2af202be 73static struct commit *make_virtual_commit(struct tree *tree, const char *comment)
9047ebbc 74{
10322a0a 75 struct commit *commit = alloc_commit_node();
ae8e4c9c 76
a2571653 77 set_merge_remote_desc(commit, comment, (struct object *)commit);
9047ebbc 78 commit->tree = tree;
9047ebbc
MV
79 commit->object.parsed = 1;
80 return commit;
81}
82
83/*
84 * Since we use get_tree_entry(), which does not put the read object into
85 * the object pool, we cannot rely on a == b.
86 */
b4da9d62 87static int oid_eq(const struct object_id *a, const struct object_id *b)
9047ebbc
MV
88{
89 if (!a && !b)
90 return 2;
b4da9d62 91 return a && b && oidcmp(a, b) == 0;
9047ebbc
MV
92}
93
25c39363
EN
94enum rename_type {
95 RENAME_NORMAL = 0,
96 RENAME_DELETE,
4f66dade 97 RENAME_ONE_FILE_TO_ONE,
461f5041
EN
98 RENAME_ONE_FILE_TO_TWO,
99 RENAME_TWO_FILES_TO_ONE
25c39363
EN
100};
101
4f66dade 102struct rename_conflict_info {
25c39363
EN
103 enum rename_type rename_type;
104 struct diff_filepair *pair1;
105 struct diff_filepair *pair2;
106 const char *branch1;
107 const char *branch2;
108 struct stage_data *dst_entry1;
109 struct stage_data *dst_entry2;
232c635f
EN
110 struct diff_filespec ren1_other;
111 struct diff_filespec ren2_other;
25c39363
EN
112};
113
9047ebbc
MV
114/*
115 * Since we want to write the index eventually, we cannot reuse the index
116 * for these (temporary) data.
117 */
9cba13ca
JN
118struct stage_data {
119 struct {
9047ebbc 120 unsigned mode;
fd429e98 121 struct object_id oid;
9047ebbc 122 } stages[4];
4f66dade 123 struct rename_conflict_info *rename_conflict_info;
9047ebbc
MV
124 unsigned processed:1;
125};
126
4f66dade
EN
127static inline void setup_rename_conflict_info(enum rename_type rename_type,
128 struct diff_filepair *pair1,
129 struct diff_filepair *pair2,
130 const char *branch1,
131 const char *branch2,
132 struct stage_data *dst_entry1,
232c635f
EN
133 struct stage_data *dst_entry2,
134 struct merge_options *o,
135 struct stage_data *src_entry1,
136 struct stage_data *src_entry2)
25c39363 137{
4f66dade 138 struct rename_conflict_info *ci = xcalloc(1, sizeof(struct rename_conflict_info));
25c39363
EN
139 ci->rename_type = rename_type;
140 ci->pair1 = pair1;
141 ci->branch1 = branch1;
142 ci->branch2 = branch2;
143
144 ci->dst_entry1 = dst_entry1;
4f66dade 145 dst_entry1->rename_conflict_info = ci;
25c39363
EN
146 dst_entry1->processed = 0;
147
148 assert(!pair2 == !dst_entry2);
149 if (dst_entry2) {
150 ci->dst_entry2 = dst_entry2;
151 ci->pair2 = pair2;
4f66dade 152 dst_entry2->rename_conflict_info = ci;
25c39363 153 }
232c635f
EN
154
155 if (rename_type == RENAME_TWO_FILES_TO_ONE) {
156 /*
157 * For each rename, there could have been
158 * modifications on the side of history where that
159 * file was not renamed.
160 */
161 int ostage1 = o->branch1 == branch1 ? 3 : 2;
162 int ostage2 = ostage1 ^ 1;
163
164 ci->ren1_other.path = pair1->one->path;
fd429e98 165 oidcpy(&ci->ren1_other.oid, &src_entry1->stages[ostage1].oid);
232c635f
EN
166 ci->ren1_other.mode = src_entry1->stages[ostage1].mode;
167
168 ci->ren2_other.path = pair2->one->path;
fd429e98 169 oidcpy(&ci->ren2_other.oid, &src_entry2->stages[ostage2].oid);
232c635f 170 ci->ren2_other.mode = src_entry2->stages[ostage2].mode;
25c39363
EN
171 }
172}
173
8a2fce18 174static int show(struct merge_options *o, int v)
9047ebbc 175{
5033639c 176 return (!o->call_depth && o->verbosity >= v) || o->verbosity >= 5;
9047ebbc
MV
177}
178
28bea9e5 179__attribute__((format (printf, 3, 4)))
8a2fce18 180static void output(struct merge_options *o, int v, const char *fmt, ...)
9047ebbc 181{
9047ebbc
MV
182 va_list ap;
183
8a2fce18 184 if (!show(o, v))
9047ebbc
MV
185 return;
186
415792ed 187 strbuf_addchars(&o->obuf, ' ', o->call_depth * 2);
9047ebbc
MV
188
189 va_start(ap, fmt);
ebeb6090 190 strbuf_vaddf(&o->obuf, fmt, ap);
9047ebbc
MV
191 va_end(ap);
192
294b2680 193 strbuf_addch(&o->obuf, '\n');
8a2fce18 194 if (!o->buffer_output)
c7d84924 195 flush_output(o);
9047ebbc
MV
196}
197
5033639c 198static void output_commit_title(struct merge_options *o, struct commit *commit)
9047ebbc 199{
dde75cb0 200 strbuf_addchars(&o->obuf, ' ', o->call_depth * 2);
9047ebbc 201 if (commit->util)
dde75cb0
JS
202 strbuf_addf(&o->obuf, "virtual %s\n",
203 merge_remote_util(commit)->name);
9047ebbc 204 else {
a94bb683
RS
205 strbuf_add_unique_abbrev(&o->obuf, commit->object.oid.hash,
206 DEFAULT_ABBREV);
207 strbuf_addch(&o->obuf, ' ');
9047ebbc 208 if (parse_commit(commit) != 0)
a22ae753 209 strbuf_addstr(&o->obuf, _("(bad commit)\n"));
9047ebbc 210 else {
49b7120e 211 const char *title;
8597ea3a 212 const char *msg = get_commit_buffer(commit, NULL);
bc6b8fc1 213 int len = find_commit_subject(msg, &title);
49b7120e 214 if (len)
dde75cb0 215 strbuf_addf(&o->obuf, "%.*s\n", len, title);
bc6b8fc1 216 unuse_commit_buffer(commit, msg);
9047ebbc
MV
217 }
218 }
dde75cb0 219 flush_output(o);
9047ebbc
MV
220}
221
bc9204d4
JS
222static int add_cacheinfo(struct merge_options *o,
223 unsigned int mode, const struct object_id *oid,
9047ebbc
MV
224 const char *path, int stage, int refresh, int options)
225{
226 struct cache_entry *ce;
1335d76e
JH
227 int ret;
228
21bed620 229 ce = make_cache_entry(mode, oid ? oid->hash : null_sha1, path, stage, 0);
9047ebbc 230 if (!ce)
bc9204d4 231 return err(o, _("addinfo_cache failed for path '%s'"), path);
1335d76e
JH
232
233 ret = add_cache_entry(ce, options);
234 if (refresh) {
235 struct cache_entry *nce;
236
237 nce = refresh_cache_entry(ce, CE_MATCH_REFRESH | CE_MATCH_IGNORE_MISSING);
238 if (nce != ce)
239 ret = add_cache_entry(nce, options);
240 }
241 return ret;
9047ebbc
MV
242}
243
9047ebbc
MV
244static void init_tree_desc_from_tree(struct tree_desc *desc, struct tree *tree)
245{
246 parse_tree(tree);
247 init_tree_desc(desc, tree->buffer, tree->size);
248}
249
250static int git_merge_trees(int index_only,
251 struct tree *common,
252 struct tree *head,
253 struct tree *merge)
254{
255 int rc;
256 struct tree_desc t[3];
257 struct unpack_trees_options opts;
258
259 memset(&opts, 0, sizeof(opts));
260 if (index_only)
261 opts.index_only = 1;
262 else
263 opts.update = 1;
264 opts.merge = 1;
265 opts.head_idx = 2;
266 opts.fn = threeway_merge;
267 opts.src_index = &the_index;
268 opts.dst_index = &the_index;
e294030f 269 setup_unpack_trees_porcelain(&opts, "merge");
9047ebbc
MV
270
271 init_tree_desc_from_tree(t+0, common);
272 init_tree_desc_from_tree(t+1, head);
273 init_tree_desc_from_tree(t+2, merge);
274
275 rc = unpack_trees(3, t, &opts);
276 cache_tree_free(&active_cache_tree);
277 return rc;
278}
279
8a2fce18 280struct tree *write_tree_from_memory(struct merge_options *o)
9047ebbc
MV
281{
282 struct tree *result = NULL;
283
284 if (unmerged_cache()) {
285 int i;
19c6a4f8 286 fprintf(stderr, "BUG: There are unmerged index entries:\n");
9047ebbc 287 for (i = 0; i < active_nr; i++) {
9c5e6c80 288 const struct cache_entry *ce = active_cache[i];
9047ebbc 289 if (ce_stage(ce))
c43ba42e 290 fprintf(stderr, "BUG: %d %.*s\n", ce_stage(ce),
19c6a4f8 291 (int)ce_namelen(ce), ce->name);
9047ebbc 292 }
ef1177d1 293 die("BUG: unmerged index entries in merge-recursive.c");
9047ebbc
MV
294 }
295
296 if (!active_cache_tree)
297 active_cache_tree = cache_tree();
298
299 if (!cache_tree_fully_valid(active_cache_tree) &&
6003303a 300 cache_tree_update(&the_index, 0) < 0) {
bc9204d4 301 err(o, _("error building trees"));
6003303a
JS
302 return NULL;
303 }
9047ebbc
MV
304
305 result = lookup_tree(active_cache_tree->sha1);
306
307 return result;
308}
309
310static int save_files_dirs(const unsigned char *sha1,
6a0b0b6d 311 struct strbuf *base, const char *path,
9047ebbc
MV
312 unsigned int mode, int stage, void *context)
313{
6a0b0b6d 314 int baselen = base->len;
696ee23c
MV
315 struct merge_options *o = context;
316
6a0b0b6d 317 strbuf_addstr(base, path);
9047ebbc
MV
318
319 if (S_ISDIR(mode))
6a0b0b6d 320 string_list_insert(&o->current_directory_set, base->buf);
9047ebbc 321 else
6a0b0b6d 322 string_list_insert(&o->current_file_set, base->buf);
9047ebbc 323
6a0b0b6d 324 strbuf_setlen(base, baselen);
d3bee161 325 return (S_ISDIR(mode) ? READ_TREE_RECURSIVE : 0);
9047ebbc
MV
326}
327
696ee23c 328static int get_files_dirs(struct merge_options *o, struct tree *tree)
9047ebbc
MV
329{
330 int n;
f0096c06 331 struct pathspec match_all;
9a087274 332 memset(&match_all, 0, sizeof(match_all));
f0096c06 333 if (read_tree_recursive(tree, "", 0, 0, &match_all, save_files_dirs, o))
9047ebbc 334 return 0;
696ee23c 335 n = o->current_file_set.nr + o->current_directory_set.nr;
9047ebbc
MV
336 return n;
337}
338
339/*
340 * Returns an index_entry instance which doesn't have to correspond to
341 * a real cache entry in Git's index.
342 */
343static struct stage_data *insert_stage_data(const char *path,
344 struct tree *o, struct tree *a, struct tree *b,
345 struct string_list *entries)
346{
347 struct string_list_item *item;
348 struct stage_data *e = xcalloc(1, sizeof(struct stage_data));
ed1c9977 349 get_tree_entry(o->object.oid.hash, path,
fd429e98 350 e->stages[1].oid.hash, &e->stages[1].mode);
ed1c9977 351 get_tree_entry(a->object.oid.hash, path,
fd429e98 352 e->stages[2].oid.hash, &e->stages[2].mode);
ed1c9977 353 get_tree_entry(b->object.oid.hash, path,
fd429e98 354 e->stages[3].oid.hash, &e->stages[3].mode);
78a395d3 355 item = string_list_insert(entries, path);
9047ebbc
MV
356 item->util = e;
357 return e;
358}
359
360/*
361 * Create a dictionary mapping file names to stage_data objects. The
362 * dictionary contains one entry for every path with a non-zero stage entry.
363 */
364static struct string_list *get_unmerged(void)
365{
366 struct string_list *unmerged = xcalloc(1, sizeof(struct string_list));
367 int i;
368
369 unmerged->strdup_strings = 1;
370
371 for (i = 0; i < active_nr; i++) {
372 struct string_list_item *item;
373 struct stage_data *e;
9c5e6c80 374 const struct cache_entry *ce = active_cache[i];
9047ebbc
MV
375 if (!ce_stage(ce))
376 continue;
377
e8c8b713 378 item = string_list_lookup(unmerged, ce->name);
9047ebbc 379 if (!item) {
78a395d3 380 item = string_list_insert(unmerged, ce->name);
9047ebbc
MV
381 item->util = xcalloc(1, sizeof(struct stage_data));
382 }
383 e = item->util;
384 e->stages[ce_stage(ce)].mode = ce->ce_mode;
fd429e98 385 hashcpy(e->stages[ce_stage(ce)].oid.hash, ce->sha1);
9047ebbc
MV
386 }
387
388 return unmerged;
389}
390
f0fd4d05 391static int string_list_df_name_compare(const void *a, const void *b)
ef02b317 392{
f0fd4d05
EN
393 const struct string_list_item *one = a;
394 const struct string_list_item *two = b;
395 int onelen = strlen(one->string);
396 int twolen = strlen(two->string);
397 /*
398 * Here we only care that entries for D/F conflicts are
399 * adjacent, in particular with the file of the D/F conflict
400 * appearing before files below the corresponding directory.
401 * The order of the rest of the list is irrelevant for us.
ef02b317 402 *
f0fd4d05
EN
403 * To achieve this, we sort with df_name_compare and provide
404 * the mode S_IFDIR so that D/F conflicts will sort correctly.
405 * We use the mode S_IFDIR for everything else for simplicity,
406 * since in other cases any changes in their order due to
407 * sorting cause no problems for us.
408 */
409 int cmp = df_name_compare(one->string, onelen, S_IFDIR,
410 two->string, twolen, S_IFDIR);
411 /*
412 * Now that 'foo' and 'foo/bar' compare equal, we have to make sure
413 * that 'foo' comes before 'foo/bar'.
ef02b317 414 */
f0fd4d05
EN
415 if (cmp)
416 return cmp;
417 return onelen - twolen;
418}
419
70cc3d36
EN
420static void record_df_conflict_files(struct merge_options *o,
421 struct string_list *entries)
ef02b317 422{
70cc3d36 423 /* If there is a D/F conflict and the file for such a conflict
f7d650c0 424 * currently exist in the working tree, we want to allow it to be
edd2faf5
EN
425 * removed to make room for the corresponding directory if needed.
426 * The files underneath the directories of such D/F conflicts will
427 * be processed before the corresponding file involved in the D/F
428 * conflict. If the D/F directory ends up being removed by the
429 * merge, then we won't have to touch the D/F file. If the D/F
430 * directory needs to be written to the working copy, then the D/F
431 * file will simply be removed (in make_room_for_path()) to make
432 * room for the necessary paths. Note that if both the directory
433 * and the file need to be present, then the D/F file will be
434 * reinstated with a new unique name at the time it is processed.
ef02b317 435 */
af4941d4 436 struct string_list df_sorted_entries = STRING_LIST_INIT_NODUP;
ef02b317 437 const char *last_file = NULL;
c8516500 438 int last_len = 0;
ef02b317
EN
439 int i;
440
0b30e812
EN
441 /*
442 * If we're merging merge-bases, we don't want to bother with
443 * any working directory changes.
444 */
445 if (o->call_depth)
446 return;
447
f0fd4d05 448 /* Ensure D/F conflicts are adjacent in the entries list. */
ef02b317 449 for (i = 0; i < entries->nr; i++) {
f701aae0
EN
450 struct string_list_item *next = &entries->items[i];
451 string_list_append(&df_sorted_entries, next->string)->util =
452 next->util;
453 }
454 qsort(df_sorted_entries.items, entries->nr, sizeof(*entries->items),
f0fd4d05
EN
455 string_list_df_name_compare);
456
70cc3d36 457 string_list_clear(&o->df_conflict_file_set, 1);
f701aae0
EN
458 for (i = 0; i < df_sorted_entries.nr; i++) {
459 const char *path = df_sorted_entries.items[i].string;
ef02b317 460 int len = strlen(path);
f701aae0 461 struct stage_data *e = df_sorted_entries.items[i].util;
ef02b317
EN
462
463 /*
464 * Check if last_file & path correspond to a D/F conflict;
465 * i.e. whether path is last_file+'/'+<something>.
70cc3d36
EN
466 * If so, record that it's okay to remove last_file to make
467 * room for path and friends if needed.
ef02b317
EN
468 */
469 if (last_file &&
470 len > last_len &&
471 memcmp(path, last_file, last_len) == 0 &&
472 path[last_len] == '/') {
70cc3d36 473 string_list_insert(&o->df_conflict_file_set, last_file);
ef02b317
EN
474 }
475
476 /*
477 * Determine whether path could exist as a file in the
478 * working directory as a possible D/F conflict. This
479 * will only occur when it exists in stage 2 as a
480 * file.
481 */
482 if (S_ISREG(e->stages[2].mode) || S_ISLNK(e->stages[2].mode)) {
483 last_file = path;
484 last_len = len;
ef02b317
EN
485 } else {
486 last_file = NULL;
487 }
488 }
f701aae0 489 string_list_clear(&df_sorted_entries, 0);
ef02b317
EN
490}
491
9cba13ca 492struct rename {
9047ebbc
MV
493 struct diff_filepair *pair;
494 struct stage_data *src_entry;
495 struct stage_data *dst_entry;
496 unsigned processed:1;
497};
498
499/*
500 * Get information of all renames which occurred between 'o_tree' and
501 * 'tree'. We need the three trees in the merge ('o_tree', 'a_tree' and
502 * 'b_tree') to be able to associate the correct cache entries with
503 * the rename information. 'tree' is always equal to either a_tree or b_tree.
504 */
8a2fce18
MV
505static struct string_list *get_renames(struct merge_options *o,
506 struct tree *tree,
507 struct tree *o_tree,
508 struct tree *a_tree,
509 struct tree *b_tree,
510 struct string_list *entries)
9047ebbc
MV
511{
512 int i;
513 struct string_list *renames;
514 struct diff_options opts;
515
516 renames = xcalloc(1, sizeof(struct string_list));
d2b11eca
FGA
517 if (!o->detect_rename)
518 return renames;
519
9047ebbc
MV
520 diff_setup(&opts);
521 DIFF_OPT_SET(&opts, RECURSIVE);
4f7cb99a 522 DIFF_OPT_CLR(&opts, RENAME_EMPTY);
9047ebbc 523 opts.detect_rename = DIFF_DETECT_RENAME;
8a2fce18
MV
524 opts.rename_limit = o->merge_rename_limit >= 0 ? o->merge_rename_limit :
525 o->diff_rename_limit >= 0 ? o->diff_rename_limit :
92c57e5c 526 1000;
10ae7526 527 opts.rename_score = o->rename_score;
99bfc669 528 opts.show_rename_progress = o->show_rename_progress;
9047ebbc 529 opts.output_format = DIFF_FORMAT_NO_OUTPUT;
28452655 530 diff_setup_done(&opts);
ed1c9977 531 diff_tree_sha1(o_tree->object.oid.hash, tree->object.oid.hash, "", &opts);
9047ebbc 532 diffcore_std(&opts);
bf0ab10f
JK
533 if (opts.needed_rename_limit > o->needed_rename_limit)
534 o->needed_rename_limit = opts.needed_rename_limit;
9047ebbc
MV
535 for (i = 0; i < diff_queued_diff.nr; ++i) {
536 struct string_list_item *item;
537 struct rename *re;
538 struct diff_filepair *pair = diff_queued_diff.queue[i];
539 if (pair->status != 'R') {
540 diff_free_filepair(pair);
541 continue;
542 }
543 re = xmalloc(sizeof(*re));
544 re->processed = 0;
545 re->pair = pair;
e8c8b713 546 item = string_list_lookup(entries, re->pair->one->path);
9047ebbc
MV
547 if (!item)
548 re->src_entry = insert_stage_data(re->pair->one->path,
549 o_tree, a_tree, b_tree, entries);
550 else
551 re->src_entry = item->util;
552
e8c8b713 553 item = string_list_lookup(entries, re->pair->two->path);
9047ebbc
MV
554 if (!item)
555 re->dst_entry = insert_stage_data(re->pair->two->path,
556 o_tree, a_tree, b_tree, entries);
557 else
558 re->dst_entry = item->util;
78a395d3 559 item = string_list_insert(renames, pair->one->path);
9047ebbc
MV
560 item->util = re;
561 }
562 opts.output_format = DIFF_FORMAT_NO_OUTPUT;
563 diff_queued_diff.nr = 0;
564 diff_flush(&opts);
565 return renames;
566}
567
bc9204d4
JS
568static int update_stages(struct merge_options *opt, const char *path,
569 const struct diff_filespec *o,
650467cf
EN
570 const struct diff_filespec *a,
571 const struct diff_filespec *b)
9047ebbc 572{
f53d3977
EN
573
574 /*
575 * NOTE: It is usually a bad idea to call update_stages on a path
576 * before calling update_file on that same path, since it can
577 * sometimes lead to spurious "refusing to lose untracked file..."
578 * messages from update_file (via make_room_for path via
579 * would_lose_untracked). Instead, reverse the order of the calls
580 * (executing update_file first and then update_stages).
581 */
650467cf
EN
582 int clear = 1;
583 int options = ADD_CACHE_OK_TO_ADD | ADD_CACHE_SKIP_DFCHECK;
9047ebbc
MV
584 if (clear)
585 if (remove_file_from_cache(path))
586 return -1;
587 if (o)
bc9204d4 588 if (add_cacheinfo(opt, o->mode, &o->oid, path, 1, 0, options))
9047ebbc
MV
589 return -1;
590 if (a)
bc9204d4 591 if (add_cacheinfo(opt, a->mode, &a->oid, path, 2, 0, options))
9047ebbc
MV
592 return -1;
593 if (b)
bc9204d4 594 if (add_cacheinfo(opt, b->mode, &b->oid, path, 3, 0, options))
9047ebbc
MV
595 return -1;
596 return 0;
597}
598
b8ddf164
EN
599static void update_entry(struct stage_data *entry,
600 struct diff_filespec *o,
601 struct diff_filespec *a,
602 struct diff_filespec *b)
2ff739f9 603{
2ff739f9
EN
604 entry->processed = 0;
605 entry->stages[1].mode = o->mode;
606 entry->stages[2].mode = a->mode;
607 entry->stages[3].mode = b->mode;
fd429e98 608 oidcpy(&entry->stages[1].oid, &o->oid);
609 oidcpy(&entry->stages[2].oid, &a->oid);
610 oidcpy(&entry->stages[3].oid, &b->oid);
2ff739f9
EN
611}
612
b7fa51da
MV
613static int remove_file(struct merge_options *o, int clean,
614 const char *path, int no_wd)
9047ebbc 615{
b7fa51da
MV
616 int update_cache = o->call_depth || clean;
617 int update_working_directory = !o->call_depth && !no_wd;
9047ebbc
MV
618
619 if (update_cache) {
620 if (remove_file_from_cache(path))
621 return -1;
622 }
623 if (update_working_directory) {
ae352c7f
DT
624 if (ignore_case) {
625 struct cache_entry *ce;
626 ce = cache_file_exists(path, strlen(path), ignore_case);
627 if (ce && ce_stage(ce) == 0)
628 return 0;
629 }
25755e84 630 if (remove_path(path))
9047ebbc 631 return -1;
9047ebbc
MV
632 }
633 return 0;
634}
635
45bc131d
JK
636/* add a string to a strbuf, but converting "/" to "_" */
637static void add_flattened_path(struct strbuf *out, const char *s)
638{
639 size_t i = out->len;
640 strbuf_addstr(out, s);
641 for (; i < out->len; i++)
642 if (out->buf[i] == '/')
643 out->buf[i] = '_';
644}
645
696ee23c 646static char *unique_path(struct merge_options *o, const char *path, const char *branch)
9047ebbc 647{
45bc131d 648 struct strbuf newpath = STRBUF_INIT;
9047ebbc 649 int suffix = 0;
45bc131d
JK
650 size_t base_len;
651
652 strbuf_addf(&newpath, "%s~", path);
653 add_flattened_path(&newpath, branch);
654
655 base_len = newpath.len;
656 while (string_list_has_string(&o->current_file_set, newpath.buf) ||
657 string_list_has_string(&o->current_directory_set, newpath.buf) ||
8e1b62f1 658 (!o->call_depth && file_exists(newpath.buf))) {
45bc131d
JK
659 strbuf_setlen(&newpath, base_len);
660 strbuf_addf(&newpath, "_%d", suffix++);
661 }
662
663 string_list_insert(&o->current_file_set, newpath.buf);
664 return strbuf_detach(&newpath, NULL);
9047ebbc
MV
665}
666
f2507b4e
EN
667static int dir_in_way(const char *path, int check_working_copy)
668{
b4600fbe
JK
669 int pos;
670 struct strbuf dirpath = STRBUF_INIT;
f2507b4e
EN
671 struct stat st;
672
b4600fbe
JK
673 strbuf_addstr(&dirpath, path);
674 strbuf_addch(&dirpath, '/');
f2507b4e 675
b4600fbe 676 pos = cache_name_pos(dirpath.buf, dirpath.len);
f2507b4e
EN
677
678 if (pos < 0)
679 pos = -1 - pos;
680 if (pos < active_nr &&
b4600fbe
JK
681 !strncmp(dirpath.buf, active_cache[pos]->name, dirpath.len)) {
682 strbuf_release(&dirpath);
f2507b4e
EN
683 return 1;
684 }
685
b4600fbe 686 strbuf_release(&dirpath);
f2507b4e
EN
687 return check_working_copy && !lstat(path, &st) && S_ISDIR(st.st_mode);
688}
689
aacb82de 690static int was_tracked(const char *path)
60c91181
JH
691{
692 int pos = cache_name_pos(path, strlen(path));
693
f8d83fb6
JS
694 if (0 <= pos)
695 /* we have been tracking this path */
696 return 1;
697
698 /*
699 * Look for an unmerged entry for the path,
700 * specifically stage #2, which would indicate
701 * that "our" side before the merge started
702 * had the path tracked (and resulted in a conflict).
703 */
704 for (pos = -1 - pos;
705 pos < active_nr && !strcmp(path, active_cache[pos]->name);
706 pos++)
707 if (ce_stage(active_cache[pos]) == 2)
aacb82de 708 return 1;
aacb82de 709 return 0;
60c91181
JH
710}
711
aacb82de 712static int would_lose_untracked(const char *path)
9047ebbc 713{
aacb82de 714 return !was_tracked(path) && file_exists(path);
60c91181
JH
715}
716
ed0148a5 717static int make_room_for_path(struct merge_options *o, const char *path)
9047ebbc 718{
ed0148a5 719 int status, i;
55653a68 720 const char *msg = _("failed to create path '%s'%s");
9047ebbc 721
ed0148a5
EN
722 /* Unlink any D/F conflict files that are in the way */
723 for (i = 0; i < o->df_conflict_file_set.nr; i++) {
724 const char *df_path = o->df_conflict_file_set.items[i].string;
725 size_t pathlen = strlen(path);
726 size_t df_pathlen = strlen(df_path);
727 if (df_pathlen < pathlen &&
728 path[df_pathlen] == '/' &&
729 strncmp(path, df_path, df_pathlen) == 0) {
730 output(o, 3,
55653a68 731 _("Removing %s to make room for subdirectory\n"),
ed0148a5
EN
732 df_path);
733 unlink(df_path);
734 unsorted_string_list_delete_item(&o->df_conflict_file_set,
735 i, 0);
736 break;
737 }
738 }
739
740 /* Make sure leading directories are created */
9047ebbc
MV
741 status = safe_create_leading_directories_const(path);
742 if (status) {
6003303a 743 if (status == SCLD_EXISTS)
9047ebbc 744 /* something else exists */
bc9204d4
JS
745 return err(o, msg, path, _(": perhaps a D/F conflict?"));
746 return err(o, msg, path, "");
9047ebbc
MV
747 }
748
60c91181
JH
749 /*
750 * Do not unlink a file in the work tree if we are not
751 * tracking it.
752 */
753 if (would_lose_untracked(path))
bc9204d4 754 return err(o, _("refusing to lose untracked file at '%s'"),
60c91181
JH
755 path);
756
9047ebbc
MV
757 /* Successful unlink is good.. */
758 if (!unlink(path))
759 return 0;
760 /* .. and so is no existing file */
761 if (errno == ENOENT)
762 return 0;
763 /* .. but not some other error (who really cares what?) */
bc9204d4 764 return err(o, msg, path, _(": perhaps a D/F conflict?"));
9047ebbc
MV
765}
766
75456f96
JS
767static int update_file_flags(struct merge_options *o,
768 const struct object_id *oid,
769 unsigned mode,
770 const char *path,
771 int update_cache,
772 int update_wd)
9047ebbc 773{
6003303a
JS
774 int ret = 0;
775
b7fa51da 776 if (o->call_depth)
9047ebbc
MV
777 update_wd = 0;
778
779 if (update_wd) {
780 enum object_type type;
781 void *buf;
782 unsigned long size;
783
68d03e4a 784 if (S_ISGITLINK(mode)) {
0c44c943
JH
785 /*
786 * We may later decide to recursively descend into
787 * the submodule directory and update its index
788 * and/or work tree, but we do not do that now.
789 */
68d03e4a 790 update_wd = 0;
0c44c943 791 goto update_index;
68d03e4a 792 }
9047ebbc 793
b4da9d62 794 buf = read_sha1_file(oid->hash, &type, &size);
9047ebbc 795 if (!buf)
bc9204d4 796 return err(o, _("cannot read object %s '%s'"), oid_to_hex(oid), path);
6003303a 797 if (type != OBJ_BLOB) {
bc9204d4 798 ret = err(o, _("blob expected for %s '%s'"), oid_to_hex(oid), path);
6003303a
JS
799 goto free_buf;
800 }
9047ebbc 801 if (S_ISREG(mode)) {
f285a2d7 802 struct strbuf strbuf = STRBUF_INIT;
9047ebbc
MV
803 if (convert_to_working_tree(path, buf, size, &strbuf)) {
804 free(buf);
805 size = strbuf.len;
806 buf = strbuf_detach(&strbuf, NULL);
807 }
808 }
809
ed0148a5 810 if (make_room_for_path(o, path) < 0) {
9047ebbc 811 update_wd = 0;
75456f96 812 goto free_buf;
9047ebbc
MV
813 }
814 if (S_ISREG(mode) || (!has_symlinks && S_ISLNK(mode))) {
815 int fd;
816 if (mode & 0100)
817 mode = 0777;
818 else
819 mode = 0666;
820 fd = open(path, O_WRONLY | O_TRUNC | O_CREAT, mode);
6003303a 821 if (fd < 0) {
bc9204d4
JS
822 ret = err(o, _("failed to open '%s': %s"),
823 path, strerror(errno));
6003303a
JS
824 goto free_buf;
825 }
f633ea2c 826 write_in_full(fd, buf, size);
9047ebbc
MV
827 close(fd);
828 } else if (S_ISLNK(mode)) {
829 char *lnk = xmemdupz(buf, size);
830 safe_create_leading_directories_const(path);
831 unlink(path);
304dcf26 832 if (symlink(lnk, path))
bc9204d4
JS
833 ret = err(o, _("failed to symlink '%s': %s"),
834 path, strerror(errno));
9047ebbc
MV
835 free(lnk);
836 } else
bc9204d4
JS
837 ret = err(o,
838 _("do not know what to do with %06o %s '%s'"),
839 mode, oid_to_hex(oid), path);
75456f96 840 free_buf:
9047ebbc
MV
841 free(buf);
842 }
843 update_index:
6003303a 844 if (!ret && update_cache)
bc9204d4 845 add_cacheinfo(o, mode, oid, path, 0, update_wd, ADD_CACHE_OK_TO_ADD);
6003303a 846 return ret;
9047ebbc
MV
847}
848
75456f96
JS
849static int update_file(struct merge_options *o,
850 int clean,
851 const struct object_id *oid,
852 unsigned mode,
853 const char *path)
9047ebbc 854{
75456f96 855 return update_file_flags(o, oid, mode, path, o->call_depth || clean, !o->call_depth);
9047ebbc
MV
856}
857
858/* Low level file merging, update and removal */
859
9cba13ca 860struct merge_file_info {
9b561499 861 struct object_id oid;
9047ebbc
MV
862 unsigned mode;
863 unsigned clean:1,
864 merge:1;
865};
866
b7fa51da
MV
867static int merge_3way(struct merge_options *o,
868 mmbuffer_t *result_buf,
0c059420
EN
869 const struct diff_filespec *one,
870 const struct diff_filespec *a,
871 const struct diff_filespec *b,
9047ebbc
MV
872 const char *branch1,
873 const char *branch2)
874{
875 mmfile_t orig, src1, src2;
712516bc 876 struct ll_merge_options ll_opts = {0};
4c5868f4 877 char *base_name, *name1, *name2;
9047ebbc 878 int merge_status;
8cc5b290 879
712516bc 880 ll_opts.renormalize = o->renormalize;
58a1ece4 881 ll_opts.xdl_opts = o->xdl_opts;
712516bc
JN
882
883 if (o->call_depth) {
884 ll_opts.virtual_ancestor = 1;
885 ll_opts.variant = 0;
886 } else {
8cc5b290
AP
887 switch (o->recursive_variant) {
888 case MERGE_RECURSIVE_OURS:
712516bc 889 ll_opts.variant = XDL_MERGE_FAVOR_OURS;
8cc5b290
AP
890 break;
891 case MERGE_RECURSIVE_THEIRS:
712516bc 892 ll_opts.variant = XDL_MERGE_FAVOR_THEIRS;
8cc5b290
AP
893 break;
894 default:
712516bc 895 ll_opts.variant = 0;
8cc5b290
AP
896 break;
897 }
898 }
9047ebbc 899
4c5868f4
JN
900 if (strcmp(a->path, b->path) ||
901 (o->ancestor != NULL && strcmp(a->path, one->path) != 0)) {
902 base_name = o->ancestor == NULL ? NULL :
4e2d094d
RJ
903 mkpathdup("%s:%s", o->ancestor, one->path);
904 name1 = mkpathdup("%s:%s", branch1, a->path);
905 name2 = mkpathdup("%s:%s", branch2, b->path);
606475f3 906 } else {
4c5868f4 907 base_name = o->ancestor == NULL ? NULL :
4e2d094d
RJ
908 mkpathdup("%s", o->ancestor);
909 name1 = mkpathdup("%s", branch1);
910 name2 = mkpathdup("%s", branch2);
606475f3 911 }
9047ebbc 912
a0d12c44 913 read_mmblob(&orig, one->oid.hash);
914 read_mmblob(&src1, a->oid.hash);
915 read_mmblob(&src2, b->oid.hash);
9047ebbc 916
4c5868f4 917 merge_status = ll_merge(result_buf, a->path, &orig, base_name,
712516bc 918 &src1, name1, &src2, name2, &ll_opts);
9047ebbc 919
4e2d094d 920 free(base_name);
9047ebbc
MV
921 free(name1);
922 free(name2);
923 free(orig.ptr);
924 free(src1.ptr);
925 free(src2.ptr);
926 return merge_status;
927}
928
3c8a51e8 929static int merge_file_1(struct merge_options *o,
6bdaead1
EN
930 const struct diff_filespec *one,
931 const struct diff_filespec *a,
932 const struct diff_filespec *b,
933 const char *branch1,
3c8a51e8
JS
934 const char *branch2,
935 struct merge_file_info *result)
9047ebbc 936{
3c8a51e8
JS
937 result->merge = 0;
938 result->clean = 1;
9047ebbc
MV
939
940 if ((S_IFMT & a->mode) != (S_IFMT & b->mode)) {
3c8a51e8 941 result->clean = 0;
9047ebbc 942 if (S_ISREG(a->mode)) {
3c8a51e8
JS
943 result->mode = a->mode;
944 oidcpy(&result->oid, &a->oid);
9047ebbc 945 } else {
3c8a51e8
JS
946 result->mode = b->mode;
947 oidcpy(&result->oid, &b->oid);
9047ebbc
MV
948 }
949 } else {
b4da9d62 950 if (!oid_eq(&a->oid, &one->oid) && !oid_eq(&b->oid, &one->oid))
3c8a51e8 951 result->merge = 1;
9047ebbc
MV
952
953 /*
954 * Merge modes
955 */
b7fa51da 956 if (a->mode == b->mode || a->mode == one->mode)
3c8a51e8 957 result->mode = b->mode;
9047ebbc 958 else {
3c8a51e8 959 result->mode = a->mode;
b7fa51da 960 if (b->mode != one->mode) {
3c8a51e8
JS
961 result->clean = 0;
962 result->merge = 1;
9047ebbc
MV
963 }
964 }
965
b4da9d62 966 if (oid_eq(&a->oid, &b->oid) || oid_eq(&a->oid, &one->oid))
3c8a51e8 967 oidcpy(&result->oid, &b->oid);
b4da9d62 968 else if (oid_eq(&b->oid, &one->oid))
3c8a51e8 969 oidcpy(&result->oid, &a->oid);
9047ebbc
MV
970 else if (S_ISREG(a->mode)) {
971 mmbuffer_t result_buf;
6003303a 972 int ret = 0, merge_status;
9047ebbc 973
b7fa51da 974 merge_status = merge_3way(o, &result_buf, one, a, b,
9047ebbc
MV
975 branch1, branch2);
976
977 if ((merge_status < 0) || !result_buf.ptr)
bc9204d4 978 ret = err(o, _("Failed to execute internal merge"));
9047ebbc 979
6003303a
JS
980 if (!ret && write_sha1_file(result_buf.ptr, result_buf.size,
981 blob_type, result->oid.hash))
bc9204d4
JS
982 ret = err(o, _("Unable to add %s to database"),
983 a->path);
9047ebbc
MV
984
985 free(result_buf.ptr);
6003303a
JS
986 if (ret)
987 return ret;
3c8a51e8 988 result->clean = (merge_status == 0);
9047ebbc 989 } else if (S_ISGITLINK(a->mode)) {
3c8a51e8 990 result->clean = merge_submodule(result->oid.hash,
a0d12c44 991 one->path,
992 one->oid.hash,
993 a->oid.hash,
994 b->oid.hash,
80988783 995 !o->call_depth);
9047ebbc 996 } else if (S_ISLNK(a->mode)) {
3c8a51e8 997 oidcpy(&result->oid, &a->oid);
9047ebbc 998
b4da9d62 999 if (!oid_eq(&a->oid, &b->oid))
3c8a51e8 1000 result->clean = 0;
ef1177d1 1001 } else
7e97e100 1002 die("BUG: unsupported object type in the tree");
9047ebbc
MV
1003 }
1004
3c8a51e8 1005 return 0;
9047ebbc
MV
1006}
1007
3c8a51e8 1008static int merge_file_special_markers(struct merge_options *o,
dac47415
EN
1009 const struct diff_filespec *one,
1010 const struct diff_filespec *a,
1011 const struct diff_filespec *b,
1012 const char *branch1,
1013 const char *filename1,
1014 const char *branch2,
3c8a51e8
JS
1015 const char *filename2,
1016 struct merge_file_info *mfi)
dac47415
EN
1017{
1018 char *side1 = NULL;
1019 char *side2 = NULL;
3c8a51e8 1020 int ret;
dac47415 1021
28310186
JK
1022 if (filename1)
1023 side1 = xstrfmt("%s:%s", branch1, filename1);
1024 if (filename2)
1025 side2 = xstrfmt("%s:%s", branch2, filename2);
dac47415 1026
3c8a51e8
JS
1027 ret = merge_file_1(o, one, a, b,
1028 side1 ? side1 : branch1,
1029 side2 ? side2 : branch2, mfi);
dac47415
EN
1030 free(side1);
1031 free(side2);
3c8a51e8 1032 return ret;
dac47415
EN
1033}
1034
3c8a51e8 1035static int merge_file_one(struct merge_options *o,
6bdaead1 1036 const char *path,
b4da9d62 1037 const struct object_id *o_oid, int o_mode,
1038 const struct object_id *a_oid, int a_mode,
1039 const struct object_id *b_oid, int b_mode,
6bdaead1 1040 const char *branch1,
3c8a51e8
JS
1041 const char *branch2,
1042 struct merge_file_info *mfi)
6bdaead1
EN
1043{
1044 struct diff_filespec one, a, b;
1045
1046 one.path = a.path = b.path = (char *)path;
b4da9d62 1047 oidcpy(&one.oid, o_oid);
6bdaead1 1048 one.mode = o_mode;
b4da9d62 1049 oidcpy(&a.oid, a_oid);
6bdaead1 1050 a.mode = a_mode;
b4da9d62 1051 oidcpy(&b.oid, b_oid);
6bdaead1 1052 b.mode = b_mode;
3c8a51e8 1053 return merge_file_1(o, &one, &a, &b, branch1, branch2, mfi);
6bdaead1
EN
1054}
1055
75456f96 1056static int handle_change_delete(struct merge_options *o,
b7033252 1057 const char *path,
b4da9d62 1058 const struct object_id *o_oid, int o_mode,
1059 const struct object_id *a_oid, int a_mode,
1060 const struct object_id *b_oid, int b_mode,
b7033252
EN
1061 const char *change, const char *change_past)
1062{
1063 char *renamed = NULL;
75456f96 1064 int ret = 0;
b7033252 1065 if (dir_in_way(path, !o->call_depth)) {
b4da9d62 1066 renamed = unique_path(o, path, a_oid ? o->branch1 : o->branch2);
b7033252
EN
1067 }
1068
1069 if (o->call_depth) {
1070 /*
1071 * We cannot arbitrarily accept either a_sha or b_sha as
1072 * correct; since there is no true "middle point" between
1073 * them, simply reuse the base version for virtual merge base.
1074 */
75456f96
JS
1075 ret = remove_file_from_cache(path);
1076 if (!ret)
1077 ret = update_file(o, 0, o_oid, o_mode,
1078 renamed ? renamed : path);
b4da9d62 1079 } else if (!a_oid) {
55653a68
JX
1080 if (!renamed) {
1081 output(o, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1082 "and %s in %s. Version %s of %s left in tree."),
1083 change, path, o->branch1, change_past,
1084 o->branch2, o->branch2, path);
75456f96 1085 ret = update_file(o, 0, b_oid, b_mode, path);
55653a68
JX
1086 } else {
1087 output(o, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1088 "and %s in %s. Version %s of %s left in tree at %s."),
1089 change, path, o->branch1, change_past,
1090 o->branch2, o->branch2, path, renamed);
75456f96 1091 ret = update_file(o, 0, b_oid, b_mode, renamed);
55653a68 1092 }
b7033252 1093 } else {
55653a68
JX
1094 if (!renamed) {
1095 output(o, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1096 "and %s in %s. Version %s of %s left in tree."),
1097 change, path, o->branch2, change_past,
1098 o->branch1, o->branch1, path);
1099 } else {
1100 output(o, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1101 "and %s in %s. Version %s of %s left in tree at %s."),
1102 change, path, o->branch2, change_past,
1103 o->branch1, o->branch1, path, renamed);
75456f96 1104 ret = update_file(o, 0, a_oid, a_mode, renamed);
55653a68 1105 }
35a74abf
EN
1106 /*
1107 * No need to call update_file() on path when !renamed, since
1108 * that would needlessly touch path. We could call
1109 * update_file_flags() with update_cache=0 and update_wd=0,
1110 * but that's a no-op.
1111 */
b7033252
EN
1112 }
1113 free(renamed);
75456f96
JS
1114
1115 return ret;
b7033252
EN
1116}
1117
75456f96 1118static int conflict_rename_delete(struct merge_options *o,
6ef2cb00
EN
1119 struct diff_filepair *pair,
1120 const char *rename_branch,
1121 const char *other_branch)
9047ebbc 1122{
e03acb8b
EN
1123 const struct diff_filespec *orig = pair->one;
1124 const struct diff_filespec *dest = pair->two;
b4da9d62 1125 const struct object_id *a_oid = NULL;
1126 const struct object_id *b_oid = NULL;
e03acb8b
EN
1127 int a_mode = 0;
1128 int b_mode = 0;
1129
1130 if (rename_branch == o->branch1) {
b4da9d62 1131 a_oid = &dest->oid;
e03acb8b
EN
1132 a_mode = dest->mode;
1133 } else {
b4da9d62 1134 b_oid = &dest->oid;
e03acb8b
EN
1135 b_mode = dest->mode;
1136 }
6ef2cb00 1137
75456f96
JS
1138 if (handle_change_delete(o,
1139 o->call_depth ? orig->path : dest->path,
1140 &orig->oid, orig->mode,
1141 a_oid, a_mode,
1142 b_oid, b_mode,
1143 _("rename"), _("renamed")))
1144 return -1;
e03acb8b 1145
75456f96
JS
1146 if (o->call_depth)
1147 return remove_file_from_cache(dest->path);
1148 else
bc9204d4 1149 return update_stages(o, dest->path, NULL,
75456f96
JS
1150 rename_branch == o->branch1 ? dest : NULL,
1151 rename_branch == o->branch1 ? NULL : dest);
6ef2cb00
EN
1152}
1153
1ac91b32
EN
1154static struct diff_filespec *filespec_from_entry(struct diff_filespec *target,
1155 struct stage_data *entry,
1156 int stage)
9047ebbc 1157{
b4da9d62 1158 struct object_id *oid = &entry->stages[stage].oid;
1ac91b32 1159 unsigned mode = entry->stages[stage].mode;
b4da9d62 1160 if (mode == 0 || is_null_oid(oid))
1ac91b32 1161 return NULL;
b4da9d62 1162 oidcpy(&target->oid, oid);
1ac91b32
EN
1163 target->mode = mode;
1164 return target;
1165}
1166
75456f96 1167static int handle_file(struct merge_options *o,
3672c971
EN
1168 struct diff_filespec *rename,
1169 int stage,
1170 struct rename_conflict_info *ci)
1171{
1172 char *dst_name = rename->path;
1173 struct stage_data *dst_entry;
1174 const char *cur_branch, *other_branch;
1175 struct diff_filespec other;
1176 struct diff_filespec *add;
75456f96 1177 int ret;
3672c971
EN
1178
1179 if (stage == 2) {
1180 dst_entry = ci->dst_entry1;
1181 cur_branch = ci->branch1;
1182 other_branch = ci->branch2;
1183 } else {
1184 dst_entry = ci->dst_entry2;
1185 cur_branch = ci->branch2;
1186 other_branch = ci->branch1;
9047ebbc 1187 }
3672c971
EN
1188
1189 add = filespec_from_entry(&other, dst_entry, stage ^ 1);
3672c971
EN
1190 if (add) {
1191 char *add_name = unique_path(o, rename->path, other_branch);
75456f96
JS
1192 if (update_file(o, 0, &add->oid, add->mode, add_name))
1193 return -1;
3672c971
EN
1194
1195 remove_file(o, 0, rename->path, 0);
1196 dst_name = unique_path(o, rename->path, cur_branch);
1197 } else {
1198 if (dir_in_way(rename->path, !o->call_depth)) {
1199 dst_name = unique_path(o, rename->path, cur_branch);
55653a68 1200 output(o, 1, _("%s is a directory in %s adding as %s instead"),
3672c971
EN
1201 rename->path, other_branch, dst_name);
1202 }
9047ebbc 1203 }
75456f96
JS
1204 if ((ret = update_file(o, 0, &rename->oid, rename->mode, dst_name)))
1205 ; /* fall through, do allow dst_name to be released */
1206 else if (stage == 2)
bc9204d4 1207 ret = update_stages(o, rename->path, NULL, rename, add);
f53d3977 1208 else
bc9204d4 1209 ret = update_stages(o, rename->path, NULL, add, rename);
3672c971
EN
1210
1211 if (dst_name != rename->path)
1212 free(dst_name);
75456f96
JS
1213
1214 return ret;
3672c971
EN
1215}
1216
75456f96 1217static int conflict_rename_rename_1to2(struct merge_options *o,
a99b7f22 1218 struct rename_conflict_info *ci)
9047ebbc 1219{
09c01f85 1220 /* One file was renamed in both branches, but to different names. */
a99b7f22
EN
1221 struct diff_filespec *one = ci->pair1->one;
1222 struct diff_filespec *a = ci->pair1->two;
1223 struct diff_filespec *b = ci->pair2->two;
4f66dade 1224
55653a68 1225 output(o, 1, _("CONFLICT (rename/rename): "
4f66dade 1226 "Rename \"%s\"->\"%s\" in branch \"%s\" "
55653a68 1227 "rename \"%s\"->\"%s\" in \"%s\"%s"),
a99b7f22
EN
1228 one->path, a->path, ci->branch1,
1229 one->path, b->path, ci->branch2,
55653a68 1230 o->call_depth ? _(" (left unresolved)") : "");
b7fa51da 1231 if (o->call_depth) {
c52ff85d 1232 struct merge_file_info mfi;
6d63070c
EN
1233 struct diff_filespec other;
1234 struct diff_filespec *add;
3c8a51e8 1235 if (merge_file_one(o, one->path,
b4da9d62 1236 &one->oid, one->mode,
1237 &a->oid, a->mode,
1238 &b->oid, b->mode,
3c8a51e8 1239 ci->branch1, ci->branch2, &mfi))
75456f96
JS
1240 return -1;
1241
9047ebbc 1242 /*
c52ff85d
EN
1243 * FIXME: For rename/add-source conflicts (if we could detect
1244 * such), this is wrong. We should instead find a unique
1245 * pathname and then either rename the add-source file to that
1246 * unique path, or use that unique path instead of src here.
9047ebbc 1247 */
75456f96
JS
1248 if (update_file(o, 0, &mfi.oid, mfi.mode, one->path))
1249 return -1;
07413c5a 1250
6d63070c
EN
1251 /*
1252 * Above, we put the merged content at the merge-base's
1253 * path. Now we usually need to delete both a->path and
1254 * b->path. However, the rename on each side of the merge
1255 * could also be involved in a rename/add conflict. In
1256 * such cases, we should keep the added file around,
1257 * resolving the conflict at that path in its favor.
1258 */
1259 add = filespec_from_entry(&other, ci->dst_entry1, 2 ^ 1);
75456f96
JS
1260 if (add) {
1261 if (update_file(o, 0, &add->oid, add->mode, a->path))
1262 return -1;
1263 }
6d63070c
EN
1264 else
1265 remove_file_from_cache(a->path);
1266 add = filespec_from_entry(&other, ci->dst_entry2, 3 ^ 1);
75456f96
JS
1267 if (add) {
1268 if (update_file(o, 0, &add->oid, add->mode, b->path))
1269 return -1;
1270 }
6d63070c
EN
1271 else
1272 remove_file_from_cache(b->path);
75456f96
JS
1273 } else if (handle_file(o, a, 2, ci) || handle_file(o, b, 3, ci))
1274 return -1;
1275
1276 return 0;
9047ebbc
MV
1277}
1278
75456f96 1279static int conflict_rename_rename_2to1(struct merge_options *o,
461f5041 1280 struct rename_conflict_info *ci)
9047ebbc 1281{
461f5041
EN
1282 /* Two files, a & b, were renamed to the same thing, c. */
1283 struct diff_filespec *a = ci->pair1->one;
1284 struct diff_filespec *b = ci->pair2->one;
1285 struct diff_filespec *c1 = ci->pair1->two;
1286 struct diff_filespec *c2 = ci->pair2->two;
1287 char *path = c1->path; /* == c2->path */
434b8525
EN
1288 struct merge_file_info mfi_c1;
1289 struct merge_file_info mfi_c2;
75456f96 1290 int ret;
461f5041 1291
55653a68 1292 output(o, 1, _("CONFLICT (rename/rename): "
461f5041 1293 "Rename %s->%s in %s. "
55653a68 1294 "Rename %s->%s in %s"),
461f5041
EN
1295 a->path, c1->path, ci->branch1,
1296 b->path, c2->path, ci->branch2);
1297
8e1b62f1
EN
1298 remove_file(o, 1, a->path, o->call_depth || would_lose_untracked(a->path));
1299 remove_file(o, 1, b->path, o->call_depth || would_lose_untracked(b->path));
461f5041 1300
3c8a51e8
JS
1301 if (merge_file_special_markers(o, a, c1, &ci->ren1_other,
1302 o->branch1, c1->path,
1303 o->branch2, ci->ren1_other.path, &mfi_c1) ||
1304 merge_file_special_markers(o, b, &ci->ren2_other, c2,
1305 o->branch1, ci->ren2_other.path,
1306 o->branch2, c2->path, &mfi_c2))
75456f96 1307 return -1;
434b8525 1308
0a6b8712 1309 if (o->call_depth) {
434b8525
EN
1310 /*
1311 * If mfi_c1.clean && mfi_c2.clean, then it might make
1312 * sense to do a two-way merge of those results. But, I
1313 * think in all cases, it makes sense to have the virtual
1314 * merge base just undo the renames; they can be detected
1315 * again later for the non-recursive merge.
1316 */
1317 remove_file(o, 0, path, 0);
75456f96
JS
1318 ret = update_file(o, 0, &mfi_c1.oid, mfi_c1.mode, a->path);
1319 if (!ret)
1320 ret = update_file(o, 0, &mfi_c2.oid, mfi_c2.mode,
1321 b->path);
0a6b8712 1322 } else {
461f5041
EN
1323 char *new_path1 = unique_path(o, path, ci->branch1);
1324 char *new_path2 = unique_path(o, path, ci->branch2);
55653a68 1325 output(o, 1, _("Renaming %s to %s and %s to %s instead"),
461f5041 1326 a->path, new_path1, b->path, new_path2);
0a6b8712 1327 remove_file(o, 0, path, 0);
75456f96
JS
1328 ret = update_file(o, 0, &mfi_c1.oid, mfi_c1.mode, new_path1);
1329 if (!ret)
1330 ret = update_file(o, 0, &mfi_c2.oid, mfi_c2.mode,
1331 new_path2);
0a6b8712
EN
1332 free(new_path2);
1333 free(new_path1);
1334 }
75456f96
JS
1335
1336 return ret;
9047ebbc
MV
1337}
1338
8a2fce18
MV
1339static int process_renames(struct merge_options *o,
1340 struct string_list *a_renames,
1341 struct string_list *b_renames)
9047ebbc
MV
1342{
1343 int clean_merge = 1, i, j;
183113a5
TF
1344 struct string_list a_by_dst = STRING_LIST_INIT_NODUP;
1345 struct string_list b_by_dst = STRING_LIST_INIT_NODUP;
9047ebbc
MV
1346 const struct rename *sre;
1347
1348 for (i = 0; i < a_renames->nr; i++) {
1349 sre = a_renames->items[i].util;
78a395d3 1350 string_list_insert(&a_by_dst, sre->pair->two->path)->util
0a6b8712 1351 = (void *)sre;
9047ebbc
MV
1352 }
1353 for (i = 0; i < b_renames->nr; i++) {
1354 sre = b_renames->items[i].util;
78a395d3 1355 string_list_insert(&b_by_dst, sre->pair->two->path)->util
0a6b8712 1356 = (void *)sre;
9047ebbc
MV
1357 }
1358
1359 for (i = 0, j = 0; i < a_renames->nr || j < b_renames->nr;) {
8e24cbae 1360 struct string_list *renames1, *renames2Dst;
9047ebbc
MV
1361 struct rename *ren1 = NULL, *ren2 = NULL;
1362 const char *branch1, *branch2;
1363 const char *ren1_src, *ren1_dst;
461f5041 1364 struct string_list_item *lookup;
9047ebbc
MV
1365
1366 if (i >= a_renames->nr) {
9047ebbc
MV
1367 ren2 = b_renames->items[j++].util;
1368 } else if (j >= b_renames->nr) {
9047ebbc
MV
1369 ren1 = a_renames->items[i++].util;
1370 } else {
8e24cbae
BK
1371 int compare = strcmp(a_renames->items[i].string,
1372 b_renames->items[j].string);
9047ebbc
MV
1373 if (compare <= 0)
1374 ren1 = a_renames->items[i++].util;
1375 if (compare >= 0)
1376 ren2 = b_renames->items[j++].util;
1377 }
1378
1379 /* TODO: refactor, so that 1/2 are not needed */
1380 if (ren1) {
1381 renames1 = a_renames;
9047ebbc 1382 renames2Dst = &b_by_dst;
8a2fce18
MV
1383 branch1 = o->branch1;
1384 branch2 = o->branch2;
9047ebbc
MV
1385 } else {
1386 struct rename *tmp;
1387 renames1 = b_renames;
9047ebbc 1388 renames2Dst = &a_by_dst;
8a2fce18
MV
1389 branch1 = o->branch2;
1390 branch2 = o->branch1;
9047ebbc
MV
1391 tmp = ren2;
1392 ren2 = ren1;
1393 ren1 = tmp;
1394 }
9047ebbc 1395
9047ebbc
MV
1396 if (ren1->processed)
1397 continue;
1398 ren1->processed = 1;
9047ebbc 1399 ren1->dst_entry->processed = 1;
7769a75e
EN
1400 /* BUG: We should only mark src_entry as processed if we
1401 * are not dealing with a rename + add-source case.
1402 */
9047ebbc 1403 ren1->src_entry->processed = 1;
9047ebbc
MV
1404
1405 ren1_src = ren1->pair->one->path;
1406 ren1_dst = ren1->pair->two->path;
1407
1408 if (ren2) {
461f5041 1409 /* One file renamed on both sides */
9047ebbc
MV
1410 const char *ren2_src = ren2->pair->one->path;
1411 const char *ren2_dst = ren2->pair->two->path;
4f66dade 1412 enum rename_type rename_type;
9047ebbc 1413 if (strcmp(ren1_src, ren2_src) != 0)
ef1177d1 1414 die("BUG: ren1_src != ren2_src");
9047ebbc
MV
1415 ren2->dst_entry->processed = 1;
1416 ren2->processed = 1;
1417 if (strcmp(ren1_dst, ren2_dst) != 0) {
4f66dade 1418 rename_type = RENAME_ONE_FILE_TO_TWO;
461f5041 1419 clean_merge = 0;
9047ebbc 1420 } else {
4f66dade 1421 rename_type = RENAME_ONE_FILE_TO_ONE;
7769a75e
EN
1422 /* BUG: We should only remove ren1_src in
1423 * the base stage (think of rename +
1424 * add-source cases).
1425 */
b7fa51da 1426 remove_file(o, 1, ren1_src, 1);
b8ddf164
EN
1427 update_entry(ren1->dst_entry,
1428 ren1->pair->one,
1429 ren1->pair->two,
1430 ren2->pair->two);
9047ebbc 1431 }
4f66dade
EN
1432 setup_rename_conflict_info(rename_type,
1433 ren1->pair,
1434 ren2->pair,
1435 branch1,
1436 branch2,
1437 ren1->dst_entry,
232c635f
EN
1438 ren2->dst_entry,
1439 o,
1440 NULL,
1441 NULL);
461f5041
EN
1442 } else if ((lookup = string_list_lookup(renames2Dst, ren1_dst))) {
1443 /* Two different files renamed to the same thing */
1444 char *ren2_dst;
1445 ren2 = lookup->util;
1446 ren2_dst = ren2->pair->two->path;
1447 if (strcmp(ren1_dst, ren2_dst) != 0)
ef1177d1 1448 die("BUG: ren1_dst != ren2_dst");
461f5041
EN
1449
1450 clean_merge = 0;
1451 ren2->processed = 1;
1452 /*
1453 * BUG: We should only mark src_entry as processed
1454 * if we are not dealing with a rename + add-source
1455 * case.
1456 */
1457 ren2->src_entry->processed = 1;
1458
1459 setup_rename_conflict_info(RENAME_TWO_FILES_TO_ONE,
1460 ren1->pair,
1461 ren2->pair,
1462 branch1,
1463 branch2,
1464 ren1->dst_entry,
232c635f
EN
1465 ren2->dst_entry,
1466 o,
1467 ren1->src_entry,
1468 ren2->src_entry);
1469
9047ebbc
MV
1470 } else {
1471 /* Renamed in 1, maybe changed in 2 */
9047ebbc
MV
1472 /* we only use sha1 and mode of these */
1473 struct diff_filespec src_other, dst_other;
41d70bd6 1474 int try_merge;
9047ebbc 1475
41d70bd6
EN
1476 /*
1477 * unpack_trees loads entries from common-commit
1478 * into stage 1, from head-commit into stage 2, and
1479 * from merge-commit into stage 3. We keep track
1480 * of which side corresponds to the rename.
1481 */
1482 int renamed_stage = a_renames == renames1 ? 2 : 3;
1483 int other_stage = a_renames == renames1 ? 3 : 2;
9047ebbc 1484
7769a75e
EN
1485 /* BUG: We should only remove ren1_src in the base
1486 * stage and in other_stage (think of rename +
1487 * add-source case).
1488 */
531357a4
EN
1489 remove_file(o, 1, ren1_src,
1490 renamed_stage == 2 || !was_tracked(ren1_src));
9047ebbc 1491
fd429e98 1492 oidcpy(&src_other.oid,
1493 &ren1->src_entry->stages[other_stage].oid);
41d70bd6 1494 src_other.mode = ren1->src_entry->stages[other_stage].mode;
fd429e98 1495 oidcpy(&dst_other.oid,
1496 &ren1->dst_entry->stages[other_stage].oid);
41d70bd6 1497 dst_other.mode = ren1->dst_entry->stages[other_stage].mode;
9047ebbc
MV
1498 try_merge = 0;
1499
b4da9d62 1500 if (oid_eq(&src_other.oid, &null_oid)) {
4f66dade
EN
1501 setup_rename_conflict_info(RENAME_DELETE,
1502 ren1->pair,
1503 NULL,
1504 branch1,
1505 branch2,
1506 ren1->dst_entry,
232c635f
EN
1507 NULL,
1508 o,
1509 NULL,
4f66dade 1510 NULL);
d5af5105 1511 } else if ((dst_other.mode == ren1->pair->two->mode) &&
b4da9d62 1512 oid_eq(&dst_other.oid, &ren1->pair->two->oid)) {
35a74abf
EN
1513 /*
1514 * Added file on the other side identical to
1515 * the file being renamed: clean merge.
1516 * Also, there is no need to overwrite the
1517 * file already in the working copy, so call
1518 * update_file_flags() instead of
1519 * update_file().
1520 */
75456f96
JS
1521 if (update_file_flags(o,
1522 &ren1->pair->two->oid,
1523 ren1->pair->two->mode,
1524 ren1_dst,
1525 1, /* update_cache */
1526 0 /* update_wd */))
1527 clean_merge = -1;
b4da9d62 1528 } else if (!oid_eq(&dst_other.oid, &null_oid)) {
9047ebbc
MV
1529 clean_merge = 0;
1530 try_merge = 1;
55653a68
JX
1531 output(o, 1, _("CONFLICT (rename/add): Rename %s->%s in %s. "
1532 "%s added in %s"),
9047ebbc
MV
1533 ren1_src, ren1_dst, branch1,
1534 ren1_dst, branch2);
c94736a2
JH
1535 if (o->call_depth) {
1536 struct merge_file_info mfi;
3c8a51e8
JS
1537 if (merge_file_one(o, ren1_dst, &null_oid, 0,
1538 &ren1->pair->two->oid,
1539 ren1->pair->two->mode,
1540 &dst_other.oid,
1541 dst_other.mode,
75456f96
JS
1542 branch1, branch2, &mfi)) {
1543 clean_merge = -1;
1544 goto cleanup_and_return;
1545 }
55653a68 1546 output(o, 1, _("Adding merged %s"), ren1_dst);
75456f96
JS
1547 if (update_file(o, 0, &mfi.oid,
1548 mfi.mode, ren1_dst))
1549 clean_merge = -1;
2a669c34 1550 try_merge = 0;
c94736a2 1551 } else {
3d6b8e88 1552 char *new_path = unique_path(o, ren1_dst, branch2);
55653a68 1553 output(o, 1, _("Adding as %s instead"), new_path);
75456f96
JS
1554 if (update_file(o, 0, &dst_other.oid,
1555 dst_other.mode, new_path))
1556 clean_merge = -1;
3d6b8e88 1557 free(new_path);
c94736a2 1558 }
9047ebbc
MV
1559 } else
1560 try_merge = 1;
1561
75456f96
JS
1562 if (clean_merge < 0)
1563 goto cleanup_and_return;
9047ebbc 1564 if (try_merge) {
8a2fce18 1565 struct diff_filespec *one, *a, *b;
9047ebbc
MV
1566 src_other.path = (char *)ren1_src;
1567
8a2fce18 1568 one = ren1->pair->one;
9047ebbc
MV
1569 if (a_renames == renames1) {
1570 a = ren1->pair->two;
1571 b = &src_other;
1572 } else {
1573 b = ren1->pair->two;
1574 a = &src_other;
1575 }
b8ddf164 1576 update_entry(ren1->dst_entry, one, a, b);
4f66dade
EN
1577 setup_rename_conflict_info(RENAME_NORMAL,
1578 ren1->pair,
1579 NULL,
1580 branch1,
1581 NULL,
1582 ren1->dst_entry,
232c635f
EN
1583 NULL,
1584 o,
1585 NULL,
4f66dade 1586 NULL);
9047ebbc
MV
1587 }
1588 }
1589 }
75456f96 1590cleanup_and_return:
9047ebbc
MV
1591 string_list_clear(&a_by_dst, 0);
1592 string_list_clear(&b_by_dst, 0);
1593
1594 return clean_merge;
1595}
1596
b4da9d62 1597static struct object_id *stage_oid(const struct object_id *oid, unsigned mode)
9047ebbc 1598{
b4da9d62 1599 return (is_null_oid(oid) || mode == 0) ? NULL: (struct object_id *)oid;
9047ebbc
MV
1600}
1601
bc9204d4
JS
1602static int read_oid_strbuf(struct merge_options *o,
1603 const struct object_id *oid, struct strbuf *dst)
331a1838
EB
1604{
1605 void *buf;
1606 enum object_type type;
1607 unsigned long size;
b4da9d62 1608 buf = read_sha1_file(oid->hash, &type, &size);
331a1838 1609 if (!buf)
bc9204d4 1610 return err(o, _("cannot read object %s"), oid_to_hex(oid));
331a1838
EB
1611 if (type != OBJ_BLOB) {
1612 free(buf);
bc9204d4 1613 return err(o, _("object %s is not a blob"), oid_to_hex(oid));
331a1838
EB
1614 }
1615 strbuf_attach(dst, buf, size, size + 1);
1616 return 0;
1617}
1618
bc9204d4
JS
1619static int blob_unchanged(struct merge_options *opt,
1620 const struct object_id *o_oid,
72fac66b 1621 unsigned o_mode,
b4da9d62 1622 const struct object_id *a_oid,
72fac66b 1623 unsigned a_mode,
3e7589b7 1624 int renormalize, const char *path)
331a1838
EB
1625{
1626 struct strbuf o = STRBUF_INIT;
1627 struct strbuf a = STRBUF_INIT;
1628 int ret = 0; /* assume changed for safety */
1629
72fac66b
JK
1630 if (a_mode != o_mode)
1631 return 0;
b4da9d62 1632 if (oid_eq(o_oid, a_oid))
331a1838 1633 return 1;
3e7589b7 1634 if (!renormalize)
331a1838
EB
1635 return 0;
1636
b4da9d62 1637 assert(o_oid && a_oid);
bc9204d4 1638 if (read_oid_strbuf(opt, o_oid, &o) || read_oid_strbuf(opt, a_oid, &a))
331a1838
EB
1639 goto error_return;
1640 /*
1641 * Note: binary | is used so that both renormalizations are
1642 * performed. Comparison can be skipped if both files are
1643 * unchanged since their sha1s have already been compared.
1644 */
1645 if (renormalize_buffer(path, o.buf, o.len, &o) |
422af49c 1646 renormalize_buffer(path, a.buf, a.len, &a))
331a1838
EB
1647 ret = (o.len == a.len && !memcmp(o.buf, a.buf, o.len));
1648
1649error_return:
1650 strbuf_release(&o);
1651 strbuf_release(&a);
1652 return ret;
1653}
1654
75456f96 1655static int handle_modify_delete(struct merge_options *o,
5e3ce663 1656 const char *path,
b4da9d62 1657 struct object_id *o_oid, int o_mode,
1658 struct object_id *a_oid, int a_mode,
1659 struct object_id *b_oid, int b_mode)
5e3ce663 1660{
75456f96
JS
1661 return handle_change_delete(o,
1662 path,
1663 o_oid, o_mode,
1664 a_oid, a_mode,
1665 b_oid, b_mode,
1666 _("modify"), _("modified"));
5e3ce663
EN
1667}
1668
0c4918d1
EN
1669static int merge_content(struct merge_options *o,
1670 const char *path,
b4da9d62 1671 struct object_id *o_oid, int o_mode,
1672 struct object_id *a_oid, int a_mode,
1673 struct object_id *b_oid, int b_mode,
4f66dade 1674 struct rename_conflict_info *rename_conflict_info)
0c4918d1 1675{
55653a68 1676 const char *reason = _("content");
5b448b85 1677 const char *path1 = NULL, *path2 = NULL;
0c4918d1
EN
1678 struct merge_file_info mfi;
1679 struct diff_filespec one, a, b;
4ab9a157 1680 unsigned df_conflict_remains = 0;
0c4918d1 1681
b4da9d62 1682 if (!o_oid) {
55653a68 1683 reason = _("add/add");
b4da9d62 1684 o_oid = (struct object_id *)&null_oid;
0c4918d1
EN
1685 }
1686 one.path = a.path = b.path = (char *)path;
b4da9d62 1687 oidcpy(&one.oid, o_oid);
0c4918d1 1688 one.mode = o_mode;
b4da9d62 1689 oidcpy(&a.oid, a_oid);
0c4918d1 1690 a.mode = a_mode;
b4da9d62 1691 oidcpy(&b.oid, b_oid);
0c4918d1
EN
1692 b.mode = b_mode;
1693
3c217c07 1694 if (rename_conflict_info) {
3c217c07
EN
1695 struct diff_filepair *pair1 = rename_conflict_info->pair1;
1696
1697 path1 = (o->branch1 == rename_conflict_info->branch1) ?
1698 pair1->two->path : pair1->one->path;
1699 /* If rename_conflict_info->pair2 != NULL, we are in
1700 * RENAME_ONE_FILE_TO_ONE case. Otherwise, we have a
1701 * normal rename.
1702 */
1703 path2 = (rename_conflict_info->pair2 ||
1704 o->branch2 == rename_conflict_info->branch1) ?
1705 pair1->two->path : pair1->one->path;
3c217c07
EN
1706
1707 if (dir_in_way(path, !o->call_depth))
1708 df_conflict_remains = 1;
4ab9a157 1709 }
3c8a51e8
JS
1710 if (merge_file_special_markers(o, &one, &a, &b,
1711 o->branch1, path1,
1712 o->branch2, path2, &mfi))
1713 return -1;
4ab9a157
EN
1714
1715 if (mfi.clean && !df_conflict_remains &&
b4da9d62 1716 oid_eq(&mfi.oid, a_oid) && mfi.mode == a_mode) {
5b448b85 1717 int path_renamed_outside_HEAD;
55653a68 1718 output(o, 3, _("Skipped %s (merged same as existing)"), path);
5b448b85
EN
1719 /*
1720 * The content merge resulted in the same file contents we
1721 * already had. We can return early if those file contents
1722 * are recorded at the correct path (which may not be true
1723 * if the merge involves a rename).
1724 */
1725 path_renamed_outside_HEAD = !path2 || !strcmp(path, path2);
1726 if (!path_renamed_outside_HEAD) {
bc9204d4 1727 add_cacheinfo(o, mfi.mode, &mfi.oid, path,
d45b7f40 1728 0, (!o->call_depth), 0);
5b448b85
EN
1729 return mfi.clean;
1730 }
1731 } else
55653a68 1732 output(o, 2, _("Auto-merging %s"), path);
0c4918d1
EN
1733
1734 if (!mfi.clean) {
1735 if (S_ISGITLINK(mfi.mode))
55653a68
JX
1736 reason = _("submodule");
1737 output(o, 1, _("CONFLICT (%s): Merge conflict in %s"),
0c4918d1 1738 reason, path);
4f66dade 1739 if (rename_conflict_info && !df_conflict_remains)
bc9204d4 1740 if (update_stages(o, path, &one, &a, &b))
75456f96 1741 return -1;
0c4918d1
EN
1742 }
1743
4ab9a157 1744 if (df_conflict_remains) {
3d6b8e88 1745 char *new_path;
51931bf0
EN
1746 if (o->call_depth) {
1747 remove_file_from_cache(path);
1748 } else {
75456f96 1749 if (!mfi.clean) {
bc9204d4 1750 if (update_stages(o, path, &one, &a, &b))
75456f96
JS
1751 return -1;
1752 } else {
51931bf0
EN
1753 int file_from_stage2 = was_tracked(path);
1754 struct diff_filespec merged;
9b561499 1755 oidcpy(&merged.oid, &mfi.oid);
51931bf0
EN
1756 merged.mode = mfi.mode;
1757
bc9204d4 1758 if (update_stages(o, path, NULL,
75456f96
JS
1759 file_from_stage2 ? &merged : NULL,
1760 file_from_stage2 ? NULL : &merged))
1761 return -1;
51931bf0
EN
1762 }
1763
1764 }
4f66dade 1765 new_path = unique_path(o, path, rename_conflict_info->branch1);
55653a68 1766 output(o, 1, _("Adding as %s instead"), new_path);
75456f96
JS
1767 if (update_file(o, 0, &mfi.oid, mfi.mode, new_path)) {
1768 free(new_path);
1769 return -1;
1770 }
3d6b8e88 1771 free(new_path);
51931bf0 1772 mfi.clean = 0;
75456f96
JS
1773 } else if (update_file(o, mfi.clean, &mfi.oid, mfi.mode, path))
1774 return -1;
0c4918d1 1775 return mfi.clean;
0c4918d1
EN
1776}
1777
9047ebbc 1778/* Per entry merge function */
8a2fce18
MV
1779static int process_entry(struct merge_options *o,
1780 const char *path, struct stage_data *entry)
9047ebbc 1781{
9047ebbc 1782 int clean_merge = 1;
1bc0ab7c 1783 int normalize = o->renormalize;
9047ebbc
MV
1784 unsigned o_mode = entry->stages[1].mode;
1785 unsigned a_mode = entry->stages[2].mode;
1786 unsigned b_mode = entry->stages[3].mode;
b4da9d62 1787 struct object_id *o_oid = stage_oid(&entry->stages[1].oid, o_mode);
1788 struct object_id *a_oid = stage_oid(&entry->stages[2].oid, a_mode);
1789 struct object_id *b_oid = stage_oid(&entry->stages[3].oid, b_mode);
9047ebbc 1790
37348937 1791 entry->processed = 1;
4f66dade
EN
1792 if (entry->rename_conflict_info) {
1793 struct rename_conflict_info *conflict_info = entry->rename_conflict_info;
07413c5a 1794 switch (conflict_info->rename_type) {
882fd11a 1795 case RENAME_NORMAL:
4f66dade 1796 case RENAME_ONE_FILE_TO_ONE:
882fd11a 1797 clean_merge = merge_content(o, path,
b4da9d62 1798 o_oid, o_mode, a_oid, a_mode, b_oid, b_mode,
4f66dade 1799 conflict_info);
882fd11a 1800 break;
3b130adf
EN
1801 case RENAME_DELETE:
1802 clean_merge = 0;
75456f96
JS
1803 if (conflict_rename_delete(o,
1804 conflict_info->pair1,
1805 conflict_info->branch1,
1806 conflict_info->branch2))
1807 clean_merge = -1;
3b130adf 1808 break;
07413c5a 1809 case RENAME_ONE_FILE_TO_TWO:
07413c5a 1810 clean_merge = 0;
75456f96
JS
1811 if (conflict_rename_rename_1to2(o, conflict_info))
1812 clean_merge = -1;
07413c5a 1813 break;
461f5041
EN
1814 case RENAME_TWO_FILES_TO_ONE:
1815 clean_merge = 0;
75456f96
JS
1816 if (conflict_rename_rename_2to1(o, conflict_info))
1817 clean_merge = -1;
07413c5a
EN
1818 break;
1819 default:
1820 entry->processed = 0;
1821 break;
1822 }
b4da9d62 1823 } else if (o_oid && (!a_oid || !b_oid)) {
edd2faf5 1824 /* Case A: Deleted in one */
b4da9d62 1825 if ((!a_oid && !b_oid) ||
bc9204d4
JS
1826 (!b_oid && blob_unchanged(o, o_oid, o_mode, a_oid, a_mode, normalize, path)) ||
1827 (!a_oid && blob_unchanged(o, o_oid, o_mode, b_oid, b_mode, normalize, path))) {
edd2faf5
EN
1828 /* Deleted in both or deleted in one and
1829 * unchanged in the other */
b4da9d62 1830 if (a_oid)
55653a68 1831 output(o, 2, _("Removing %s"), path);
edd2faf5 1832 /* do not touch working file if it did not exist */
b4da9d62 1833 remove_file(o, 1, path, !a_oid);
edd2faf5
EN
1834 } else {
1835 /* Modify/delete; deleted side may have put a directory in the way */
edd2faf5 1836 clean_merge = 0;
75456f96
JS
1837 if (handle_modify_delete(o, path, o_oid, o_mode,
1838 a_oid, a_mode, b_oid, b_mode))
1839 clean_merge = -1;
3d6b8e88 1840 }
b4da9d62 1841 } else if ((!o_oid && a_oid && !b_oid) ||
1842 (!o_oid && !a_oid && b_oid)) {
edd2faf5
EN
1843 /* Case B: Added in one. */
1844 /* [nothing|directory] -> ([nothing|directory], file) */
1845
9c0bbb50
EN
1846 const char *add_branch;
1847 const char *other_branch;
1848 unsigned mode;
b4da9d62 1849 const struct object_id *oid;
9c0bbb50 1850 const char *conf;
37348937 1851
b4da9d62 1852 if (a_oid) {
9c0bbb50
EN
1853 add_branch = o->branch1;
1854 other_branch = o->branch2;
1855 mode = a_mode;
b4da9d62 1856 oid = a_oid;
55653a68 1857 conf = _("file/directory");
9c0bbb50
EN
1858 } else {
1859 add_branch = o->branch2;
1860 other_branch = o->branch1;
1861 mode = b_mode;
b4da9d62 1862 oid = b_oid;
55653a68 1863 conf = _("directory/file");
9c0bbb50 1864 }
f2507b4e 1865 if (dir_in_way(path, !o->call_depth)) {
3d6b8e88 1866 char *new_path = unique_path(o, path, add_branch);
9c0bbb50 1867 clean_merge = 0;
55653a68
JX
1868 output(o, 1, _("CONFLICT (%s): There is a directory with name %s in %s. "
1869 "Adding %s as %s"),
9c0bbb50 1870 conf, path, other_branch, path, new_path);
75456f96
JS
1871 if (update_file(o, 0, oid, mode, new_path))
1872 clean_merge = -1;
1873 else if (o->call_depth)
7b1c610f 1874 remove_file_from_cache(path);
3d6b8e88 1875 free(new_path);
9c0bbb50 1876 } else {
55653a68 1877 output(o, 2, _("Adding %s"), path);
35a74abf 1878 /* do not overwrite file if already present */
75456f96
JS
1879 if (update_file_flags(o, oid, mode, path, 1, !a_oid))
1880 clean_merge = -1;
9c0bbb50 1881 }
b4da9d62 1882 } else if (a_oid && b_oid) {
edd2faf5
EN
1883 /* Case C: Added in both (check for same permissions) and */
1884 /* case D: Modified in both, but differently. */
4f66dade 1885 clean_merge = merge_content(o, path,
b4da9d62 1886 o_oid, o_mode, a_oid, a_mode, b_oid, b_mode,
edd2faf5 1887 NULL);
b4da9d62 1888 } else if (!o_oid && !a_oid && !b_oid) {
edd2faf5
EN
1889 /*
1890 * this entry was deleted altogether. a_mode == 0 means
1891 * we had that path and want to actively remove it.
1892 */
1893 remove_file(o, 1, path, !a_mode);
1894 } else
7e97e100 1895 die("BUG: fatal merge failure, shouldn't happen.");
37348937
EN
1896
1897 return clean_merge;
1898}
1899
8a2fce18
MV
1900int merge_trees(struct merge_options *o,
1901 struct tree *head,
9047ebbc
MV
1902 struct tree *merge,
1903 struct tree *common,
9047ebbc
MV
1904 struct tree **result)
1905{
1906 int code, clean;
1907
85e51b78
JH
1908 if (o->subtree_shift) {
1909 merge = shift_tree_object(head, merge, o->subtree_shift);
1910 common = shift_tree_object(head, common, o->subtree_shift);
9047ebbc
MV
1911 }
1912
b4da9d62 1913 if (oid_eq(&common->object.oid, &merge->object.oid)) {
55653a68 1914 output(o, 0, _("Already up-to-date!"));
9047ebbc
MV
1915 *result = head;
1916 return 1;
1917 }
1918
b7fa51da 1919 code = git_merge_trees(o->call_depth, common, head, merge);
9047ebbc 1920
fadd069d
JH
1921 if (code != 0) {
1922 if (show(o, 4) || o->call_depth)
bc9204d4 1923 err(o, _("merging of trees %s and %s failed"),
f2fd0760 1924 oid_to_hex(&head->object.oid),
1925 oid_to_hex(&merge->object.oid));
6003303a 1926 return -1;
fadd069d 1927 }
9047ebbc
MV
1928
1929 if (unmerged_cache()) {
1930 struct string_list *entries, *re_head, *re_merge;
1931 int i;
696ee23c
MV
1932 string_list_clear(&o->current_file_set, 1);
1933 string_list_clear(&o->current_directory_set, 1);
1934 get_files_dirs(o, head);
1935 get_files_dirs(o, merge);
9047ebbc
MV
1936
1937 entries = get_unmerged();
70cc3d36 1938 record_df_conflict_files(o, entries);
8a2fce18
MV
1939 re_head = get_renames(o, head, common, head, merge, entries);
1940 re_merge = get_renames(o, merge, common, head, merge, entries);
1941 clean = process_renames(o, re_head, re_merge);
75456f96
JS
1942 if (clean < 0)
1943 return clean;
edd2faf5 1944 for (i = entries->nr-1; 0 <= i; i--) {
9047ebbc
MV
1945 const char *path = entries->items[i].string;
1946 struct stage_data *e = entries->items[i].util;
75456f96
JS
1947 if (!e->processed) {
1948 int ret = process_entry(o, path, e);
1949 if (!ret)
1950 clean = 0;
1951 else if (ret < 0)
1952 return ret;
1953 }
9047ebbc 1954 }
7edba4c4
JH
1955 for (i = 0; i < entries->nr; i++) {
1956 struct stage_data *e = entries->items[i].util;
1957 if (!e->processed)
7e97e100 1958 die("BUG: unprocessed path??? %s",
7edba4c4
JH
1959 entries->items[i].string);
1960 }
9047ebbc
MV
1961
1962 string_list_clear(re_merge, 0);
1963 string_list_clear(re_head, 0);
1964 string_list_clear(entries, 1);
1965
473091e2
SB
1966 free(re_merge);
1967 free(re_head);
1968 free(entries);
9047ebbc
MV
1969 }
1970 else
1971 clean = 1;
1972
fbc87eb5
JS
1973 if (o->call_depth && !(*result = write_tree_from_memory(o)))
1974 return -1;
9047ebbc
MV
1975
1976 return clean;
1977}
1978
1979static struct commit_list *reverse_commit_list(struct commit_list *list)
1980{
1981 struct commit_list *next = NULL, *current, *backup;
1982 for (current = list; current; current = backup) {
1983 backup = current->next;
1984 current->next = next;
1985 next = current;
1986 }
1987 return next;
1988}
1989
1990/*
1991 * Merge the commits h1 and h2, return the resulting virtual
1992 * commit object and a flag indicating the cleanness of the merge.
1993 */
8a2fce18
MV
1994int merge_recursive(struct merge_options *o,
1995 struct commit *h1,
9047ebbc 1996 struct commit *h2,
9047ebbc
MV
1997 struct commit_list *ca,
1998 struct commit **result)
1999{
2000 struct commit_list *iter;
2001 struct commit *merged_common_ancestors;
2002 struct tree *mrtree = mrtree;
2003 int clean;
2004
8a2fce18 2005 if (show(o, 4)) {
55653a68 2006 output(o, 4, _("Merging:"));
5033639c
MV
2007 output_commit_title(o, h1);
2008 output_commit_title(o, h2);
9047ebbc
MV
2009 }
2010
2011 if (!ca) {
2ce406cc 2012 ca = get_merge_bases(h1, h2);
9047ebbc
MV
2013 ca = reverse_commit_list(ca);
2014 }
2015
8a2fce18 2016 if (show(o, 5)) {
e0453cd8
RT
2017 unsigned cnt = commit_list_count(ca);
2018
2019 output(o, 5, Q_("found %u common ancestor:",
2020 "found %u common ancestors:", cnt), cnt);
9047ebbc 2021 for (iter = ca; iter; iter = iter->next)
5033639c 2022 output_commit_title(o, iter->item);
9047ebbc
MV
2023 }
2024
2025 merged_common_ancestors = pop_commit(&ca);
2026 if (merged_common_ancestors == NULL) {
03f622c8
JN
2027 /* if there is no common ancestor, use an empty tree */
2028 struct tree *tree;
9047ebbc 2029
cba595bd 2030 tree = lookup_tree(EMPTY_TREE_SHA1_BIN);
9047ebbc
MV
2031 merged_common_ancestors = make_virtual_commit(tree, "ancestor");
2032 }
2033
2034 for (iter = ca; iter; iter = iter->next) {
8a2fce18 2035 const char *saved_b1, *saved_b2;
5033639c 2036 o->call_depth++;
9047ebbc
MV
2037 /*
2038 * When the merge fails, the result contains files
2039 * with conflict markers. The cleanness flag is
de8946de
JS
2040 * ignored (unless indicating an error), it was never
2041 * actually used, as result of merge_trees has always
2042 * overwritten it: the committed "conflicts" were
2043 * already resolved.
9047ebbc
MV
2044 */
2045 discard_cache();
8a2fce18
MV
2046 saved_b1 = o->branch1;
2047 saved_b2 = o->branch2;
2048 o->branch1 = "Temporary merge branch 1";
2049 o->branch2 = "Temporary merge branch 2";
de8946de
JS
2050 if (merge_recursive(o, merged_common_ancestors, iter->item,
2051 NULL, &merged_common_ancestors) < 0)
2052 return -1;
8a2fce18
MV
2053 o->branch1 = saved_b1;
2054 o->branch2 = saved_b2;
5033639c 2055 o->call_depth--;
9047ebbc
MV
2056
2057 if (!merged_common_ancestors)
bc9204d4 2058 return err(o, _("merge returned no commit"));
9047ebbc
MV
2059 }
2060
2061 discard_cache();
b7fa51da 2062 if (!o->call_depth)
9047ebbc 2063 read_cache();
9047ebbc 2064
7ca56aa0 2065 o->ancestor = "merged common ancestors";
8a2fce18
MV
2066 clean = merge_trees(o, h1->tree, h2->tree, merged_common_ancestors->tree,
2067 &mrtree);
6999bc70
JS
2068 if (clean < 0) {
2069 flush_output(o);
de8946de 2070 return clean;
6999bc70 2071 }
9047ebbc 2072
b7fa51da 2073 if (o->call_depth) {
9047ebbc
MV
2074 *result = make_virtual_commit(mrtree, "merged tree");
2075 commit_list_insert(h1, &(*result)->parents);
2076 commit_list_insert(h2, &(*result)->parents->next);
2077 }
c7d84924 2078 flush_output(o);
548009c0
JS
2079 if (!o->call_depth && o->buffer_output < 2)
2080 strbuf_release(&o->obuf);
f31027c9
JH
2081 if (show(o, 2))
2082 diff_warn_rename_limit("merge.renamelimit",
2083 o->needed_rename_limit, 0);
9047ebbc
MV
2084 return clean;
2085}
2086
4e8161a8 2087static struct commit *get_ref(const struct object_id *oid, const char *name)
73118f89
SB
2088{
2089 struct object *object;
2090
4e8161a8 2091 object = deref_tag(parse_object(oid->hash), name, strlen(name));
73118f89
SB
2092 if (!object)
2093 return NULL;
2094 if (object->type == OBJ_TREE)
2095 return make_virtual_commit((struct tree*)object, name);
2096 if (object->type != OBJ_COMMIT)
2097 return NULL;
2098 if (parse_commit((struct commit *)object))
2099 return NULL;
2100 return (struct commit *)object;
2101}
2102
8a2fce18 2103int merge_recursive_generic(struct merge_options *o,
4e8161a8 2104 const struct object_id *head,
2105 const struct object_id *merge,
8a2fce18 2106 int num_base_list,
4e8161a8 2107 const struct object_id **base_list,
8a2fce18 2108 struct commit **result)
73118f89 2109{
03b86647 2110 int clean;
73118f89 2111 struct lock_file *lock = xcalloc(1, sizeof(struct lock_file));
8a2fce18
MV
2112 struct commit *head_commit = get_ref(head, o->branch1);
2113 struct commit *next_commit = get_ref(merge, o->branch2);
73118f89
SB
2114 struct commit_list *ca = NULL;
2115
2116 if (base_list) {
2117 int i;
8a2fce18 2118 for (i = 0; i < num_base_list; ++i) {
73118f89 2119 struct commit *base;
4e8161a8 2120 if (!(base = get_ref(base_list[i], oid_to_hex(base_list[i]))))
bc9204d4 2121 return err(o, _("Could not parse object '%s'"),
4e8161a8 2122 oid_to_hex(base_list[i]));
73118f89
SB
2123 commit_list_insert(base, &ca);
2124 }
2125 }
2126
03b86647 2127 hold_locked_index(lock, 1);
8a2fce18
MV
2128 clean = merge_recursive(o, head_commit, next_commit, ca,
2129 result);
de8946de
JS
2130 if (clean < 0)
2131 return clean;
2132
73118f89 2133 if (active_cache_changed &&
03b86647 2134 write_locked_index(&the_index, lock, COMMIT_LOCK))
bc9204d4 2135 return err(o, _("Unable to write index."));
73118f89
SB
2136
2137 return clean ? 0 : 1;
2138}
2139
0e7bcb1b 2140static void merge_recursive_config(struct merge_options *o)
9047ebbc 2141{
0e7bcb1b
TA
2142 git_config_get_int("merge.verbosity", &o->verbosity);
2143 git_config_get_int("diff.renamelimit", &o->diff_rename_limit);
2144 git_config_get_int("merge.renamelimit", &o->merge_rename_limit);
2145 git_config(git_xmerge_config, NULL);
9047ebbc
MV
2146}
2147
8a2fce18 2148void init_merge_options(struct merge_options *o)
9047ebbc 2149{
8a2fce18
MV
2150 memset(o, 0, sizeof(struct merge_options));
2151 o->verbosity = 2;
2152 o->buffer_output = 1;
2153 o->diff_rename_limit = -1;
2154 o->merge_rename_limit = -1;
7610fa57 2155 o->renormalize = 0;
d2b11eca 2156 o->detect_rename = 1;
0e7bcb1b 2157 merge_recursive_config(o);
9047ebbc 2158 if (getenv("GIT_MERGE_VERBOSITY"))
8a2fce18 2159 o->verbosity =
9047ebbc 2160 strtol(getenv("GIT_MERGE_VERBOSITY"), NULL, 10);
8a2fce18
MV
2161 if (o->verbosity >= 5)
2162 o->buffer_output = 0;
c7d84924 2163 strbuf_init(&o->obuf, 0);
f93d7c6f
TA
2164 string_list_init(&o->current_file_set, 1);
2165 string_list_init(&o->current_directory_set, 1);
2166 string_list_init(&o->df_conflict_file_set, 1);
9047ebbc 2167}
635a7bb1
JN
2168
2169int parse_merge_opt(struct merge_options *o, const char *s)
2170{
95b567c7
JK
2171 const char *arg;
2172
635a7bb1
JN
2173 if (!s || !*s)
2174 return -1;
2175 if (!strcmp(s, "ours"))
2176 o->recursive_variant = MERGE_RECURSIVE_OURS;
2177 else if (!strcmp(s, "theirs"))
2178 o->recursive_variant = MERGE_RECURSIVE_THEIRS;
2179 else if (!strcmp(s, "subtree"))
2180 o->subtree_shift = "";
95b567c7
JK
2181 else if (skip_prefix(s, "subtree=", &arg))
2182 o->subtree_shift = arg;
58a1ece4 2183 else if (!strcmp(s, "patience"))
307ab20b 2184 o->xdl_opts = DIFF_WITH_ALG(o, PATIENCE_DIFF);
8c912eea 2185 else if (!strcmp(s, "histogram"))
307ab20b 2186 o->xdl_opts = DIFF_WITH_ALG(o, HISTOGRAM_DIFF);
95b567c7
JK
2187 else if (skip_prefix(s, "diff-algorithm=", &arg)) {
2188 long value = parse_algorithm_value(arg);
07924d4d
MP
2189 if (value < 0)
2190 return -1;
2191 /* clear out previous settings */
2192 DIFF_XDL_CLR(o, NEED_MINIMAL);
2193 o->xdl_opts &= ~XDF_DIFF_ALGORITHM_MASK;
2194 o->xdl_opts |= value;
2195 }
4e5dd044
JF
2196 else if (!strcmp(s, "ignore-space-change"))
2197 o->xdl_opts |= XDF_IGNORE_WHITESPACE_CHANGE;
2198 else if (!strcmp(s, "ignore-all-space"))
2199 o->xdl_opts |= XDF_IGNORE_WHITESPACE;
2200 else if (!strcmp(s, "ignore-space-at-eol"))
2201 o->xdl_opts |= XDF_IGNORE_WHITESPACE_AT_EOL;
635a7bb1
JN
2202 else if (!strcmp(s, "renormalize"))
2203 o->renormalize = 1;
2204 else if (!strcmp(s, "no-renormalize"))
2205 o->renormalize = 0;
d2b11eca
FGA
2206 else if (!strcmp(s, "no-renames"))
2207 o->detect_rename = 0;
87892f60 2208 else if (!strcmp(s, "find-renames")) {
1b47ad16 2209 o->detect_rename = 1;
87892f60
FGA
2210 o->rename_score = 0;
2211 }
1b47ad16
FGA
2212 else if (skip_prefix(s, "find-renames=", &arg) ||
2213 skip_prefix(s, "rename-threshold=", &arg)) {
95b567c7 2214 if ((o->rename_score = parse_rename_score(&arg)) == -1 || *arg != 0)
10ae7526 2215 return -1;
d2b11eca 2216 o->detect_rename = 1;
10ae7526 2217 }
635a7bb1
JN
2218 else
2219 return -1;
2220 return 0;
2221}