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