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