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