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