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