merge-recursive: do not die on a conflicting submodule
[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"
7#include "cache-tree.h"
8#include "commit.h"
9#include "blob.h"
10#include "builtin.h"
11#include "tree-walk.h"
12#include "diff.h"
13#include "diffcore.h"
14#include "tag.h"
15#include "unpack-trees.h"
16#include "string-list.h"
17#include "xdiff-interface.h"
18#include "ll-merge.h"
9047ebbc
MV
19#include "attr.h"
20#include "merge-recursive.h"
9800c0df 21#include "dir.h"
9047ebbc 22
9047ebbc
MV
23static struct tree *shift_tree_object(struct tree *one, struct tree *two)
24{
25 unsigned char shifted[20];
26
27 /*
28 * NEEDSWORK: this limits the recursion depth to hardcoded
29 * value '2' to avoid excessive overhead.
30 */
31 shift_tree(one->object.sha1, two->object.sha1, shifted, 2);
32 if (!hashcmp(two->object.sha1, shifted))
33 return two;
34 return lookup_tree(shifted);
35}
36
37/*
a6f63ae0 38 * A virtual commit has (const char *)commit->util set to the name.
9047ebbc
MV
39 */
40
41struct commit *make_virtual_commit(struct tree *tree, const char *comment)
42{
43 struct commit *commit = xcalloc(1, sizeof(struct commit));
9047ebbc
MV
44 commit->tree = tree;
45 commit->util = (void*)comment;
9047ebbc
MV
46 /* avoid warnings */
47 commit->object.parsed = 1;
48 return commit;
49}
50
51/*
52 * Since we use get_tree_entry(), which does not put the read object into
53 * the object pool, we cannot rely on a == b.
54 */
55static int sha_eq(const unsigned char *a, const unsigned char *b)
56{
57 if (!a && !b)
58 return 2;
59 return a && b && hashcmp(a, b) == 0;
60}
61
62/*
63 * Since we want to write the index eventually, we cannot reuse the index
64 * for these (temporary) data.
65 */
66struct stage_data
67{
68 struct
69 {
70 unsigned mode;
71 unsigned char sha[20];
72 } stages[4];
73 unsigned processed:1;
74};
75
8a2fce18 76static int show(struct merge_options *o, int v)
9047ebbc 77{
5033639c 78 return (!o->call_depth && o->verbosity >= v) || o->verbosity >= 5;
9047ebbc
MV
79}
80
c7d84924 81static void flush_output(struct merge_options *o)
9047ebbc 82{
c7d84924
MV
83 if (o->obuf.len) {
84 fputs(o->obuf.buf, stdout);
85 strbuf_reset(&o->obuf);
9047ebbc
MV
86 }
87}
88
8a2fce18 89static void output(struct merge_options *o, int v, const char *fmt, ...)
9047ebbc
MV
90{
91 int len;
92 va_list ap;
93
8a2fce18 94 if (!show(o, v))
9047ebbc
MV
95 return;
96
c7d84924
MV
97 strbuf_grow(&o->obuf, o->call_depth * 2 + 2);
98 memset(o->obuf.buf + o->obuf.len, ' ', o->call_depth * 2);
99 strbuf_setlen(&o->obuf, o->obuf.len + o->call_depth * 2);
9047ebbc
MV
100
101 va_start(ap, fmt);
c7d84924 102 len = vsnprintf(o->obuf.buf + o->obuf.len, strbuf_avail(&o->obuf), fmt, ap);
9047ebbc
MV
103 va_end(ap);
104
105 if (len < 0)
106 len = 0;
c7d84924
MV
107 if (len >= strbuf_avail(&o->obuf)) {
108 strbuf_grow(&o->obuf, len + 2);
9047ebbc 109 va_start(ap, fmt);
c7d84924 110 len = vsnprintf(o->obuf.buf + o->obuf.len, strbuf_avail(&o->obuf), fmt, ap);
9047ebbc 111 va_end(ap);
c7d84924 112 if (len >= strbuf_avail(&o->obuf)) {
9047ebbc
MV
113 die("this should not happen, your snprintf is broken");
114 }
115 }
c7d84924
MV
116 strbuf_setlen(&o->obuf, o->obuf.len + len);
117 strbuf_add(&o->obuf, "\n", 1);
8a2fce18 118 if (!o->buffer_output)
c7d84924 119 flush_output(o);
9047ebbc
MV
120}
121
5033639c 122static void output_commit_title(struct merge_options *o, struct commit *commit)
9047ebbc
MV
123{
124 int i;
c7d84924 125 flush_output(o);
5033639c 126 for (i = o->call_depth; i--;)
9047ebbc
MV
127 fputs(" ", stdout);
128 if (commit->util)
129 printf("virtual %s\n", (char *)commit->util);
130 else {
131 printf("%s ", find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV));
132 if (parse_commit(commit) != 0)
133 printf("(bad commit)\n");
134 else {
135 const char *s;
136 int len;
137 for (s = commit->buffer; *s; s++)
138 if (*s == '\n' && s[1] == '\n') {
139 s += 2;
140 break;
141 }
142 for (len = 0; s[len] && '\n' != s[len]; len++)
143 ; /* do nothing */
144 printf("%.*s\n", len, s);
145 }
146 }
147}
148
149static int add_cacheinfo(unsigned int mode, const unsigned char *sha1,
150 const char *path, int stage, int refresh, int options)
151{
152 struct cache_entry *ce;
153 ce = make_cache_entry(mode, sha1 ? sha1 : null_sha1, path, stage, refresh);
154 if (!ce)
155 return error("addinfo_cache failed for path '%s'", path);
156 return add_cache_entry(ce, options);
157}
158
9047ebbc
MV
159static void init_tree_desc_from_tree(struct tree_desc *desc, struct tree *tree)
160{
161 parse_tree(tree);
162 init_tree_desc(desc, tree->buffer, tree->size);
163}
164
165static int git_merge_trees(int index_only,
166 struct tree *common,
167 struct tree *head,
168 struct tree *merge)
169{
170 int rc;
171 struct tree_desc t[3];
172 struct unpack_trees_options opts;
173
174 memset(&opts, 0, sizeof(opts));
175 if (index_only)
176 opts.index_only = 1;
177 else
178 opts.update = 1;
179 opts.merge = 1;
180 opts.head_idx = 2;
181 opts.fn = threeway_merge;
182 opts.src_index = &the_index;
183 opts.dst_index = &the_index;
184
185 init_tree_desc_from_tree(t+0, common);
186 init_tree_desc_from_tree(t+1, head);
187 init_tree_desc_from_tree(t+2, merge);
188
189 rc = unpack_trees(3, t, &opts);
190 cache_tree_free(&active_cache_tree);
191 return rc;
192}
193
8a2fce18 194struct tree *write_tree_from_memory(struct merge_options *o)
9047ebbc
MV
195{
196 struct tree *result = NULL;
197
198 if (unmerged_cache()) {
199 int i;
8a2fce18 200 output(o, 0, "There are unmerged index entries:");
9047ebbc
MV
201 for (i = 0; i < active_nr; i++) {
202 struct cache_entry *ce = active_cache[i];
203 if (ce_stage(ce))
8a2fce18 204 output(o, 0, "%d %.*s", ce_stage(ce), ce_namelen(ce), ce->name);
9047ebbc
MV
205 }
206 return NULL;
207 }
208
209 if (!active_cache_tree)
210 active_cache_tree = cache_tree();
211
212 if (!cache_tree_fully_valid(active_cache_tree) &&
213 cache_tree_update(active_cache_tree,
214 active_cache, active_nr, 0, 0) < 0)
215 die("error building trees");
216
217 result = lookup_tree(active_cache_tree->sha1);
218
219 return result;
220}
221
222static int save_files_dirs(const unsigned char *sha1,
223 const char *base, int baselen, const char *path,
224 unsigned int mode, int stage, void *context)
225{
226 int len = strlen(path);
227 char *newpath = xmalloc(baselen + len + 1);
696ee23c
MV
228 struct merge_options *o = context;
229
9047ebbc
MV
230 memcpy(newpath, base, baselen);
231 memcpy(newpath + baselen, path, len);
232 newpath[baselen + len] = '\0';
233
234 if (S_ISDIR(mode))
696ee23c 235 string_list_insert(newpath, &o->current_directory_set);
9047ebbc 236 else
696ee23c 237 string_list_insert(newpath, &o->current_file_set);
9047ebbc
MV
238 free(newpath);
239
d3bee161 240 return (S_ISDIR(mode) ? READ_TREE_RECURSIVE : 0);
9047ebbc
MV
241}
242
696ee23c 243static int get_files_dirs(struct merge_options *o, struct tree *tree)
9047ebbc
MV
244{
245 int n;
696ee23c 246 if (read_tree_recursive(tree, "", 0, 0, NULL, save_files_dirs, o))
9047ebbc 247 return 0;
696ee23c 248 n = o->current_file_set.nr + o->current_directory_set.nr;
9047ebbc
MV
249 return n;
250}
251
252/*
253 * Returns an index_entry instance which doesn't have to correspond to
254 * a real cache entry in Git's index.
255 */
256static struct stage_data *insert_stage_data(const char *path,
257 struct tree *o, struct tree *a, struct tree *b,
258 struct string_list *entries)
259{
260 struct string_list_item *item;
261 struct stage_data *e = xcalloc(1, sizeof(struct stage_data));
262 get_tree_entry(o->object.sha1, path,
263 e->stages[1].sha, &e->stages[1].mode);
264 get_tree_entry(a->object.sha1, path,
265 e->stages[2].sha, &e->stages[2].mode);
266 get_tree_entry(b->object.sha1, path,
267 e->stages[3].sha, &e->stages[3].mode);
268 item = string_list_insert(path, entries);
269 item->util = e;
270 return e;
271}
272
273/*
274 * Create a dictionary mapping file names to stage_data objects. The
275 * dictionary contains one entry for every path with a non-zero stage entry.
276 */
277static struct string_list *get_unmerged(void)
278{
279 struct string_list *unmerged = xcalloc(1, sizeof(struct string_list));
280 int i;
281
282 unmerged->strdup_strings = 1;
283
284 for (i = 0; i < active_nr; i++) {
285 struct string_list_item *item;
286 struct stage_data *e;
287 struct cache_entry *ce = active_cache[i];
288 if (!ce_stage(ce))
289 continue;
290
291 item = string_list_lookup(ce->name, unmerged);
292 if (!item) {
293 item = string_list_insert(ce->name, unmerged);
294 item->util = xcalloc(1, sizeof(struct stage_data));
295 }
296 e = item->util;
297 e->stages[ce_stage(ce)].mode = ce->ce_mode;
298 hashcpy(e->stages[ce_stage(ce)].sha, ce->sha1);
299 }
300
301 return unmerged;
302}
303
304struct rename
305{
306 struct diff_filepair *pair;
307 struct stage_data *src_entry;
308 struct stage_data *dst_entry;
309 unsigned processed:1;
310};
311
312/*
313 * Get information of all renames which occurred between 'o_tree' and
314 * 'tree'. We need the three trees in the merge ('o_tree', 'a_tree' and
315 * 'b_tree') to be able to associate the correct cache entries with
316 * the rename information. 'tree' is always equal to either a_tree or b_tree.
317 */
8a2fce18
MV
318static struct string_list *get_renames(struct merge_options *o,
319 struct tree *tree,
320 struct tree *o_tree,
321 struct tree *a_tree,
322 struct tree *b_tree,
323 struct string_list *entries)
9047ebbc
MV
324{
325 int i;
326 struct string_list *renames;
327 struct diff_options opts;
328
329 renames = xcalloc(1, sizeof(struct string_list));
330 diff_setup(&opts);
331 DIFF_OPT_SET(&opts, RECURSIVE);
332 opts.detect_rename = DIFF_DETECT_RENAME;
8a2fce18
MV
333 opts.rename_limit = o->merge_rename_limit >= 0 ? o->merge_rename_limit :
334 o->diff_rename_limit >= 0 ? o->diff_rename_limit :
9047ebbc
MV
335 500;
336 opts.warn_on_too_large_rename = 1;
337 opts.output_format = DIFF_FORMAT_NO_OUTPUT;
338 if (diff_setup_done(&opts) < 0)
339 die("diff setup failed");
340 diff_tree_sha1(o_tree->object.sha1, tree->object.sha1, "", &opts);
341 diffcore_std(&opts);
342 for (i = 0; i < diff_queued_diff.nr; ++i) {
343 struct string_list_item *item;
344 struct rename *re;
345 struct diff_filepair *pair = diff_queued_diff.queue[i];
346 if (pair->status != 'R') {
347 diff_free_filepair(pair);
348 continue;
349 }
350 re = xmalloc(sizeof(*re));
351 re->processed = 0;
352 re->pair = pair;
353 item = string_list_lookup(re->pair->one->path, entries);
354 if (!item)
355 re->src_entry = insert_stage_data(re->pair->one->path,
356 o_tree, a_tree, b_tree, entries);
357 else
358 re->src_entry = item->util;
359
360 item = string_list_lookup(re->pair->two->path, entries);
361 if (!item)
362 re->dst_entry = insert_stage_data(re->pair->two->path,
363 o_tree, a_tree, b_tree, entries);
364 else
365 re->dst_entry = item->util;
366 item = string_list_insert(pair->one->path, renames);
367 item->util = re;
368 }
369 opts.output_format = DIFF_FORMAT_NO_OUTPUT;
370 diff_queued_diff.nr = 0;
371 diff_flush(&opts);
372 return renames;
373}
374
375static int update_stages(const char *path, struct diff_filespec *o,
376 struct diff_filespec *a, struct diff_filespec *b,
377 int clear)
378{
379 int options = ADD_CACHE_OK_TO_ADD | ADD_CACHE_OK_TO_REPLACE;
380 if (clear)
381 if (remove_file_from_cache(path))
382 return -1;
383 if (o)
384 if (add_cacheinfo(o->mode, o->sha1, path, 1, 0, options))
385 return -1;
386 if (a)
387 if (add_cacheinfo(a->mode, a->sha1, path, 2, 0, options))
388 return -1;
389 if (b)
390 if (add_cacheinfo(b->mode, b->sha1, path, 3, 0, options))
391 return -1;
392 return 0;
393}
394
b7fa51da
MV
395static int remove_file(struct merge_options *o, int clean,
396 const char *path, int no_wd)
9047ebbc 397{
b7fa51da
MV
398 int update_cache = o->call_depth || clean;
399 int update_working_directory = !o->call_depth && !no_wd;
9047ebbc
MV
400
401 if (update_cache) {
402 if (remove_file_from_cache(path))
403 return -1;
404 }
405 if (update_working_directory) {
15dc66ab 406 if (remove_path(path) && errno != ENOENT)
9047ebbc 407 return -1;
9047ebbc
MV
408 }
409 return 0;
410}
411
696ee23c 412static char *unique_path(struct merge_options *o, const char *path, const char *branch)
9047ebbc
MV
413{
414 char *newpath = xmalloc(strlen(path) + 1 + strlen(branch) + 8 + 1);
415 int suffix = 0;
416 struct stat st;
417 char *p = newpath + strlen(path);
418 strcpy(newpath, path);
419 *(p++) = '~';
420 strcpy(p, branch);
421 for (; *p; ++p)
422 if ('/' == *p)
423 *p = '_';
696ee23c
MV
424 while (string_list_has_string(&o->current_file_set, newpath) ||
425 string_list_has_string(&o->current_directory_set, newpath) ||
9047ebbc
MV
426 lstat(newpath, &st) == 0)
427 sprintf(p, "_%d", suffix++);
428
696ee23c 429 string_list_insert(newpath, &o->current_file_set);
9047ebbc
MV
430 return newpath;
431}
432
433static void flush_buffer(int fd, const char *buf, unsigned long size)
434{
435 while (size > 0) {
436 long ret = write_in_full(fd, buf, size);
437 if (ret < 0) {
438 /* Ignore epipe */
439 if (errno == EPIPE)
440 break;
441 die("merge-recursive: %s", strerror(errno));
442 } else if (!ret) {
443 die("merge-recursive: disk full?");
444 }
445 size -= ret;
446 buf += ret;
447 }
448}
449
60c91181
JH
450static int would_lose_untracked(const char *path)
451{
452 int pos = cache_name_pos(path, strlen(path));
453
454 if (pos < 0)
455 pos = -1 - pos;
456 while (pos < active_nr &&
457 !strcmp(path, active_cache[pos]->name)) {
458 /*
459 * If stage #0, it is definitely tracked.
460 * If it has stage #2 then it was tracked
461 * before this merge started. All other
462 * cases the path was not tracked.
463 */
464 switch (ce_stage(active_cache[pos])) {
465 case 0:
466 case 2:
467 return 0;
468 }
469 pos++;
470 }
471 return file_exists(path);
472}
473
9047ebbc
MV
474static int make_room_for_path(const char *path)
475{
476 int status;
477 const char *msg = "failed to create path '%s'%s";
478
479 status = safe_create_leading_directories_const(path);
480 if (status) {
481 if (status == -3) {
482 /* something else exists */
483 error(msg, path, ": perhaps a D/F conflict?");
484 return -1;
485 }
486 die(msg, path, "");
487 }
488
60c91181
JH
489 /*
490 * Do not unlink a file in the work tree if we are not
491 * tracking it.
492 */
493 if (would_lose_untracked(path))
494 return error("refusing to lose untracked file at '%s'",
495 path);
496
9047ebbc
MV
497 /* Successful unlink is good.. */
498 if (!unlink(path))
499 return 0;
500 /* .. and so is no existing file */
501 if (errno == ENOENT)
502 return 0;
503 /* .. but not some other error (who really cares what?) */
504 return error(msg, path, ": perhaps a D/F conflict?");
505}
506
b7fa51da
MV
507static void update_file_flags(struct merge_options *o,
508 const unsigned char *sha,
9047ebbc
MV
509 unsigned mode,
510 const char *path,
511 int update_cache,
512 int update_wd)
513{
b7fa51da 514 if (o->call_depth)
9047ebbc
MV
515 update_wd = 0;
516
517 if (update_wd) {
518 enum object_type type;
519 void *buf;
520 unsigned long size;
521
522 if (S_ISGITLINK(mode))
0c44c943
JH
523 /*
524 * We may later decide to recursively descend into
525 * the submodule directory and update its index
526 * and/or work tree, but we do not do that now.
527 */
528 goto update_index;
9047ebbc
MV
529
530 buf = read_sha1_file(sha, &type, &size);
531 if (!buf)
532 die("cannot read object %s '%s'", sha1_to_hex(sha), path);
533 if (type != OBJ_BLOB)
534 die("blob expected for %s '%s'", sha1_to_hex(sha), path);
535 if (S_ISREG(mode)) {
f285a2d7 536 struct strbuf strbuf = STRBUF_INIT;
9047ebbc
MV
537 if (convert_to_working_tree(path, buf, size, &strbuf)) {
538 free(buf);
539 size = strbuf.len;
540 buf = strbuf_detach(&strbuf, NULL);
541 }
542 }
543
544 if (make_room_for_path(path) < 0) {
545 update_wd = 0;
546 free(buf);
547 goto update_index;
548 }
549 if (S_ISREG(mode) || (!has_symlinks && S_ISLNK(mode))) {
550 int fd;
551 if (mode & 0100)
552 mode = 0777;
553 else
554 mode = 0666;
555 fd = open(path, O_WRONLY | O_TRUNC | O_CREAT, mode);
556 if (fd < 0)
557 die("failed to open %s: %s", path, strerror(errno));
558 flush_buffer(fd, buf, size);
559 close(fd);
560 } else if (S_ISLNK(mode)) {
561 char *lnk = xmemdupz(buf, size);
562 safe_create_leading_directories_const(path);
563 unlink(path);
304dcf26
AR
564 if (symlink(lnk, path))
565 die("failed to symlink %s: %s", path, strerror(errno));
9047ebbc
MV
566 free(lnk);
567 } else
568 die("do not know what to do with %06o %s '%s'",
569 mode, sha1_to_hex(sha), path);
570 free(buf);
571 }
572 update_index:
573 if (update_cache)
574 add_cacheinfo(mode, sha, path, 0, update_wd, ADD_CACHE_OK_TO_ADD);
575}
576
b7fa51da
MV
577static void update_file(struct merge_options *o,
578 int clean,
9047ebbc
MV
579 const unsigned char *sha,
580 unsigned mode,
581 const char *path)
582{
b7fa51da 583 update_file_flags(o, sha, mode, path, o->call_depth || clean, !o->call_depth);
9047ebbc
MV
584}
585
586/* Low level file merging, update and removal */
587
588struct merge_file_info
589{
590 unsigned char sha[20];
591 unsigned mode;
592 unsigned clean:1,
593 merge:1;
594};
595
596static void fill_mm(const unsigned char *sha1, mmfile_t *mm)
597{
598 unsigned long size;
599 enum object_type type;
600
601 if (!hashcmp(sha1, null_sha1)) {
602 mm->ptr = xstrdup("");
603 mm->size = 0;
604 return;
605 }
606
607 mm->ptr = read_sha1_file(sha1, &type, &size);
608 if (!mm->ptr || type != OBJ_BLOB)
609 die("unable to read blob object %s", sha1_to_hex(sha1));
610 mm->size = size;
611}
612
b7fa51da
MV
613static int merge_3way(struct merge_options *o,
614 mmbuffer_t *result_buf,
615 struct diff_filespec *one,
9047ebbc
MV
616 struct diff_filespec *a,
617 struct diff_filespec *b,
618 const char *branch1,
619 const char *branch2)
620{
621 mmfile_t orig, src1, src2;
622 char *name1, *name2;
623 int merge_status;
624
625 name1 = xstrdup(mkpath("%s:%s", branch1, a->path));
626 name2 = xstrdup(mkpath("%s:%s", branch2, b->path));
627
b7fa51da 628 fill_mm(one->sha1, &orig);
9047ebbc
MV
629 fill_mm(a->sha1, &src1);
630 fill_mm(b->sha1, &src2);
631
632 merge_status = ll_merge(result_buf, a->path, &orig,
633 &src1, name1, &src2, name2,
b7fa51da 634 o->call_depth);
9047ebbc
MV
635
636 free(name1);
637 free(name2);
638 free(orig.ptr);
639 free(src1.ptr);
640 free(src2.ptr);
641 return merge_status;
642}
643
b7fa51da
MV
644static struct merge_file_info merge_file(struct merge_options *o,
645 struct diff_filespec *one,
646 struct diff_filespec *a,
647 struct diff_filespec *b,
648 const char *branch1,
649 const char *branch2)
9047ebbc
MV
650{
651 struct merge_file_info result;
652 result.merge = 0;
653 result.clean = 1;
654
655 if ((S_IFMT & a->mode) != (S_IFMT & b->mode)) {
656 result.clean = 0;
657 if (S_ISREG(a->mode)) {
658 result.mode = a->mode;
659 hashcpy(result.sha, a->sha1);
660 } else {
661 result.mode = b->mode;
662 hashcpy(result.sha, b->sha1);
663 }
664 } else {
b7fa51da 665 if (!sha_eq(a->sha1, one->sha1) && !sha_eq(b->sha1, one->sha1))
9047ebbc
MV
666 result.merge = 1;
667
668 /*
669 * Merge modes
670 */
b7fa51da 671 if (a->mode == b->mode || a->mode == one->mode)
9047ebbc
MV
672 result.mode = b->mode;
673 else {
674 result.mode = a->mode;
b7fa51da 675 if (b->mode != one->mode) {
9047ebbc
MV
676 result.clean = 0;
677 result.merge = 1;
678 }
679 }
680
b7fa51da 681 if (sha_eq(a->sha1, b->sha1) || sha_eq(a->sha1, one->sha1))
9047ebbc 682 hashcpy(result.sha, b->sha1);
b7fa51da 683 else if (sha_eq(b->sha1, one->sha1))
9047ebbc
MV
684 hashcpy(result.sha, a->sha1);
685 else if (S_ISREG(a->mode)) {
686 mmbuffer_t result_buf;
687 int merge_status;
688
b7fa51da 689 merge_status = merge_3way(o, &result_buf, one, a, b,
9047ebbc
MV
690 branch1, branch2);
691
692 if ((merge_status < 0) || !result_buf.ptr)
693 die("Failed to execute internal merge");
694
695 if (write_sha1_file(result_buf.ptr, result_buf.size,
696 blob_type, result.sha))
697 die("Unable to add %s to database",
698 a->path);
699
700 free(result_buf.ptr);
701 result.clean = (merge_status == 0);
702 } else if (S_ISGITLINK(a->mode)) {
703 result.clean = 0;
704 hashcpy(result.sha, a->sha1);
705 } else if (S_ISLNK(a->mode)) {
706 hashcpy(result.sha, a->sha1);
707
708 if (!sha_eq(a->sha1, b->sha1))
709 result.clean = 0;
710 } else {
711 die("unsupported object type in the tree");
712 }
713 }
714
715 return result;
716}
717
8a2fce18
MV
718static void conflict_rename_rename(struct merge_options *o,
719 struct rename *ren1,
9047ebbc
MV
720 const char *branch1,
721 struct rename *ren2,
722 const char *branch2)
723{
724 char *del[2];
725 int delp = 0;
726 const char *ren1_dst = ren1->pair->two->path;
727 const char *ren2_dst = ren2->pair->two->path;
728 const char *dst_name1 = ren1_dst;
729 const char *dst_name2 = ren2_dst;
696ee23c
MV
730 if (string_list_has_string(&o->current_directory_set, ren1_dst)) {
731 dst_name1 = del[delp++] = unique_path(o, ren1_dst, branch1);
8a2fce18 732 output(o, 1, "%s is a directory in %s adding as %s instead",
9047ebbc 733 ren1_dst, branch2, dst_name1);
b7fa51da 734 remove_file(o, 0, ren1_dst, 0);
9047ebbc 735 }
696ee23c
MV
736 if (string_list_has_string(&o->current_directory_set, ren2_dst)) {
737 dst_name2 = del[delp++] = unique_path(o, ren2_dst, branch2);
8a2fce18 738 output(o, 1, "%s is a directory in %s adding as %s instead",
9047ebbc 739 ren2_dst, branch1, dst_name2);
b7fa51da 740 remove_file(o, 0, ren2_dst, 0);
9047ebbc 741 }
b7fa51da 742 if (o->call_depth) {
9047ebbc
MV
743 remove_file_from_cache(dst_name1);
744 remove_file_from_cache(dst_name2);
745 /*
746 * Uncomment to leave the conflicting names in the resulting tree
747 *
b7fa51da
MV
748 * update_file(o, 0, ren1->pair->two->sha1, ren1->pair->two->mode, dst_name1);
749 * update_file(o, 0, ren2->pair->two->sha1, ren2->pair->two->mode, dst_name2);
9047ebbc
MV
750 */
751 } else {
752 update_stages(dst_name1, NULL, ren1->pair->two, NULL, 1);
753 update_stages(dst_name2, NULL, NULL, ren2->pair->two, 1);
754 }
755 while (delp--)
756 free(del[delp]);
757}
758
8a2fce18
MV
759static void conflict_rename_dir(struct merge_options *o,
760 struct rename *ren1,
9047ebbc
MV
761 const char *branch1)
762{
696ee23c 763 char *new_path = unique_path(o, ren1->pair->two->path, branch1);
8a2fce18 764 output(o, 1, "Renaming %s to %s instead", ren1->pair->one->path, new_path);
b7fa51da
MV
765 remove_file(o, 0, ren1->pair->two->path, 0);
766 update_file(o, 0, ren1->pair->two->sha1, ren1->pair->two->mode, new_path);
9047ebbc
MV
767 free(new_path);
768}
769
8a2fce18
MV
770static void conflict_rename_rename_2(struct merge_options *o,
771 struct rename *ren1,
9047ebbc
MV
772 const char *branch1,
773 struct rename *ren2,
774 const char *branch2)
775{
696ee23c
MV
776 char *new_path1 = unique_path(o, ren1->pair->two->path, branch1);
777 char *new_path2 = unique_path(o, ren2->pair->two->path, branch2);
8a2fce18 778 output(o, 1, "Renaming %s to %s and %s to %s instead",
9047ebbc
MV
779 ren1->pair->one->path, new_path1,
780 ren2->pair->one->path, new_path2);
b7fa51da
MV
781 remove_file(o, 0, ren1->pair->two->path, 0);
782 update_file(o, 0, ren1->pair->two->sha1, ren1->pair->two->mode, new_path1);
783 update_file(o, 0, ren2->pair->two->sha1, ren2->pair->two->mode, new_path2);
9047ebbc
MV
784 free(new_path2);
785 free(new_path1);
786}
787
8a2fce18
MV
788static int process_renames(struct merge_options *o,
789 struct string_list *a_renames,
790 struct string_list *b_renames)
9047ebbc
MV
791{
792 int clean_merge = 1, i, j;
793 struct string_list a_by_dst = {NULL, 0, 0, 0}, b_by_dst = {NULL, 0, 0, 0};
794 const struct rename *sre;
795
796 for (i = 0; i < a_renames->nr; i++) {
797 sre = a_renames->items[i].util;
798 string_list_insert(sre->pair->two->path, &a_by_dst)->util
799 = sre->dst_entry;
800 }
801 for (i = 0; i < b_renames->nr; i++) {
802 sre = b_renames->items[i].util;
803 string_list_insert(sre->pair->two->path, &b_by_dst)->util
804 = sre->dst_entry;
805 }
806
807 for (i = 0, j = 0; i < a_renames->nr || j < b_renames->nr;) {
9047ebbc 808 char *src;
8e24cbae 809 struct string_list *renames1, *renames2Dst;
9047ebbc
MV
810 struct rename *ren1 = NULL, *ren2 = NULL;
811 const char *branch1, *branch2;
812 const char *ren1_src, *ren1_dst;
813
814 if (i >= a_renames->nr) {
9047ebbc
MV
815 ren2 = b_renames->items[j++].util;
816 } else if (j >= b_renames->nr) {
9047ebbc
MV
817 ren1 = a_renames->items[i++].util;
818 } else {
8e24cbae
BK
819 int compare = strcmp(a_renames->items[i].string,
820 b_renames->items[j].string);
9047ebbc
MV
821 if (compare <= 0)
822 ren1 = a_renames->items[i++].util;
823 if (compare >= 0)
824 ren2 = b_renames->items[j++].util;
825 }
826
827 /* TODO: refactor, so that 1/2 are not needed */
828 if (ren1) {
829 renames1 = a_renames;
9047ebbc 830 renames2Dst = &b_by_dst;
8a2fce18
MV
831 branch1 = o->branch1;
832 branch2 = o->branch2;
9047ebbc
MV
833 } else {
834 struct rename *tmp;
835 renames1 = b_renames;
9047ebbc 836 renames2Dst = &a_by_dst;
8a2fce18
MV
837 branch1 = o->branch2;
838 branch2 = o->branch1;
9047ebbc
MV
839 tmp = ren2;
840 ren2 = ren1;
841 ren1 = tmp;
842 }
843 src = ren1->pair->one->path;
844
845 ren1->dst_entry->processed = 1;
846 ren1->src_entry->processed = 1;
847
848 if (ren1->processed)
849 continue;
850 ren1->processed = 1;
851
852 ren1_src = ren1->pair->one->path;
853 ren1_dst = ren1->pair->two->path;
854
855 if (ren2) {
856 const char *ren2_src = ren2->pair->one->path;
857 const char *ren2_dst = ren2->pair->two->path;
858 /* Renamed in 1 and renamed in 2 */
859 if (strcmp(ren1_src, ren2_src) != 0)
860 die("ren1.src != ren2.src");
861 ren2->dst_entry->processed = 1;
862 ren2->processed = 1;
863 if (strcmp(ren1_dst, ren2_dst) != 0) {
864 clean_merge = 0;
8a2fce18 865 output(o, 1, "CONFLICT (rename/rename): "
9047ebbc
MV
866 "Rename \"%s\"->\"%s\" in branch \"%s\" "
867 "rename \"%s\"->\"%s\" in \"%s\"%s",
868 src, ren1_dst, branch1,
869 src, ren2_dst, branch2,
b7fa51da
MV
870 o->call_depth ? " (left unresolved)": "");
871 if (o->call_depth) {
9047ebbc 872 remove_file_from_cache(src);
b7fa51da 873 update_file(o, 0, ren1->pair->one->sha1,
9047ebbc
MV
874 ren1->pair->one->mode, src);
875 }
8a2fce18 876 conflict_rename_rename(o, ren1, branch1, ren2, branch2);
9047ebbc
MV
877 } else {
878 struct merge_file_info mfi;
b7fa51da
MV
879 remove_file(o, 1, ren1_src, 1);
880 mfi = merge_file(o,
881 ren1->pair->one,
9047ebbc
MV
882 ren1->pair->two,
883 ren2->pair->two,
884 branch1,
885 branch2);
886 if (mfi.merge || !mfi.clean)
8a2fce18 887 output(o, 1, "Renaming %s->%s", src, ren1_dst);
9047ebbc
MV
888
889 if (mfi.merge)
8a2fce18 890 output(o, 2, "Auto-merging %s", ren1_dst);
9047ebbc
MV
891
892 if (!mfi.clean) {
8a2fce18 893 output(o, 1, "CONFLICT (content): merge conflict in %s",
9047ebbc
MV
894 ren1_dst);
895 clean_merge = 0;
896
b7fa51da 897 if (!o->call_depth)
9047ebbc
MV
898 update_stages(ren1_dst,
899 ren1->pair->one,
900 ren1->pair->two,
901 ren2->pair->two,
902 1 /* clear */);
903 }
b7fa51da 904 update_file(o, mfi.clean, mfi.sha, mfi.mode, ren1_dst);
9047ebbc
MV
905 }
906 } else {
907 /* Renamed in 1, maybe changed in 2 */
908 struct string_list_item *item;
909 /* we only use sha1 and mode of these */
910 struct diff_filespec src_other, dst_other;
911 int try_merge, stage = a_renames == renames1 ? 3: 2;
912
b7fa51da 913 remove_file(o, 1, ren1_src, o->call_depth || stage == 3);
9047ebbc
MV
914
915 hashcpy(src_other.sha1, ren1->src_entry->stages[stage].sha);
916 src_other.mode = ren1->src_entry->stages[stage].mode;
917 hashcpy(dst_other.sha1, ren1->dst_entry->stages[stage].sha);
918 dst_other.mode = ren1->dst_entry->stages[stage].mode;
919
920 try_merge = 0;
921
696ee23c 922 if (string_list_has_string(&o->current_directory_set, ren1_dst)) {
9047ebbc 923 clean_merge = 0;
8a2fce18 924 output(o, 1, "CONFLICT (rename/directory): Rename %s->%s in %s "
9047ebbc
MV
925 " directory %s added in %s",
926 ren1_src, ren1_dst, branch1,
927 ren1_dst, branch2);
8a2fce18 928 conflict_rename_dir(o, ren1, branch1);
9047ebbc
MV
929 } else if (sha_eq(src_other.sha1, null_sha1)) {
930 clean_merge = 0;
8a2fce18 931 output(o, 1, "CONFLICT (rename/delete): Rename %s->%s in %s "
9047ebbc
MV
932 "and deleted in %s",
933 ren1_src, ren1_dst, branch1,
934 branch2);
b7fa51da 935 update_file(o, 0, ren1->pair->two->sha1, ren1->pair->two->mode, ren1_dst);
36e3b5ea
JS
936 update_stages(ren1_dst, NULL,
937 branch1 == o->branch1 ?
938 ren1->pair->two : NULL,
939 branch1 == o->branch1 ?
940 NULL : ren1->pair->two, 1);
9047ebbc
MV
941 } else if (!sha_eq(dst_other.sha1, null_sha1)) {
942 const char *new_path;
943 clean_merge = 0;
944 try_merge = 1;
8a2fce18 945 output(o, 1, "CONFLICT (rename/add): Rename %s->%s in %s. "
9047ebbc
MV
946 "%s added in %s",
947 ren1_src, ren1_dst, branch1,
948 ren1_dst, branch2);
696ee23c 949 new_path = unique_path(o, ren1_dst, branch2);
8a2fce18 950 output(o, 1, "Adding as %s instead", new_path);
b7fa51da 951 update_file(o, 0, dst_other.sha1, dst_other.mode, new_path);
9047ebbc
MV
952 } else if ((item = string_list_lookup(ren1_dst, renames2Dst))) {
953 ren2 = item->util;
954 clean_merge = 0;
955 ren2->processed = 1;
8a2fce18
MV
956 output(o, 1, "CONFLICT (rename/rename): "
957 "Rename %s->%s in %s. "
9047ebbc
MV
958 "Rename %s->%s in %s",
959 ren1_src, ren1_dst, branch1,
960 ren2->pair->one->path, ren2->pair->two->path, branch2);
8a2fce18 961 conflict_rename_rename_2(o, ren1, branch1, ren2, branch2);
9047ebbc
MV
962 } else
963 try_merge = 1;
964
965 if (try_merge) {
8a2fce18 966 struct diff_filespec *one, *a, *b;
9047ebbc
MV
967 struct merge_file_info mfi;
968 src_other.path = (char *)ren1_src;
969
8a2fce18 970 one = ren1->pair->one;
9047ebbc
MV
971 if (a_renames == renames1) {
972 a = ren1->pair->two;
973 b = &src_other;
974 } else {
975 b = ren1->pair->two;
976 a = &src_other;
977 }
b7fa51da 978 mfi = merge_file(o, one, a, b,
8a2fce18 979 o->branch1, o->branch2);
9047ebbc
MV
980
981 if (mfi.clean &&
982 sha_eq(mfi.sha, ren1->pair->two->sha1) &&
983 mfi.mode == ren1->pair->two->mode)
984 /*
985 * This messaged is part of
986 * t6022 test. If you change
987 * it update the test too.
988 */
8a2fce18 989 output(o, 3, "Skipped %s (merged same as existing)", ren1_dst);
9047ebbc
MV
990 else {
991 if (mfi.merge || !mfi.clean)
8a2fce18 992 output(o, 1, "Renaming %s => %s", ren1_src, ren1_dst);
9047ebbc 993 if (mfi.merge)
8a2fce18 994 output(o, 2, "Auto-merging %s", ren1_dst);
9047ebbc 995 if (!mfi.clean) {
8a2fce18 996 output(o, 1, "CONFLICT (rename/modify): Merge conflict in %s",
9047ebbc
MV
997 ren1_dst);
998 clean_merge = 0;
999
b7fa51da 1000 if (!o->call_depth)
9047ebbc 1001 update_stages(ren1_dst,
8a2fce18 1002 one, a, b, 1);
9047ebbc 1003 }
b7fa51da 1004 update_file(o, mfi.clean, mfi.sha, mfi.mode, ren1_dst);
9047ebbc
MV
1005 }
1006 }
1007 }
1008 }
1009 string_list_clear(&a_by_dst, 0);
1010 string_list_clear(&b_by_dst, 0);
1011
1012 return clean_merge;
1013}
1014
1015static unsigned char *stage_sha(const unsigned char *sha, unsigned mode)
1016{
1017 return (is_null_sha1(sha) || mode == 0) ? NULL: (unsigned char *)sha;
1018}
1019
1020/* Per entry merge function */
8a2fce18
MV
1021static int process_entry(struct merge_options *o,
1022 const char *path, struct stage_data *entry)
9047ebbc
MV
1023{
1024 /*
1025 printf("processing entry, clean cache: %s\n", index_only ? "yes": "no");
1026 print_index_entry("\tpath: ", entry);
1027 */
1028 int clean_merge = 1;
1029 unsigned o_mode = entry->stages[1].mode;
1030 unsigned a_mode = entry->stages[2].mode;
1031 unsigned b_mode = entry->stages[3].mode;
1032 unsigned char *o_sha = stage_sha(entry->stages[1].sha, o_mode);
1033 unsigned char *a_sha = stage_sha(entry->stages[2].sha, a_mode);
1034 unsigned char *b_sha = stage_sha(entry->stages[3].sha, b_mode);
1035
1036 if (o_sha && (!a_sha || !b_sha)) {
1037 /* Case A: Deleted in one */
1038 if ((!a_sha && !b_sha) ||
1039 (sha_eq(a_sha, o_sha) && !b_sha) ||
1040 (!a_sha && sha_eq(b_sha, o_sha))) {
1041 /* Deleted in both or deleted in one and
1042 * unchanged in the other */
1043 if (a_sha)
8a2fce18 1044 output(o, 2, "Removing %s", path);
9047ebbc 1045 /* do not touch working file if it did not exist */
b7fa51da 1046 remove_file(o, 1, path, !a_sha);
9047ebbc
MV
1047 } else {
1048 /* Deleted in one and changed in the other */
1049 clean_merge = 0;
1050 if (!a_sha) {
8a2fce18 1051 output(o, 1, "CONFLICT (delete/modify): %s deleted in %s "
9047ebbc 1052 "and modified in %s. Version %s of %s left in tree.",
8a2fce18
MV
1053 path, o->branch1,
1054 o->branch2, o->branch2, path);
b7fa51da 1055 update_file(o, 0, b_sha, b_mode, path);
9047ebbc 1056 } else {
8a2fce18 1057 output(o, 1, "CONFLICT (delete/modify): %s deleted in %s "
9047ebbc 1058 "and modified in %s. Version %s of %s left in tree.",
8a2fce18
MV
1059 path, o->branch2,
1060 o->branch1, o->branch1, path);
b7fa51da 1061 update_file(o, 0, a_sha, a_mode, path);
9047ebbc
MV
1062 }
1063 }
1064
1065 } else if ((!o_sha && a_sha && !b_sha) ||
1066 (!o_sha && !a_sha && b_sha)) {
1067 /* Case B: Added in one. */
1068 const char *add_branch;
1069 const char *other_branch;
1070 unsigned mode;
1071 const unsigned char *sha;
1072 const char *conf;
1073
1074 if (a_sha) {
8a2fce18
MV
1075 add_branch = o->branch1;
1076 other_branch = o->branch2;
9047ebbc
MV
1077 mode = a_mode;
1078 sha = a_sha;
1079 conf = "file/directory";
1080 } else {
8a2fce18
MV
1081 add_branch = o->branch2;
1082 other_branch = o->branch1;
9047ebbc
MV
1083 mode = b_mode;
1084 sha = b_sha;
1085 conf = "directory/file";
1086 }
696ee23c
MV
1087 if (string_list_has_string(&o->current_directory_set, path)) {
1088 const char *new_path = unique_path(o, path, add_branch);
9047ebbc 1089 clean_merge = 0;
8a2fce18 1090 output(o, 1, "CONFLICT (%s): There is a directory with name %s in %s. "
9047ebbc
MV
1091 "Adding %s as %s",
1092 conf, path, other_branch, path, new_path);
b7fa51da
MV
1093 remove_file(o, 0, path, 0);
1094 update_file(o, 0, sha, mode, new_path);
9047ebbc 1095 } else {
8a2fce18 1096 output(o, 2, "Adding %s", path);
b7fa51da 1097 update_file(o, 1, sha, mode, path);
9047ebbc
MV
1098 }
1099 } else if (a_sha && b_sha) {
1100 /* Case C: Added in both (check for same permissions) and */
1101 /* case D: Modified in both, but differently. */
1102 const char *reason = "content";
1103 struct merge_file_info mfi;
8a2fce18 1104 struct diff_filespec one, a, b;
9047ebbc
MV
1105
1106 if (!o_sha) {
1107 reason = "add/add";
1108 o_sha = (unsigned char *)null_sha1;
1109 }
8a2fce18
MV
1110 output(o, 2, "Auto-merging %s", path);
1111 one.path = a.path = b.path = (char *)path;
1112 hashcpy(one.sha1, o_sha);
1113 one.mode = o_mode;
9047ebbc
MV
1114 hashcpy(a.sha1, a_sha);
1115 a.mode = a_mode;
1116 hashcpy(b.sha1, b_sha);
1117 b.mode = b_mode;
1118
b7fa51da 1119 mfi = merge_file(o, &one, &a, &b,
8a2fce18 1120 o->branch1, o->branch2);
9047ebbc
MV
1121
1122 clean_merge = mfi.clean;
39d8e271
CB
1123 if (!mfi.clean) {
1124 if (S_ISGITLINK(mfi.mode))
1125 reason = "submodule";
8a2fce18 1126 output(o, 1, "CONFLICT (%s): Merge conflict in %s",
9047ebbc 1127 reason, path);
9047ebbc 1128 }
39d8e271 1129 update_file(o, mfi.clean, mfi.sha, mfi.mode, path);
9047ebbc
MV
1130 } else if (!o_sha && !a_sha && !b_sha) {
1131 /*
1132 * this entry was deleted altogether. a_mode == 0 means
1133 * we had that path and want to actively remove it.
1134 */
b7fa51da 1135 remove_file(o, 1, path, !a_mode);
9047ebbc
MV
1136 } else
1137 die("Fatal merge failure, shouldn't happen.");
1138
1139 return clean_merge;
1140}
1141
8a2fce18
MV
1142int merge_trees(struct merge_options *o,
1143 struct tree *head,
9047ebbc
MV
1144 struct tree *merge,
1145 struct tree *common,
9047ebbc
MV
1146 struct tree **result)
1147{
1148 int code, clean;
1149
8a2fce18 1150 if (o->subtree_merge) {
9047ebbc
MV
1151 merge = shift_tree_object(head, merge);
1152 common = shift_tree_object(head, common);
1153 }
1154
1155 if (sha_eq(common->object.sha1, merge->object.sha1)) {
8a2fce18 1156 output(o, 0, "Already uptodate!");
9047ebbc
MV
1157 *result = head;
1158 return 1;
1159 }
1160
b7fa51da 1161 code = git_merge_trees(o->call_depth, common, head, merge);
9047ebbc
MV
1162
1163 if (code != 0)
1164 die("merging of trees %s and %s failed",
1165 sha1_to_hex(head->object.sha1),
1166 sha1_to_hex(merge->object.sha1));
1167
1168 if (unmerged_cache()) {
1169 struct string_list *entries, *re_head, *re_merge;
1170 int i;
696ee23c
MV
1171 string_list_clear(&o->current_file_set, 1);
1172 string_list_clear(&o->current_directory_set, 1);
1173 get_files_dirs(o, head);
1174 get_files_dirs(o, merge);
9047ebbc
MV
1175
1176 entries = get_unmerged();
8a2fce18
MV
1177 re_head = get_renames(o, head, common, head, merge, entries);
1178 re_merge = get_renames(o, merge, common, head, merge, entries);
1179 clean = process_renames(o, re_head, re_merge);
9047ebbc
MV
1180 for (i = 0; i < entries->nr; i++) {
1181 const char *path = entries->items[i].string;
1182 struct stage_data *e = entries->items[i].util;
1183 if (!e->processed
8a2fce18 1184 && !process_entry(o, path, e))
9047ebbc
MV
1185 clean = 0;
1186 }
1187
1188 string_list_clear(re_merge, 0);
1189 string_list_clear(re_head, 0);
1190 string_list_clear(entries, 1);
1191
1192 }
1193 else
1194 clean = 1;
1195
b7fa51da 1196 if (o->call_depth)
8a2fce18 1197 *result = write_tree_from_memory(o);
9047ebbc
MV
1198
1199 return clean;
1200}
1201
1202static struct commit_list *reverse_commit_list(struct commit_list *list)
1203{
1204 struct commit_list *next = NULL, *current, *backup;
1205 for (current = list; current; current = backup) {
1206 backup = current->next;
1207 current->next = next;
1208 next = current;
1209 }
1210 return next;
1211}
1212
1213/*
1214 * Merge the commits h1 and h2, return the resulting virtual
1215 * commit object and a flag indicating the cleanness of the merge.
1216 */
8a2fce18
MV
1217int merge_recursive(struct merge_options *o,
1218 struct commit *h1,
9047ebbc 1219 struct commit *h2,
9047ebbc
MV
1220 struct commit_list *ca,
1221 struct commit **result)
1222{
1223 struct commit_list *iter;
1224 struct commit *merged_common_ancestors;
1225 struct tree *mrtree = mrtree;
1226 int clean;
1227
8a2fce18
MV
1228 if (show(o, 4)) {
1229 output(o, 4, "Merging:");
5033639c
MV
1230 output_commit_title(o, h1);
1231 output_commit_title(o, h2);
9047ebbc
MV
1232 }
1233
1234 if (!ca) {
1235 ca = get_merge_bases(h1, h2, 1);
1236 ca = reverse_commit_list(ca);
1237 }
1238
8a2fce18
MV
1239 if (show(o, 5)) {
1240 output(o, 5, "found %u common ancestor(s):", commit_list_count(ca));
9047ebbc 1241 for (iter = ca; iter; iter = iter->next)
5033639c 1242 output_commit_title(o, iter->item);
9047ebbc
MV
1243 }
1244
1245 merged_common_ancestors = pop_commit(&ca);
1246 if (merged_common_ancestors == NULL) {
1247 /* if there is no common ancestor, make an empty tree */
1248 struct tree *tree = xcalloc(1, sizeof(struct tree));
1249
1250 tree->object.parsed = 1;
1251 tree->object.type = OBJ_TREE;
1252 pretend_sha1_file(NULL, 0, OBJ_TREE, tree->object.sha1);
1253 merged_common_ancestors = make_virtual_commit(tree, "ancestor");
1254 }
1255
1256 for (iter = ca; iter; iter = iter->next) {
8a2fce18 1257 const char *saved_b1, *saved_b2;
5033639c 1258 o->call_depth++;
9047ebbc
MV
1259 /*
1260 * When the merge fails, the result contains files
1261 * with conflict markers. The cleanness flag is
1262 * ignored, it was never actually used, as result of
1263 * merge_trees has always overwritten it: the committed
1264 * "conflicts" were already resolved.
1265 */
1266 discard_cache();
8a2fce18
MV
1267 saved_b1 = o->branch1;
1268 saved_b2 = o->branch2;
1269 o->branch1 = "Temporary merge branch 1";
1270 o->branch2 = "Temporary merge branch 2";
1271 merge_recursive(o, merged_common_ancestors, iter->item,
1272 NULL, &merged_common_ancestors);
1273 o->branch1 = saved_b1;
1274 o->branch2 = saved_b2;
5033639c 1275 o->call_depth--;
9047ebbc
MV
1276
1277 if (!merged_common_ancestors)
1278 die("merge returned no commit");
1279 }
1280
1281 discard_cache();
b7fa51da 1282 if (!o->call_depth)
9047ebbc 1283 read_cache();
9047ebbc 1284
8a2fce18
MV
1285 clean = merge_trees(o, h1->tree, h2->tree, merged_common_ancestors->tree,
1286 &mrtree);
9047ebbc 1287
b7fa51da 1288 if (o->call_depth) {
9047ebbc
MV
1289 *result = make_virtual_commit(mrtree, "merged tree");
1290 commit_list_insert(h1, &(*result)->parents);
1291 commit_list_insert(h2, &(*result)->parents->next);
1292 }
c7d84924 1293 flush_output(o);
9047ebbc
MV
1294 return clean;
1295}
1296
73118f89
SB
1297static struct commit *get_ref(const unsigned char *sha1, const char *name)
1298{
1299 struct object *object;
1300
1301 object = deref_tag(parse_object(sha1), name, strlen(name));
1302 if (!object)
1303 return NULL;
1304 if (object->type == OBJ_TREE)
1305 return make_virtual_commit((struct tree*)object, name);
1306 if (object->type != OBJ_COMMIT)
1307 return NULL;
1308 if (parse_commit((struct commit *)object))
1309 return NULL;
1310 return (struct commit *)object;
1311}
1312
8a2fce18
MV
1313int merge_recursive_generic(struct merge_options *o,
1314 const unsigned char *head,
1315 const unsigned char *merge,
1316 int num_base_list,
1317 const unsigned char **base_list,
1318 struct commit **result)
73118f89
SB
1319{
1320 int clean, index_fd;
1321 struct lock_file *lock = xcalloc(1, sizeof(struct lock_file));
8a2fce18
MV
1322 struct commit *head_commit = get_ref(head, o->branch1);
1323 struct commit *next_commit = get_ref(merge, o->branch2);
73118f89
SB
1324 struct commit_list *ca = NULL;
1325
1326 if (base_list) {
1327 int i;
8a2fce18 1328 for (i = 0; i < num_base_list; ++i) {
73118f89 1329 struct commit *base;
8a2fce18 1330 if (!(base = get_ref(base_list[i], sha1_to_hex(base_list[i]))))
73118f89 1331 return error("Could not parse object '%s'",
8a2fce18 1332 sha1_to_hex(base_list[i]));
73118f89
SB
1333 commit_list_insert(base, &ca);
1334 }
1335 }
1336
1337 index_fd = hold_locked_index(lock, 1);
8a2fce18
MV
1338 clean = merge_recursive(o, head_commit, next_commit, ca,
1339 result);
73118f89
SB
1340 if (active_cache_changed &&
1341 (write_cache(index_fd, active_cache, active_nr) ||
1342 commit_locked_index(lock)))
1343 return error("Unable to write index.");
1344
1345 return clean ? 0 : 1;
1346}
1347
8a2fce18 1348static int merge_recursive_config(const char *var, const char *value, void *cb)
9047ebbc 1349{
8a2fce18 1350 struct merge_options *o = cb;
9047ebbc 1351 if (!strcasecmp(var, "merge.verbosity")) {
8a2fce18 1352 o->verbosity = git_config_int(var, value);
9047ebbc
MV
1353 return 0;
1354 }
1355 if (!strcasecmp(var, "diff.renamelimit")) {
8a2fce18 1356 o->diff_rename_limit = git_config_int(var, value);
9047ebbc
MV
1357 return 0;
1358 }
1359 if (!strcasecmp(var, "merge.renamelimit")) {
8a2fce18 1360 o->merge_rename_limit = git_config_int(var, value);
9047ebbc
MV
1361 return 0;
1362 }
e137a892 1363 return git_xmerge_config(var, value, cb);
9047ebbc
MV
1364}
1365
8a2fce18 1366void init_merge_options(struct merge_options *o)
9047ebbc 1367{
8a2fce18
MV
1368 memset(o, 0, sizeof(struct merge_options));
1369 o->verbosity = 2;
1370 o->buffer_output = 1;
1371 o->diff_rename_limit = -1;
1372 o->merge_rename_limit = -1;
1373 git_config(merge_recursive_config, o);
9047ebbc 1374 if (getenv("GIT_MERGE_VERBOSITY"))
8a2fce18 1375 o->verbosity =
9047ebbc 1376 strtol(getenv("GIT_MERGE_VERBOSITY"), NULL, 10);
8a2fce18
MV
1377 if (o->verbosity >= 5)
1378 o->buffer_output = 0;
c7d84924 1379 strbuf_init(&o->obuf, 0);
696ee23c
MV
1380 memset(&o->current_file_set, 0, sizeof(struct string_list));
1381 o->current_file_set.strdup_strings = 1;
1382 memset(&o->current_directory_set, 0, sizeof(struct string_list));
1383 o->current_directory_set.strdup_strings = 1;
9047ebbc 1384}