Document 'git commit --no-edit' explicitly
[git.git] / merge-recursive.c
blob7866ca1026730e2e0446f711e3c621e44cef9f60
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"
25 static struct tree *shift_tree_object(struct tree *one, struct tree *two,
26 const char *subtree_shift)
28 unsigned char shifted[20];
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);
36 if (!hashcmp(two->object.sha1, shifted))
37 return two;
38 return lookup_tree(shifted);
41 static struct commit *make_virtual_commit(struct tree *tree, const char *comment)
43 struct commit *commit = xcalloc(1, sizeof(struct commit));
44 struct merge_remote_desc *desc = xmalloc(sizeof(*desc));
46 desc->name = comment;
47 desc->obj = (struct object *)commit;
48 commit->tree = tree;
49 commit->util = desc;
50 commit->object.parsed = 1;
51 return commit;
55 * Since we use get_tree_entry(), which does not put the read object into
56 * the object pool, we cannot rely on a == b.
58 static int sha_eq(const unsigned char *a, const unsigned char *b)
60 if (!a && !b)
61 return 2;
62 return a && b && hashcmp(a, b) == 0;
65 enum rename_type {
66 RENAME_NORMAL = 0,
67 RENAME_DELETE,
68 RENAME_ONE_FILE_TO_ONE,
69 RENAME_ONE_FILE_TO_TWO,
70 RENAME_TWO_FILES_TO_ONE
73 struct rename_conflict_info {
74 enum rename_type rename_type;
75 struct diff_filepair *pair1;
76 struct diff_filepair *pair2;
77 const char *branch1;
78 const char *branch2;
79 struct stage_data *dst_entry1;
80 struct stage_data *dst_entry2;
81 struct diff_filespec ren1_other;
82 struct diff_filespec ren2_other;
86 * Since we want to write the index eventually, we cannot reuse the index
87 * for these (temporary) data.
89 struct stage_data {
90 struct {
91 unsigned mode;
92 unsigned char sha[20];
93 } stages[4];
94 struct rename_conflict_info *rename_conflict_info;
95 unsigned processed:1;
98 static inline void setup_rename_conflict_info(enum rename_type rename_type,
99 struct diff_filepair *pair1,
100 struct diff_filepair *pair2,
101 const char *branch1,
102 const char *branch2,
103 struct stage_data *dst_entry1,
104 struct stage_data *dst_entry2,
105 struct merge_options *o,
106 struct stage_data *src_entry1,
107 struct stage_data *src_entry2)
109 struct rename_conflict_info *ci = xcalloc(1, sizeof(struct rename_conflict_info));
110 ci->rename_type = rename_type;
111 ci->pair1 = pair1;
112 ci->branch1 = branch1;
113 ci->branch2 = branch2;
115 ci->dst_entry1 = dst_entry1;
116 dst_entry1->rename_conflict_info = ci;
117 dst_entry1->processed = 0;
119 assert(!pair2 == !dst_entry2);
120 if (dst_entry2) {
121 ci->dst_entry2 = dst_entry2;
122 ci->pair2 = pair2;
123 dst_entry2->rename_conflict_info = ci;
126 if (rename_type == RENAME_TWO_FILES_TO_ONE) {
128 * For each rename, there could have been
129 * modifications on the side of history where that
130 * file was not renamed.
132 int ostage1 = o->branch1 == branch1 ? 3 : 2;
133 int ostage2 = ostage1 ^ 1;
135 ci->ren1_other.path = pair1->one->path;
136 hashcpy(ci->ren1_other.sha1, src_entry1->stages[ostage1].sha);
137 ci->ren1_other.mode = src_entry1->stages[ostage1].mode;
139 ci->ren2_other.path = pair2->one->path;
140 hashcpy(ci->ren2_other.sha1, src_entry2->stages[ostage2].sha);
141 ci->ren2_other.mode = src_entry2->stages[ostage2].mode;
145 static int show(struct merge_options *o, int v)
147 return (!o->call_depth && o->verbosity >= v) || o->verbosity >= 5;
150 static void flush_output(struct merge_options *o)
152 if (o->obuf.len) {
153 fputs(o->obuf.buf, stdout);
154 strbuf_reset(&o->obuf);
158 __attribute__((format (printf, 3, 4)))
159 static void output(struct merge_options *o, int v, const char *fmt, ...)
161 va_list ap;
163 if (!show(o, v))
164 return;
166 strbuf_grow(&o->obuf, o->call_depth * 2 + 2);
167 memset(o->obuf.buf + o->obuf.len, ' ', o->call_depth * 2);
168 strbuf_setlen(&o->obuf, o->obuf.len + o->call_depth * 2);
170 va_start(ap, fmt);
171 strbuf_vaddf(&o->obuf, fmt, ap);
172 va_end(ap);
174 strbuf_add(&o->obuf, "\n", 1);
175 if (!o->buffer_output)
176 flush_output(o);
179 static void output_commit_title(struct merge_options *o, struct commit *commit)
181 int i;
182 flush_output(o);
183 for (i = o->call_depth; i--;)
184 fputs(" ", stdout);
185 if (commit->util)
186 printf("virtual %s\n", merge_remote_util(commit)->name);
187 else {
188 printf("%s ", find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV));
189 if (parse_commit(commit) != 0)
190 printf(_("(bad commit)\n"));
191 else {
192 const char *title;
193 int len = find_commit_subject(commit->buffer, &title);
194 if (len)
195 printf("%.*s\n", len, title);
200 static int add_cacheinfo(unsigned int mode, const unsigned char *sha1,
201 const char *path, int stage, int refresh, int options)
203 struct cache_entry *ce;
204 ce = make_cache_entry(mode, sha1 ? sha1 : null_sha1, path, stage, refresh);
205 if (!ce)
206 return error(_("addinfo_cache failed for path '%s'"), path);
207 return add_cache_entry(ce, options);
210 static void init_tree_desc_from_tree(struct tree_desc *desc, struct tree *tree)
212 parse_tree(tree);
213 init_tree_desc(desc, tree->buffer, tree->size);
216 static int git_merge_trees(int index_only,
217 struct tree *common,
218 struct tree *head,
219 struct tree *merge)
221 int rc;
222 struct tree_desc t[3];
223 struct unpack_trees_options opts;
225 memset(&opts, 0, sizeof(opts));
226 if (index_only)
227 opts.index_only = 1;
228 else
229 opts.update = 1;
230 opts.merge = 1;
231 opts.head_idx = 2;
232 opts.fn = threeway_merge;
233 opts.src_index = &the_index;
234 opts.dst_index = &the_index;
235 setup_unpack_trees_porcelain(&opts, "merge");
237 init_tree_desc_from_tree(t+0, common);
238 init_tree_desc_from_tree(t+1, head);
239 init_tree_desc_from_tree(t+2, merge);
241 rc = unpack_trees(3, t, &opts);
242 cache_tree_free(&active_cache_tree);
243 return rc;
246 struct tree *write_tree_from_memory(struct merge_options *o)
248 struct tree *result = NULL;
250 if (unmerged_cache()) {
251 int i;
252 fprintf(stderr, "BUG: There are unmerged index entries:\n");
253 for (i = 0; i < active_nr; i++) {
254 struct cache_entry *ce = active_cache[i];
255 if (ce_stage(ce))
256 fprintf(stderr, "BUG: %d %.*s\n", ce_stage(ce),
257 (int)ce_namelen(ce), ce->name);
259 die("Bug in merge-recursive.c");
262 if (!active_cache_tree)
263 active_cache_tree = cache_tree();
265 if (!cache_tree_fully_valid(active_cache_tree) &&
266 cache_tree_update(active_cache_tree,
267 active_cache, active_nr, 0) < 0)
268 die(_("error building trees"));
270 result = lookup_tree(active_cache_tree->sha1);
272 return result;
275 static int save_files_dirs(const unsigned char *sha1,
276 const char *base, int baselen, const char *path,
277 unsigned int mode, int stage, void *context)
279 int len = strlen(path);
280 char *newpath = xmalloc(baselen + len + 1);
281 struct merge_options *o = context;
283 memcpy(newpath, base, baselen);
284 memcpy(newpath + baselen, path, len);
285 newpath[baselen + len] = '\0';
287 if (S_ISDIR(mode))
288 string_list_insert(&o->current_directory_set, newpath);
289 else
290 string_list_insert(&o->current_file_set, newpath);
291 free(newpath);
293 return (S_ISDIR(mode) ? READ_TREE_RECURSIVE : 0);
296 static int get_files_dirs(struct merge_options *o, struct tree *tree)
298 int n;
299 struct pathspec match_all;
300 init_pathspec(&match_all, NULL);
301 if (read_tree_recursive(tree, "", 0, 0, &match_all, save_files_dirs, o))
302 return 0;
303 n = o->current_file_set.nr + o->current_directory_set.nr;
304 return n;
308 * Returns an index_entry instance which doesn't have to correspond to
309 * a real cache entry in Git's index.
311 static struct stage_data *insert_stage_data(const char *path,
312 struct tree *o, struct tree *a, struct tree *b,
313 struct string_list *entries)
315 struct string_list_item *item;
316 struct stage_data *e = xcalloc(1, sizeof(struct stage_data));
317 get_tree_entry(o->object.sha1, path,
318 e->stages[1].sha, &e->stages[1].mode);
319 get_tree_entry(a->object.sha1, path,
320 e->stages[2].sha, &e->stages[2].mode);
321 get_tree_entry(b->object.sha1, path,
322 e->stages[3].sha, &e->stages[3].mode);
323 item = string_list_insert(entries, path);
324 item->util = e;
325 return e;
329 * Create a dictionary mapping file names to stage_data objects. The
330 * dictionary contains one entry for every path with a non-zero stage entry.
332 static struct string_list *get_unmerged(void)
334 struct string_list *unmerged = xcalloc(1, sizeof(struct string_list));
335 int i;
337 unmerged->strdup_strings = 1;
339 for (i = 0; i < active_nr; i++) {
340 struct string_list_item *item;
341 struct stage_data *e;
342 struct cache_entry *ce = active_cache[i];
343 if (!ce_stage(ce))
344 continue;
346 item = string_list_lookup(unmerged, ce->name);
347 if (!item) {
348 item = string_list_insert(unmerged, ce->name);
349 item->util = xcalloc(1, sizeof(struct stage_data));
351 e = item->util;
352 e->stages[ce_stage(ce)].mode = ce->ce_mode;
353 hashcpy(e->stages[ce_stage(ce)].sha, ce->sha1);
356 return unmerged;
359 static int string_list_df_name_compare(const void *a, const void *b)
361 const struct string_list_item *one = a;
362 const struct string_list_item *two = b;
363 int onelen = strlen(one->string);
364 int twolen = strlen(two->string);
366 * Here we only care that entries for D/F conflicts are
367 * adjacent, in particular with the file of the D/F conflict
368 * appearing before files below the corresponding directory.
369 * The order of the rest of the list is irrelevant for us.
371 * To achieve this, we sort with df_name_compare and provide
372 * the mode S_IFDIR so that D/F conflicts will sort correctly.
373 * We use the mode S_IFDIR for everything else for simplicity,
374 * since in other cases any changes in their order due to
375 * sorting cause no problems for us.
377 int cmp = df_name_compare(one->string, onelen, S_IFDIR,
378 two->string, twolen, S_IFDIR);
380 * Now that 'foo' and 'foo/bar' compare equal, we have to make sure
381 * that 'foo' comes before 'foo/bar'.
383 if (cmp)
384 return cmp;
385 return onelen - twolen;
388 static void record_df_conflict_files(struct merge_options *o,
389 struct string_list *entries)
391 /* If there is a D/F conflict and the file for such a conflict
392 * currently exist in the working tree, we want to allow it to be
393 * removed to make room for the corresponding directory if needed.
394 * The files underneath the directories of such D/F conflicts will
395 * be processed before the corresponding file involved in the D/F
396 * conflict. If the D/F directory ends up being removed by the
397 * merge, then we won't have to touch the D/F file. If the D/F
398 * directory needs to be written to the working copy, then the D/F
399 * file will simply be removed (in make_room_for_path()) to make
400 * room for the necessary paths. Note that if both the directory
401 * and the file need to be present, then the D/F file will be
402 * reinstated with a new unique name at the time it is processed.
404 struct string_list df_sorted_entries;
405 const char *last_file = NULL;
406 int last_len = 0;
407 int i;
410 * If we're merging merge-bases, we don't want to bother with
411 * any working directory changes.
413 if (o->call_depth)
414 return;
416 /* Ensure D/F conflicts are adjacent in the entries list. */
417 memset(&df_sorted_entries, 0, sizeof(struct string_list));
418 for (i = 0; i < entries->nr; i++) {
419 struct string_list_item *next = &entries->items[i];
420 string_list_append(&df_sorted_entries, next->string)->util =
421 next->util;
423 qsort(df_sorted_entries.items, entries->nr, sizeof(*entries->items),
424 string_list_df_name_compare);
426 string_list_clear(&o->df_conflict_file_set, 1);
427 for (i = 0; i < df_sorted_entries.nr; i++) {
428 const char *path = df_sorted_entries.items[i].string;
429 int len = strlen(path);
430 struct stage_data *e = df_sorted_entries.items[i].util;
433 * Check if last_file & path correspond to a D/F conflict;
434 * i.e. whether path is last_file+'/'+<something>.
435 * If so, record that it's okay to remove last_file to make
436 * room for path and friends if needed.
438 if (last_file &&
439 len > last_len &&
440 memcmp(path, last_file, last_len) == 0 &&
441 path[last_len] == '/') {
442 string_list_insert(&o->df_conflict_file_set, last_file);
446 * Determine whether path could exist as a file in the
447 * working directory as a possible D/F conflict. This
448 * will only occur when it exists in stage 2 as a
449 * file.
451 if (S_ISREG(e->stages[2].mode) || S_ISLNK(e->stages[2].mode)) {
452 last_file = path;
453 last_len = len;
454 } else {
455 last_file = NULL;
458 string_list_clear(&df_sorted_entries, 0);
461 struct rename {
462 struct diff_filepair *pair;
463 struct stage_data *src_entry;
464 struct stage_data *dst_entry;
465 unsigned processed:1;
469 * Get information of all renames which occurred between 'o_tree' and
470 * 'tree'. We need the three trees in the merge ('o_tree', 'a_tree' and
471 * 'b_tree') to be able to associate the correct cache entries with
472 * the rename information. 'tree' is always equal to either a_tree or b_tree.
474 static struct string_list *get_renames(struct merge_options *o,
475 struct tree *tree,
476 struct tree *o_tree,
477 struct tree *a_tree,
478 struct tree *b_tree,
479 struct string_list *entries)
481 int i;
482 struct string_list *renames;
483 struct diff_options opts;
485 renames = xcalloc(1, sizeof(struct string_list));
486 diff_setup(&opts);
487 DIFF_OPT_SET(&opts, RECURSIVE);
488 DIFF_OPT_CLR(&opts, RENAME_EMPTY);
489 opts.detect_rename = DIFF_DETECT_RENAME;
490 opts.rename_limit = o->merge_rename_limit >= 0 ? o->merge_rename_limit :
491 o->diff_rename_limit >= 0 ? o->diff_rename_limit :
492 1000;
493 opts.rename_score = o->rename_score;
494 opts.show_rename_progress = o->show_rename_progress;
495 opts.output_format = DIFF_FORMAT_NO_OUTPUT;
496 diff_setup_done(&opts);
497 diff_tree_sha1(o_tree->object.sha1, tree->object.sha1, "", &opts);
498 diffcore_std(&opts);
499 if (opts.needed_rename_limit > o->needed_rename_limit)
500 o->needed_rename_limit = opts.needed_rename_limit;
501 for (i = 0; i < diff_queued_diff.nr; ++i) {
502 struct string_list_item *item;
503 struct rename *re;
504 struct diff_filepair *pair = diff_queued_diff.queue[i];
505 if (pair->status != 'R') {
506 diff_free_filepair(pair);
507 continue;
509 re = xmalloc(sizeof(*re));
510 re->processed = 0;
511 re->pair = pair;
512 item = string_list_lookup(entries, re->pair->one->path);
513 if (!item)
514 re->src_entry = insert_stage_data(re->pair->one->path,
515 o_tree, a_tree, b_tree, entries);
516 else
517 re->src_entry = item->util;
519 item = string_list_lookup(entries, re->pair->two->path);
520 if (!item)
521 re->dst_entry = insert_stage_data(re->pair->two->path,
522 o_tree, a_tree, b_tree, entries);
523 else
524 re->dst_entry = item->util;
525 item = string_list_insert(renames, pair->one->path);
526 item->util = re;
528 opts.output_format = DIFF_FORMAT_NO_OUTPUT;
529 diff_queued_diff.nr = 0;
530 diff_flush(&opts);
531 return renames;
534 static int update_stages(const char *path, const struct diff_filespec *o,
535 const struct diff_filespec *a,
536 const struct diff_filespec *b)
540 * NOTE: It is usually a bad idea to call update_stages on a path
541 * before calling update_file on that same path, since it can
542 * sometimes lead to spurious "refusing to lose untracked file..."
543 * messages from update_file (via make_room_for path via
544 * would_lose_untracked). Instead, reverse the order of the calls
545 * (executing update_file first and then update_stages).
547 int clear = 1;
548 int options = ADD_CACHE_OK_TO_ADD | ADD_CACHE_SKIP_DFCHECK;
549 if (clear)
550 if (remove_file_from_cache(path))
551 return -1;
552 if (o)
553 if (add_cacheinfo(o->mode, o->sha1, path, 1, 0, options))
554 return -1;
555 if (a)
556 if (add_cacheinfo(a->mode, a->sha1, path, 2, 0, options))
557 return -1;
558 if (b)
559 if (add_cacheinfo(b->mode, b->sha1, path, 3, 0, options))
560 return -1;
561 return 0;
564 static void update_entry(struct stage_data *entry,
565 struct diff_filespec *o,
566 struct diff_filespec *a,
567 struct diff_filespec *b)
569 entry->processed = 0;
570 entry->stages[1].mode = o->mode;
571 entry->stages[2].mode = a->mode;
572 entry->stages[3].mode = b->mode;
573 hashcpy(entry->stages[1].sha, o->sha1);
574 hashcpy(entry->stages[2].sha, a->sha1);
575 hashcpy(entry->stages[3].sha, b->sha1);
578 static int remove_file(struct merge_options *o, int clean,
579 const char *path, int no_wd)
581 int update_cache = o->call_depth || clean;
582 int update_working_directory = !o->call_depth && !no_wd;
584 if (update_cache) {
585 if (remove_file_from_cache(path))
586 return -1;
588 if (update_working_directory) {
589 if (remove_path(path))
590 return -1;
592 return 0;
595 static char *unique_path(struct merge_options *o, const char *path, const char *branch)
597 char *newpath = xmalloc(strlen(path) + 1 + strlen(branch) + 8 + 1);
598 int suffix = 0;
599 struct stat st;
600 char *p = newpath + strlen(path);
601 strcpy(newpath, path);
602 *(p++) = '~';
603 strcpy(p, branch);
604 for (; *p; ++p)
605 if ('/' == *p)
606 *p = '_';
607 while (string_list_has_string(&o->current_file_set, newpath) ||
608 string_list_has_string(&o->current_directory_set, newpath) ||
609 lstat(newpath, &st) == 0)
610 sprintf(p, "_%d", suffix++);
612 string_list_insert(&o->current_file_set, newpath);
613 return newpath;
616 static int dir_in_way(const char *path, int check_working_copy)
618 int pos, pathlen = strlen(path);
619 char *dirpath = xmalloc(pathlen + 2);
620 struct stat st;
622 strcpy(dirpath, path);
623 dirpath[pathlen] = '/';
624 dirpath[pathlen+1] = '\0';
626 pos = cache_name_pos(dirpath, pathlen+1);
628 if (pos < 0)
629 pos = -1 - pos;
630 if (pos < active_nr &&
631 !strncmp(dirpath, active_cache[pos]->name, pathlen+1)) {
632 free(dirpath);
633 return 1;
636 free(dirpath);
637 return check_working_copy && !lstat(path, &st) && S_ISDIR(st.st_mode);
640 static int was_tracked(const char *path)
642 int pos = cache_name_pos(path, strlen(path));
644 if (pos < 0)
645 pos = -1 - pos;
646 while (pos < active_nr &&
647 !strcmp(path, active_cache[pos]->name)) {
649 * If stage #0, it is definitely tracked.
650 * If it has stage #2 then it was tracked
651 * before this merge started. All other
652 * cases the path was not tracked.
654 switch (ce_stage(active_cache[pos])) {
655 case 0:
656 case 2:
657 return 1;
659 pos++;
661 return 0;
664 static int would_lose_untracked(const char *path)
666 return !was_tracked(path) && file_exists(path);
669 static int make_room_for_path(struct merge_options *o, const char *path)
671 int status, i;
672 const char *msg = _("failed to create path '%s'%s");
674 /* Unlink any D/F conflict files that are in the way */
675 for (i = 0; i < o->df_conflict_file_set.nr; i++) {
676 const char *df_path = o->df_conflict_file_set.items[i].string;
677 size_t pathlen = strlen(path);
678 size_t df_pathlen = strlen(df_path);
679 if (df_pathlen < pathlen &&
680 path[df_pathlen] == '/' &&
681 strncmp(path, df_path, df_pathlen) == 0) {
682 output(o, 3,
683 _("Removing %s to make room for subdirectory\n"),
684 df_path);
685 unlink(df_path);
686 unsorted_string_list_delete_item(&o->df_conflict_file_set,
687 i, 0);
688 break;
692 /* Make sure leading directories are created */
693 status = safe_create_leading_directories_const(path);
694 if (status) {
695 if (status == -3) {
696 /* something else exists */
697 error(msg, path, _(": perhaps a D/F conflict?"));
698 return -1;
700 die(msg, path, "");
704 * Do not unlink a file in the work tree if we are not
705 * tracking it.
707 if (would_lose_untracked(path))
708 return error(_("refusing to lose untracked file at '%s'"),
709 path);
711 /* Successful unlink is good.. */
712 if (!unlink(path))
713 return 0;
714 /* .. and so is no existing file */
715 if (errno == ENOENT)
716 return 0;
717 /* .. but not some other error (who really cares what?) */
718 return error(msg, path, _(": perhaps a D/F conflict?"));
721 static void update_file_flags(struct merge_options *o,
722 const unsigned char *sha,
723 unsigned mode,
724 const char *path,
725 int update_cache,
726 int update_wd)
728 if (o->call_depth)
729 update_wd = 0;
731 if (update_wd) {
732 enum object_type type;
733 void *buf;
734 unsigned long size;
736 if (S_ISGITLINK(mode)) {
738 * We may later decide to recursively descend into
739 * the submodule directory and update its index
740 * and/or work tree, but we do not do that now.
742 update_wd = 0;
743 goto update_index;
746 buf = read_sha1_file(sha, &type, &size);
747 if (!buf)
748 die(_("cannot read object %s '%s'"), sha1_to_hex(sha), path);
749 if (type != OBJ_BLOB)
750 die(_("blob expected for %s '%s'"), sha1_to_hex(sha), path);
751 if (S_ISREG(mode)) {
752 struct strbuf strbuf = STRBUF_INIT;
753 if (convert_to_working_tree(path, buf, size, &strbuf)) {
754 free(buf);
755 size = strbuf.len;
756 buf = strbuf_detach(&strbuf, NULL);
760 if (make_room_for_path(o, path) < 0) {
761 update_wd = 0;
762 free(buf);
763 goto update_index;
765 if (S_ISREG(mode) || (!has_symlinks && S_ISLNK(mode))) {
766 int fd;
767 if (mode & 0100)
768 mode = 0777;
769 else
770 mode = 0666;
771 fd = open(path, O_WRONLY | O_TRUNC | O_CREAT, mode);
772 if (fd < 0)
773 die_errno(_("failed to open '%s'"), path);
774 write_in_full(fd, buf, size);
775 close(fd);
776 } else if (S_ISLNK(mode)) {
777 char *lnk = xmemdupz(buf, size);
778 safe_create_leading_directories_const(path);
779 unlink(path);
780 if (symlink(lnk, path))
781 die_errno(_("failed to symlink '%s'"), path);
782 free(lnk);
783 } else
784 die(_("do not know what to do with %06o %s '%s'"),
785 mode, sha1_to_hex(sha), path);
786 free(buf);
788 update_index:
789 if (update_cache)
790 add_cacheinfo(mode, sha, path, 0, update_wd, ADD_CACHE_OK_TO_ADD);
793 static void update_file(struct merge_options *o,
794 int clean,
795 const unsigned char *sha,
796 unsigned mode,
797 const char *path)
799 update_file_flags(o, sha, mode, path, o->call_depth || clean, !o->call_depth);
802 /* Low level file merging, update and removal */
804 struct merge_file_info {
805 unsigned char sha[20];
806 unsigned mode;
807 unsigned clean:1,
808 merge:1;
811 static int merge_3way(struct merge_options *o,
812 mmbuffer_t *result_buf,
813 const struct diff_filespec *one,
814 const struct diff_filespec *a,
815 const struct diff_filespec *b,
816 const char *branch1,
817 const char *branch2)
819 mmfile_t orig, src1, src2;
820 struct ll_merge_options ll_opts = {0};
821 char *base_name, *name1, *name2;
822 int merge_status;
824 ll_opts.renormalize = o->renormalize;
825 ll_opts.xdl_opts = o->xdl_opts;
827 if (o->call_depth) {
828 ll_opts.virtual_ancestor = 1;
829 ll_opts.variant = 0;
830 } else {
831 switch (o->recursive_variant) {
832 case MERGE_RECURSIVE_OURS:
833 ll_opts.variant = XDL_MERGE_FAVOR_OURS;
834 break;
835 case MERGE_RECURSIVE_THEIRS:
836 ll_opts.variant = XDL_MERGE_FAVOR_THEIRS;
837 break;
838 default:
839 ll_opts.variant = 0;
840 break;
844 if (strcmp(a->path, b->path) ||
845 (o->ancestor != NULL && strcmp(a->path, one->path) != 0)) {
846 base_name = o->ancestor == NULL ? NULL :
847 xstrdup(mkpath("%s:%s", o->ancestor, one->path));
848 name1 = xstrdup(mkpath("%s:%s", branch1, a->path));
849 name2 = xstrdup(mkpath("%s:%s", branch2, b->path));
850 } else {
851 base_name = o->ancestor == NULL ? NULL :
852 xstrdup(mkpath("%s", o->ancestor));
853 name1 = xstrdup(mkpath("%s", branch1));
854 name2 = xstrdup(mkpath("%s", branch2));
857 read_mmblob(&orig, one->sha1);
858 read_mmblob(&src1, a->sha1);
859 read_mmblob(&src2, b->sha1);
861 merge_status = ll_merge(result_buf, a->path, &orig, base_name,
862 &src1, name1, &src2, name2, &ll_opts);
864 free(name1);
865 free(name2);
866 free(orig.ptr);
867 free(src1.ptr);
868 free(src2.ptr);
869 return merge_status;
872 static struct merge_file_info merge_file_1(struct merge_options *o,
873 const struct diff_filespec *one,
874 const struct diff_filespec *a,
875 const struct diff_filespec *b,
876 const char *branch1,
877 const char *branch2)
879 struct merge_file_info result;
880 result.merge = 0;
881 result.clean = 1;
883 if ((S_IFMT & a->mode) != (S_IFMT & b->mode)) {
884 result.clean = 0;
885 if (S_ISREG(a->mode)) {
886 result.mode = a->mode;
887 hashcpy(result.sha, a->sha1);
888 } else {
889 result.mode = b->mode;
890 hashcpy(result.sha, b->sha1);
892 } else {
893 if (!sha_eq(a->sha1, one->sha1) && !sha_eq(b->sha1, one->sha1))
894 result.merge = 1;
897 * Merge modes
899 if (a->mode == b->mode || a->mode == one->mode)
900 result.mode = b->mode;
901 else {
902 result.mode = a->mode;
903 if (b->mode != one->mode) {
904 result.clean = 0;
905 result.merge = 1;
909 if (sha_eq(a->sha1, b->sha1) || sha_eq(a->sha1, one->sha1))
910 hashcpy(result.sha, b->sha1);
911 else if (sha_eq(b->sha1, one->sha1))
912 hashcpy(result.sha, a->sha1);
913 else if (S_ISREG(a->mode)) {
914 mmbuffer_t result_buf;
915 int merge_status;
917 merge_status = merge_3way(o, &result_buf, one, a, b,
918 branch1, branch2);
920 if ((merge_status < 0) || !result_buf.ptr)
921 die(_("Failed to execute internal merge"));
923 if (write_sha1_file(result_buf.ptr, result_buf.size,
924 blob_type, result.sha))
925 die(_("Unable to add %s to database"),
926 a->path);
928 free(result_buf.ptr);
929 result.clean = (merge_status == 0);
930 } else if (S_ISGITLINK(a->mode)) {
931 result.clean = merge_submodule(result.sha,
932 one->path, one->sha1,
933 a->sha1, b->sha1,
934 !o->call_depth);
935 } else if (S_ISLNK(a->mode)) {
936 hashcpy(result.sha, a->sha1);
938 if (!sha_eq(a->sha1, b->sha1))
939 result.clean = 0;
940 } else {
941 die(_("unsupported object type in the tree"));
945 return result;
948 static struct merge_file_info
949 merge_file_special_markers(struct merge_options *o,
950 const struct diff_filespec *one,
951 const struct diff_filespec *a,
952 const struct diff_filespec *b,
953 const char *branch1,
954 const char *filename1,
955 const char *branch2,
956 const char *filename2)
958 char *side1 = NULL;
959 char *side2 = NULL;
960 struct merge_file_info mfi;
962 if (filename1) {
963 side1 = xmalloc(strlen(branch1) + strlen(filename1) + 2);
964 sprintf(side1, "%s:%s", branch1, filename1);
966 if (filename2) {
967 side2 = xmalloc(strlen(branch2) + strlen(filename2) + 2);
968 sprintf(side2, "%s:%s", branch2, filename2);
971 mfi = merge_file_1(o, one, a, b,
972 side1 ? side1 : branch1, side2 ? side2 : branch2);
973 free(side1);
974 free(side2);
975 return mfi;
978 static struct merge_file_info merge_file(struct merge_options *o,
979 const char *path,
980 const unsigned char *o_sha, int o_mode,
981 const unsigned char *a_sha, int a_mode,
982 const unsigned char *b_sha, int b_mode,
983 const char *branch1,
984 const char *branch2)
986 struct diff_filespec one, a, b;
988 one.path = a.path = b.path = (char *)path;
989 hashcpy(one.sha1, o_sha);
990 one.mode = o_mode;
991 hashcpy(a.sha1, a_sha);
992 a.mode = a_mode;
993 hashcpy(b.sha1, b_sha);
994 b.mode = b_mode;
995 return merge_file_1(o, &one, &a, &b, branch1, branch2);
998 static void handle_change_delete(struct merge_options *o,
999 const char *path,
1000 const unsigned char *o_sha, int o_mode,
1001 const unsigned char *a_sha, int a_mode,
1002 const unsigned char *b_sha, int b_mode,
1003 const char *change, const char *change_past)
1005 char *renamed = NULL;
1006 if (dir_in_way(path, !o->call_depth)) {
1007 renamed = unique_path(o, path, a_sha ? o->branch1 : o->branch2);
1010 if (o->call_depth) {
1012 * We cannot arbitrarily accept either a_sha or b_sha as
1013 * correct; since there is no true "middle point" between
1014 * them, simply reuse the base version for virtual merge base.
1016 remove_file_from_cache(path);
1017 update_file(o, 0, o_sha, o_mode, renamed ? renamed : path);
1018 } else if (!a_sha) {
1019 if (!renamed) {
1020 output(o, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1021 "and %s in %s. Version %s of %s left in tree."),
1022 change, path, o->branch1, change_past,
1023 o->branch2, o->branch2, path);
1024 update_file(o, 0, b_sha, b_mode, path);
1025 } else {
1026 output(o, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1027 "and %s in %s. Version %s of %s left in tree at %s."),
1028 change, path, o->branch1, change_past,
1029 o->branch2, o->branch2, path, renamed);
1030 update_file(o, 0, b_sha, b_mode, renamed);
1032 } else {
1033 if (!renamed) {
1034 output(o, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1035 "and %s in %s. Version %s of %s left in tree."),
1036 change, path, o->branch2, change_past,
1037 o->branch1, o->branch1, path);
1038 } else {
1039 output(o, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1040 "and %s in %s. Version %s of %s left in tree at %s."),
1041 change, path, o->branch2, change_past,
1042 o->branch1, o->branch1, path, renamed);
1043 update_file(o, 0, a_sha, a_mode, renamed);
1046 * No need to call update_file() on path when !renamed, since
1047 * that would needlessly touch path. We could call
1048 * update_file_flags() with update_cache=0 and update_wd=0,
1049 * but that's a no-op.
1052 free(renamed);
1055 static void conflict_rename_delete(struct merge_options *o,
1056 struct diff_filepair *pair,
1057 const char *rename_branch,
1058 const char *other_branch)
1060 const struct diff_filespec *orig = pair->one;
1061 const struct diff_filespec *dest = pair->two;
1062 const unsigned char *a_sha = NULL;
1063 const unsigned char *b_sha = NULL;
1064 int a_mode = 0;
1065 int b_mode = 0;
1067 if (rename_branch == o->branch1) {
1068 a_sha = dest->sha1;
1069 a_mode = dest->mode;
1070 } else {
1071 b_sha = dest->sha1;
1072 b_mode = dest->mode;
1075 handle_change_delete(o,
1076 o->call_depth ? orig->path : dest->path,
1077 orig->sha1, orig->mode,
1078 a_sha, a_mode,
1079 b_sha, b_mode,
1080 _("rename"), _("renamed"));
1082 if (o->call_depth) {
1083 remove_file_from_cache(dest->path);
1084 } else {
1085 update_stages(dest->path, NULL,
1086 rename_branch == o->branch1 ? dest : NULL,
1087 rename_branch == o->branch1 ? NULL : dest);
1092 static struct diff_filespec *filespec_from_entry(struct diff_filespec *target,
1093 struct stage_data *entry,
1094 int stage)
1096 unsigned char *sha = entry->stages[stage].sha;
1097 unsigned mode = entry->stages[stage].mode;
1098 if (mode == 0 || is_null_sha1(sha))
1099 return NULL;
1100 hashcpy(target->sha1, sha);
1101 target->mode = mode;
1102 return target;
1105 static void handle_file(struct merge_options *o,
1106 struct diff_filespec *rename,
1107 int stage,
1108 struct rename_conflict_info *ci)
1110 char *dst_name = rename->path;
1111 struct stage_data *dst_entry;
1112 const char *cur_branch, *other_branch;
1113 struct diff_filespec other;
1114 struct diff_filespec *add;
1116 if (stage == 2) {
1117 dst_entry = ci->dst_entry1;
1118 cur_branch = ci->branch1;
1119 other_branch = ci->branch2;
1120 } else {
1121 dst_entry = ci->dst_entry2;
1122 cur_branch = ci->branch2;
1123 other_branch = ci->branch1;
1126 add = filespec_from_entry(&other, dst_entry, stage ^ 1);
1127 if (add) {
1128 char *add_name = unique_path(o, rename->path, other_branch);
1129 update_file(o, 0, add->sha1, add->mode, add_name);
1131 remove_file(o, 0, rename->path, 0);
1132 dst_name = unique_path(o, rename->path, cur_branch);
1133 } else {
1134 if (dir_in_way(rename->path, !o->call_depth)) {
1135 dst_name = unique_path(o, rename->path, cur_branch);
1136 output(o, 1, _("%s is a directory in %s adding as %s instead"),
1137 rename->path, other_branch, dst_name);
1140 update_file(o, 0, rename->sha1, rename->mode, dst_name);
1141 if (stage == 2)
1142 update_stages(rename->path, NULL, rename, add);
1143 else
1144 update_stages(rename->path, NULL, add, rename);
1146 if (dst_name != rename->path)
1147 free(dst_name);
1150 static void conflict_rename_rename_1to2(struct merge_options *o,
1151 struct rename_conflict_info *ci)
1153 /* One file was renamed in both branches, but to different names. */
1154 struct diff_filespec *one = ci->pair1->one;
1155 struct diff_filespec *a = ci->pair1->two;
1156 struct diff_filespec *b = ci->pair2->two;
1158 output(o, 1, _("CONFLICT (rename/rename): "
1159 "Rename \"%s\"->\"%s\" in branch \"%s\" "
1160 "rename \"%s\"->\"%s\" in \"%s\"%s"),
1161 one->path, a->path, ci->branch1,
1162 one->path, b->path, ci->branch2,
1163 o->call_depth ? _(" (left unresolved)") : "");
1164 if (o->call_depth) {
1165 struct merge_file_info mfi;
1166 struct diff_filespec other;
1167 struct diff_filespec *add;
1168 mfi = merge_file(o, one->path,
1169 one->sha1, one->mode,
1170 a->sha1, a->mode,
1171 b->sha1, b->mode,
1172 ci->branch1, ci->branch2);
1174 * FIXME: For rename/add-source conflicts (if we could detect
1175 * such), this is wrong. We should instead find a unique
1176 * pathname and then either rename the add-source file to that
1177 * unique path, or use that unique path instead of src here.
1179 update_file(o, 0, mfi.sha, mfi.mode, one->path);
1182 * Above, we put the merged content at the merge-base's
1183 * path. Now we usually need to delete both a->path and
1184 * b->path. However, the rename on each side of the merge
1185 * could also be involved in a rename/add conflict. In
1186 * such cases, we should keep the added file around,
1187 * resolving the conflict at that path in its favor.
1189 add = filespec_from_entry(&other, ci->dst_entry1, 2 ^ 1);
1190 if (add)
1191 update_file(o, 0, add->sha1, add->mode, a->path);
1192 else
1193 remove_file_from_cache(a->path);
1194 add = filespec_from_entry(&other, ci->dst_entry2, 3 ^ 1);
1195 if (add)
1196 update_file(o, 0, add->sha1, add->mode, b->path);
1197 else
1198 remove_file_from_cache(b->path);
1199 } else {
1200 handle_file(o, a, 2, ci);
1201 handle_file(o, b, 3, ci);
1205 static void conflict_rename_rename_2to1(struct merge_options *o,
1206 struct rename_conflict_info *ci)
1208 /* Two files, a & b, were renamed to the same thing, c. */
1209 struct diff_filespec *a = ci->pair1->one;
1210 struct diff_filespec *b = ci->pair2->one;
1211 struct diff_filespec *c1 = ci->pair1->two;
1212 struct diff_filespec *c2 = ci->pair2->two;
1213 char *path = c1->path; /* == c2->path */
1214 struct merge_file_info mfi_c1;
1215 struct merge_file_info mfi_c2;
1217 output(o, 1, _("CONFLICT (rename/rename): "
1218 "Rename %s->%s in %s. "
1219 "Rename %s->%s in %s"),
1220 a->path, c1->path, ci->branch1,
1221 b->path, c2->path, ci->branch2);
1223 remove_file(o, 1, a->path, would_lose_untracked(a->path));
1224 remove_file(o, 1, b->path, would_lose_untracked(b->path));
1226 mfi_c1 = merge_file_special_markers(o, a, c1, &ci->ren1_other,
1227 o->branch1, c1->path,
1228 o->branch2, ci->ren1_other.path);
1229 mfi_c2 = merge_file_special_markers(o, b, &ci->ren2_other, c2,
1230 o->branch1, ci->ren2_other.path,
1231 o->branch2, c2->path);
1233 if (o->call_depth) {
1235 * If mfi_c1.clean && mfi_c2.clean, then it might make
1236 * sense to do a two-way merge of those results. But, I
1237 * think in all cases, it makes sense to have the virtual
1238 * merge base just undo the renames; they can be detected
1239 * again later for the non-recursive merge.
1241 remove_file(o, 0, path, 0);
1242 update_file(o, 0, mfi_c1.sha, mfi_c1.mode, a->path);
1243 update_file(o, 0, mfi_c2.sha, mfi_c2.mode, b->path);
1244 } else {
1245 char *new_path1 = unique_path(o, path, ci->branch1);
1246 char *new_path2 = unique_path(o, path, ci->branch2);
1247 output(o, 1, _("Renaming %s to %s and %s to %s instead"),
1248 a->path, new_path1, b->path, new_path2);
1249 remove_file(o, 0, path, 0);
1250 update_file(o, 0, mfi_c1.sha, mfi_c1.mode, new_path1);
1251 update_file(o, 0, mfi_c2.sha, mfi_c2.mode, new_path2);
1252 free(new_path2);
1253 free(new_path1);
1257 static int process_renames(struct merge_options *o,
1258 struct string_list *a_renames,
1259 struct string_list *b_renames)
1261 int clean_merge = 1, i, j;
1262 struct string_list a_by_dst = STRING_LIST_INIT_NODUP;
1263 struct string_list b_by_dst = STRING_LIST_INIT_NODUP;
1264 const struct rename *sre;
1266 for (i = 0; i < a_renames->nr; i++) {
1267 sre = a_renames->items[i].util;
1268 string_list_insert(&a_by_dst, sre->pair->two->path)->util
1269 = (void *)sre;
1271 for (i = 0; i < b_renames->nr; i++) {
1272 sre = b_renames->items[i].util;
1273 string_list_insert(&b_by_dst, sre->pair->two->path)->util
1274 = (void *)sre;
1277 for (i = 0, j = 0; i < a_renames->nr || j < b_renames->nr;) {
1278 struct string_list *renames1, *renames2Dst;
1279 struct rename *ren1 = NULL, *ren2 = NULL;
1280 const char *branch1, *branch2;
1281 const char *ren1_src, *ren1_dst;
1282 struct string_list_item *lookup;
1284 if (i >= a_renames->nr) {
1285 ren2 = b_renames->items[j++].util;
1286 } else if (j >= b_renames->nr) {
1287 ren1 = a_renames->items[i++].util;
1288 } else {
1289 int compare = strcmp(a_renames->items[i].string,
1290 b_renames->items[j].string);
1291 if (compare <= 0)
1292 ren1 = a_renames->items[i++].util;
1293 if (compare >= 0)
1294 ren2 = b_renames->items[j++].util;
1297 /* TODO: refactor, so that 1/2 are not needed */
1298 if (ren1) {
1299 renames1 = a_renames;
1300 renames2Dst = &b_by_dst;
1301 branch1 = o->branch1;
1302 branch2 = o->branch2;
1303 } else {
1304 struct rename *tmp;
1305 renames1 = b_renames;
1306 renames2Dst = &a_by_dst;
1307 branch1 = o->branch2;
1308 branch2 = o->branch1;
1309 tmp = ren2;
1310 ren2 = ren1;
1311 ren1 = tmp;
1314 if (ren1->processed)
1315 continue;
1316 ren1->processed = 1;
1317 ren1->dst_entry->processed = 1;
1318 /* BUG: We should only mark src_entry as processed if we
1319 * are not dealing with a rename + add-source case.
1321 ren1->src_entry->processed = 1;
1323 ren1_src = ren1->pair->one->path;
1324 ren1_dst = ren1->pair->two->path;
1326 if (ren2) {
1327 /* One file renamed on both sides */
1328 const char *ren2_src = ren2->pair->one->path;
1329 const char *ren2_dst = ren2->pair->two->path;
1330 enum rename_type rename_type;
1331 if (strcmp(ren1_src, ren2_src) != 0)
1332 die("ren1_src != ren2_src");
1333 ren2->dst_entry->processed = 1;
1334 ren2->processed = 1;
1335 if (strcmp(ren1_dst, ren2_dst) != 0) {
1336 rename_type = RENAME_ONE_FILE_TO_TWO;
1337 clean_merge = 0;
1338 } else {
1339 rename_type = RENAME_ONE_FILE_TO_ONE;
1340 /* BUG: We should only remove ren1_src in
1341 * the base stage (think of rename +
1342 * add-source cases).
1344 remove_file(o, 1, ren1_src, 1);
1345 update_entry(ren1->dst_entry,
1346 ren1->pair->one,
1347 ren1->pair->two,
1348 ren2->pair->two);
1350 setup_rename_conflict_info(rename_type,
1351 ren1->pair,
1352 ren2->pair,
1353 branch1,
1354 branch2,
1355 ren1->dst_entry,
1356 ren2->dst_entry,
1358 NULL,
1359 NULL);
1360 } else if ((lookup = string_list_lookup(renames2Dst, ren1_dst))) {
1361 /* Two different files renamed to the same thing */
1362 char *ren2_dst;
1363 ren2 = lookup->util;
1364 ren2_dst = ren2->pair->two->path;
1365 if (strcmp(ren1_dst, ren2_dst) != 0)
1366 die("ren1_dst != ren2_dst");
1368 clean_merge = 0;
1369 ren2->processed = 1;
1371 * BUG: We should only mark src_entry as processed
1372 * if we are not dealing with a rename + add-source
1373 * case.
1375 ren2->src_entry->processed = 1;
1377 setup_rename_conflict_info(RENAME_TWO_FILES_TO_ONE,
1378 ren1->pair,
1379 ren2->pair,
1380 branch1,
1381 branch2,
1382 ren1->dst_entry,
1383 ren2->dst_entry,
1385 ren1->src_entry,
1386 ren2->src_entry);
1388 } else {
1389 /* Renamed in 1, maybe changed in 2 */
1390 /* we only use sha1 and mode of these */
1391 struct diff_filespec src_other, dst_other;
1392 int try_merge;
1395 * unpack_trees loads entries from common-commit
1396 * into stage 1, from head-commit into stage 2, and
1397 * from merge-commit into stage 3. We keep track
1398 * of which side corresponds to the rename.
1400 int renamed_stage = a_renames == renames1 ? 2 : 3;
1401 int other_stage = a_renames == renames1 ? 3 : 2;
1403 /* BUG: We should only remove ren1_src in the base
1404 * stage and in other_stage (think of rename +
1405 * add-source case).
1407 remove_file(o, 1, ren1_src,
1408 renamed_stage == 2 || !was_tracked(ren1_src));
1410 hashcpy(src_other.sha1, ren1->src_entry->stages[other_stage].sha);
1411 src_other.mode = ren1->src_entry->stages[other_stage].mode;
1412 hashcpy(dst_other.sha1, ren1->dst_entry->stages[other_stage].sha);
1413 dst_other.mode = ren1->dst_entry->stages[other_stage].mode;
1414 try_merge = 0;
1416 if (sha_eq(src_other.sha1, null_sha1)) {
1417 setup_rename_conflict_info(RENAME_DELETE,
1418 ren1->pair,
1419 NULL,
1420 branch1,
1421 branch2,
1422 ren1->dst_entry,
1423 NULL,
1425 NULL,
1426 NULL);
1427 } else if ((dst_other.mode == ren1->pair->two->mode) &&
1428 sha_eq(dst_other.sha1, ren1->pair->two->sha1)) {
1430 * Added file on the other side identical to
1431 * the file being renamed: clean merge.
1432 * Also, there is no need to overwrite the
1433 * file already in the working copy, so call
1434 * update_file_flags() instead of
1435 * update_file().
1437 update_file_flags(o,
1438 ren1->pair->two->sha1,
1439 ren1->pair->two->mode,
1440 ren1_dst,
1441 1, /* update_cache */
1442 0 /* update_wd */);
1443 } else if (!sha_eq(dst_other.sha1, null_sha1)) {
1444 clean_merge = 0;
1445 try_merge = 1;
1446 output(o, 1, _("CONFLICT (rename/add): Rename %s->%s in %s. "
1447 "%s added in %s"),
1448 ren1_src, ren1_dst, branch1,
1449 ren1_dst, branch2);
1450 if (o->call_depth) {
1451 struct merge_file_info mfi;
1452 mfi = merge_file(o, ren1_dst, null_sha1, 0,
1453 ren1->pair->two->sha1, ren1->pair->two->mode,
1454 dst_other.sha1, dst_other.mode,
1455 branch1, branch2);
1456 output(o, 1, _("Adding merged %s"), ren1_dst);
1457 update_file(o, 0, mfi.sha, mfi.mode, ren1_dst);
1458 try_merge = 0;
1459 } else {
1460 char *new_path = unique_path(o, ren1_dst, branch2);
1461 output(o, 1, _("Adding as %s instead"), new_path);
1462 update_file(o, 0, dst_other.sha1, dst_other.mode, new_path);
1463 free(new_path);
1465 } else
1466 try_merge = 1;
1468 if (try_merge) {
1469 struct diff_filespec *one, *a, *b;
1470 src_other.path = (char *)ren1_src;
1472 one = ren1->pair->one;
1473 if (a_renames == renames1) {
1474 a = ren1->pair->two;
1475 b = &src_other;
1476 } else {
1477 b = ren1->pair->two;
1478 a = &src_other;
1480 update_entry(ren1->dst_entry, one, a, b);
1481 setup_rename_conflict_info(RENAME_NORMAL,
1482 ren1->pair,
1483 NULL,
1484 branch1,
1485 NULL,
1486 ren1->dst_entry,
1487 NULL,
1489 NULL,
1490 NULL);
1494 string_list_clear(&a_by_dst, 0);
1495 string_list_clear(&b_by_dst, 0);
1497 return clean_merge;
1500 static unsigned char *stage_sha(const unsigned char *sha, unsigned mode)
1502 return (is_null_sha1(sha) || mode == 0) ? NULL: (unsigned char *)sha;
1505 static int read_sha1_strbuf(const unsigned char *sha1, struct strbuf *dst)
1507 void *buf;
1508 enum object_type type;
1509 unsigned long size;
1510 buf = read_sha1_file(sha1, &type, &size);
1511 if (!buf)
1512 return error(_("cannot read object %s"), sha1_to_hex(sha1));
1513 if (type != OBJ_BLOB) {
1514 free(buf);
1515 return error(_("object %s is not a blob"), sha1_to_hex(sha1));
1517 strbuf_attach(dst, buf, size, size + 1);
1518 return 0;
1521 static int blob_unchanged(const unsigned char *o_sha,
1522 const unsigned char *a_sha,
1523 int renormalize, const char *path)
1525 struct strbuf o = STRBUF_INIT;
1526 struct strbuf a = STRBUF_INIT;
1527 int ret = 0; /* assume changed for safety */
1529 if (sha_eq(o_sha, a_sha))
1530 return 1;
1531 if (!renormalize)
1532 return 0;
1534 assert(o_sha && a_sha);
1535 if (read_sha1_strbuf(o_sha, &o) || read_sha1_strbuf(a_sha, &a))
1536 goto error_return;
1538 * Note: binary | is used so that both renormalizations are
1539 * performed. Comparison can be skipped if both files are
1540 * unchanged since their sha1s have already been compared.
1542 if (renormalize_buffer(path, o.buf, o.len, &o) |
1543 renormalize_buffer(path, a.buf, o.len, &a))
1544 ret = (o.len == a.len && !memcmp(o.buf, a.buf, o.len));
1546 error_return:
1547 strbuf_release(&o);
1548 strbuf_release(&a);
1549 return ret;
1552 static void handle_modify_delete(struct merge_options *o,
1553 const char *path,
1554 unsigned char *o_sha, int o_mode,
1555 unsigned char *a_sha, int a_mode,
1556 unsigned char *b_sha, int b_mode)
1558 handle_change_delete(o,
1559 path,
1560 o_sha, o_mode,
1561 a_sha, a_mode,
1562 b_sha, b_mode,
1563 _("modify"), _("modified"));
1566 static int merge_content(struct merge_options *o,
1567 const char *path,
1568 unsigned char *o_sha, int o_mode,
1569 unsigned char *a_sha, int a_mode,
1570 unsigned char *b_sha, int b_mode,
1571 struct rename_conflict_info *rename_conflict_info)
1573 const char *reason = _("content");
1574 const char *path1 = NULL, *path2 = NULL;
1575 struct merge_file_info mfi;
1576 struct diff_filespec one, a, b;
1577 unsigned df_conflict_remains = 0;
1579 if (!o_sha) {
1580 reason = _("add/add");
1581 o_sha = (unsigned char *)null_sha1;
1583 one.path = a.path = b.path = (char *)path;
1584 hashcpy(one.sha1, o_sha);
1585 one.mode = o_mode;
1586 hashcpy(a.sha1, a_sha);
1587 a.mode = a_mode;
1588 hashcpy(b.sha1, b_sha);
1589 b.mode = b_mode;
1591 if (rename_conflict_info) {
1592 struct diff_filepair *pair1 = rename_conflict_info->pair1;
1594 path1 = (o->branch1 == rename_conflict_info->branch1) ?
1595 pair1->two->path : pair1->one->path;
1596 /* If rename_conflict_info->pair2 != NULL, we are in
1597 * RENAME_ONE_FILE_TO_ONE case. Otherwise, we have a
1598 * normal rename.
1600 path2 = (rename_conflict_info->pair2 ||
1601 o->branch2 == rename_conflict_info->branch1) ?
1602 pair1->two->path : pair1->one->path;
1604 if (dir_in_way(path, !o->call_depth))
1605 df_conflict_remains = 1;
1607 mfi = merge_file_special_markers(o, &one, &a, &b,
1608 o->branch1, path1,
1609 o->branch2, path2);
1611 if (mfi.clean && !df_conflict_remains &&
1612 sha_eq(mfi.sha, a_sha) && mfi.mode == a_mode) {
1613 int path_renamed_outside_HEAD;
1614 output(o, 3, _("Skipped %s (merged same as existing)"), path);
1616 * The content merge resulted in the same file contents we
1617 * already had. We can return early if those file contents
1618 * are recorded at the correct path (which may not be true
1619 * if the merge involves a rename).
1621 path_renamed_outside_HEAD = !path2 || !strcmp(path, path2);
1622 if (!path_renamed_outside_HEAD) {
1623 add_cacheinfo(mfi.mode, mfi.sha, path,
1624 0, (!o->call_depth), 0);
1625 return mfi.clean;
1627 } else
1628 output(o, 2, _("Auto-merging %s"), path);
1630 if (!mfi.clean) {
1631 if (S_ISGITLINK(mfi.mode))
1632 reason = _("submodule");
1633 output(o, 1, _("CONFLICT (%s): Merge conflict in %s"),
1634 reason, path);
1635 if (rename_conflict_info && !df_conflict_remains)
1636 update_stages(path, &one, &a, &b);
1639 if (df_conflict_remains) {
1640 char *new_path;
1641 if (o->call_depth) {
1642 remove_file_from_cache(path);
1643 } else {
1644 if (!mfi.clean)
1645 update_stages(path, &one, &a, &b);
1646 else {
1647 int file_from_stage2 = was_tracked(path);
1648 struct diff_filespec merged;
1649 hashcpy(merged.sha1, mfi.sha);
1650 merged.mode = mfi.mode;
1652 update_stages(path, NULL,
1653 file_from_stage2 ? &merged : NULL,
1654 file_from_stage2 ? NULL : &merged);
1658 new_path = unique_path(o, path, rename_conflict_info->branch1);
1659 output(o, 1, _("Adding as %s instead"), new_path);
1660 update_file(o, 0, mfi.sha, mfi.mode, new_path);
1661 free(new_path);
1662 mfi.clean = 0;
1663 } else {
1664 update_file(o, mfi.clean, mfi.sha, mfi.mode, path);
1666 return mfi.clean;
1670 /* Per entry merge function */
1671 static int process_entry(struct merge_options *o,
1672 const char *path, struct stage_data *entry)
1675 printf("processing entry, clean cache: %s\n", index_only ? "yes": "no");
1676 print_index_entry("\tpath: ", entry);
1678 int clean_merge = 1;
1679 int normalize = o->renormalize;
1680 unsigned o_mode = entry->stages[1].mode;
1681 unsigned a_mode = entry->stages[2].mode;
1682 unsigned b_mode = entry->stages[3].mode;
1683 unsigned char *o_sha = stage_sha(entry->stages[1].sha, o_mode);
1684 unsigned char *a_sha = stage_sha(entry->stages[2].sha, a_mode);
1685 unsigned char *b_sha = stage_sha(entry->stages[3].sha, b_mode);
1687 entry->processed = 1;
1688 if (entry->rename_conflict_info) {
1689 struct rename_conflict_info *conflict_info = entry->rename_conflict_info;
1690 switch (conflict_info->rename_type) {
1691 case RENAME_NORMAL:
1692 case RENAME_ONE_FILE_TO_ONE:
1693 clean_merge = merge_content(o, path,
1694 o_sha, o_mode, a_sha, a_mode, b_sha, b_mode,
1695 conflict_info);
1696 break;
1697 case RENAME_DELETE:
1698 clean_merge = 0;
1699 conflict_rename_delete(o, conflict_info->pair1,
1700 conflict_info->branch1,
1701 conflict_info->branch2);
1702 break;
1703 case RENAME_ONE_FILE_TO_TWO:
1704 clean_merge = 0;
1705 conflict_rename_rename_1to2(o, conflict_info);
1706 break;
1707 case RENAME_TWO_FILES_TO_ONE:
1708 clean_merge = 0;
1709 conflict_rename_rename_2to1(o, conflict_info);
1710 break;
1711 default:
1712 entry->processed = 0;
1713 break;
1715 } else if (o_sha && (!a_sha || !b_sha)) {
1716 /* Case A: Deleted in one */
1717 if ((!a_sha && !b_sha) ||
1718 (!b_sha && blob_unchanged(o_sha, a_sha, normalize, path)) ||
1719 (!a_sha && blob_unchanged(o_sha, b_sha, normalize, path))) {
1720 /* Deleted in both or deleted in one and
1721 * unchanged in the other */
1722 if (a_sha)
1723 output(o, 2, _("Removing %s"), path);
1724 /* do not touch working file if it did not exist */
1725 remove_file(o, 1, path, !a_sha);
1726 } else {
1727 /* Modify/delete; deleted side may have put a directory in the way */
1728 clean_merge = 0;
1729 handle_modify_delete(o, path, o_sha, o_mode,
1730 a_sha, a_mode, b_sha, b_mode);
1732 } else if ((!o_sha && a_sha && !b_sha) ||
1733 (!o_sha && !a_sha && b_sha)) {
1734 /* Case B: Added in one. */
1735 /* [nothing|directory] -> ([nothing|directory], file) */
1737 const char *add_branch;
1738 const char *other_branch;
1739 unsigned mode;
1740 const unsigned char *sha;
1741 const char *conf;
1743 if (a_sha) {
1744 add_branch = o->branch1;
1745 other_branch = o->branch2;
1746 mode = a_mode;
1747 sha = a_sha;
1748 conf = _("file/directory");
1749 } else {
1750 add_branch = o->branch2;
1751 other_branch = o->branch1;
1752 mode = b_mode;
1753 sha = b_sha;
1754 conf = _("directory/file");
1756 if (dir_in_way(path, !o->call_depth)) {
1757 char *new_path = unique_path(o, path, add_branch);
1758 clean_merge = 0;
1759 output(o, 1, _("CONFLICT (%s): There is a directory with name %s in %s. "
1760 "Adding %s as %s"),
1761 conf, path, other_branch, path, new_path);
1762 if (o->call_depth)
1763 remove_file_from_cache(path);
1764 update_file(o, 0, sha, mode, new_path);
1765 if (o->call_depth)
1766 remove_file_from_cache(path);
1767 free(new_path);
1768 } else {
1769 output(o, 2, _("Adding %s"), path);
1770 /* do not overwrite file if already present */
1771 update_file_flags(o, sha, mode, path, 1, !a_sha);
1773 } else if (a_sha && b_sha) {
1774 /* Case C: Added in both (check for same permissions) and */
1775 /* case D: Modified in both, but differently. */
1776 clean_merge = merge_content(o, path,
1777 o_sha, o_mode, a_sha, a_mode, b_sha, b_mode,
1778 NULL);
1779 } else if (!o_sha && !a_sha && !b_sha) {
1781 * this entry was deleted altogether. a_mode == 0 means
1782 * we had that path and want to actively remove it.
1784 remove_file(o, 1, path, !a_mode);
1785 } else
1786 die(_("Fatal merge failure, shouldn't happen."));
1788 return clean_merge;
1791 int merge_trees(struct merge_options *o,
1792 struct tree *head,
1793 struct tree *merge,
1794 struct tree *common,
1795 struct tree **result)
1797 int code, clean;
1799 if (o->subtree_shift) {
1800 merge = shift_tree_object(head, merge, o->subtree_shift);
1801 common = shift_tree_object(head, common, o->subtree_shift);
1804 if (sha_eq(common->object.sha1, merge->object.sha1)) {
1805 output(o, 0, _("Already up-to-date!"));
1806 *result = head;
1807 return 1;
1810 code = git_merge_trees(o->call_depth, common, head, merge);
1812 if (code != 0) {
1813 if (show(o, 4) || o->call_depth)
1814 die(_("merging of trees %s and %s failed"),
1815 sha1_to_hex(head->object.sha1),
1816 sha1_to_hex(merge->object.sha1));
1817 else
1818 exit(128);
1821 if (unmerged_cache()) {
1822 struct string_list *entries, *re_head, *re_merge;
1823 int i;
1824 string_list_clear(&o->current_file_set, 1);
1825 string_list_clear(&o->current_directory_set, 1);
1826 get_files_dirs(o, head);
1827 get_files_dirs(o, merge);
1829 entries = get_unmerged();
1830 record_df_conflict_files(o, entries);
1831 re_head = get_renames(o, head, common, head, merge, entries);
1832 re_merge = get_renames(o, merge, common, head, merge, entries);
1833 clean = process_renames(o, re_head, re_merge);
1834 for (i = entries->nr-1; 0 <= i; i--) {
1835 const char *path = entries->items[i].string;
1836 struct stage_data *e = entries->items[i].util;
1837 if (!e->processed
1838 && !process_entry(o, path, e))
1839 clean = 0;
1841 for (i = 0; i < entries->nr; i++) {
1842 struct stage_data *e = entries->items[i].util;
1843 if (!e->processed)
1844 die(_("Unprocessed path??? %s"),
1845 entries->items[i].string);
1848 string_list_clear(re_merge, 0);
1849 string_list_clear(re_head, 0);
1850 string_list_clear(entries, 1);
1853 else
1854 clean = 1;
1856 if (o->call_depth)
1857 *result = write_tree_from_memory(o);
1859 return clean;
1862 static struct commit_list *reverse_commit_list(struct commit_list *list)
1864 struct commit_list *next = NULL, *current, *backup;
1865 for (current = list; current; current = backup) {
1866 backup = current->next;
1867 current->next = next;
1868 next = current;
1870 return next;
1874 * Merge the commits h1 and h2, return the resulting virtual
1875 * commit object and a flag indicating the cleanness of the merge.
1877 int merge_recursive(struct merge_options *o,
1878 struct commit *h1,
1879 struct commit *h2,
1880 struct commit_list *ca,
1881 struct commit **result)
1883 struct commit_list *iter;
1884 struct commit *merged_common_ancestors;
1885 struct tree *mrtree = mrtree;
1886 int clean;
1888 if (show(o, 4)) {
1889 output(o, 4, _("Merging:"));
1890 output_commit_title(o, h1);
1891 output_commit_title(o, h2);
1894 if (!ca) {
1895 ca = get_merge_bases(h1, h2, 1);
1896 ca = reverse_commit_list(ca);
1899 if (show(o, 5)) {
1900 unsigned cnt = commit_list_count(ca);
1902 output(o, 5, Q_("found %u common ancestor:",
1903 "found %u common ancestors:", cnt), cnt);
1904 for (iter = ca; iter; iter = iter->next)
1905 output_commit_title(o, iter->item);
1908 merged_common_ancestors = pop_commit(&ca);
1909 if (merged_common_ancestors == NULL) {
1910 /* if there is no common ancestor, use an empty tree */
1911 struct tree *tree;
1913 tree = lookup_tree(EMPTY_TREE_SHA1_BIN);
1914 merged_common_ancestors = make_virtual_commit(tree, "ancestor");
1917 for (iter = ca; iter; iter = iter->next) {
1918 const char *saved_b1, *saved_b2;
1919 o->call_depth++;
1921 * When the merge fails, the result contains files
1922 * with conflict markers. The cleanness flag is
1923 * ignored, it was never actually used, as result of
1924 * merge_trees has always overwritten it: the committed
1925 * "conflicts" were already resolved.
1927 discard_cache();
1928 saved_b1 = o->branch1;
1929 saved_b2 = o->branch2;
1930 o->branch1 = "Temporary merge branch 1";
1931 o->branch2 = "Temporary merge branch 2";
1932 merge_recursive(o, merged_common_ancestors, iter->item,
1933 NULL, &merged_common_ancestors);
1934 o->branch1 = saved_b1;
1935 o->branch2 = saved_b2;
1936 o->call_depth--;
1938 if (!merged_common_ancestors)
1939 die(_("merge returned no commit"));
1942 discard_cache();
1943 if (!o->call_depth)
1944 read_cache();
1946 o->ancestor = "merged common ancestors";
1947 clean = merge_trees(o, h1->tree, h2->tree, merged_common_ancestors->tree,
1948 &mrtree);
1950 if (o->call_depth) {
1951 *result = make_virtual_commit(mrtree, "merged tree");
1952 commit_list_insert(h1, &(*result)->parents);
1953 commit_list_insert(h2, &(*result)->parents->next);
1955 flush_output(o);
1956 if (show(o, 2))
1957 diff_warn_rename_limit("merge.renamelimit",
1958 o->needed_rename_limit, 0);
1959 return clean;
1962 static struct commit *get_ref(const unsigned char *sha1, const char *name)
1964 struct object *object;
1966 object = deref_tag(parse_object(sha1), name, strlen(name));
1967 if (!object)
1968 return NULL;
1969 if (object->type == OBJ_TREE)
1970 return make_virtual_commit((struct tree*)object, name);
1971 if (object->type != OBJ_COMMIT)
1972 return NULL;
1973 if (parse_commit((struct commit *)object))
1974 return NULL;
1975 return (struct commit *)object;
1978 int merge_recursive_generic(struct merge_options *o,
1979 const unsigned char *head,
1980 const unsigned char *merge,
1981 int num_base_list,
1982 const unsigned char **base_list,
1983 struct commit **result)
1985 int clean, index_fd;
1986 struct lock_file *lock = xcalloc(1, sizeof(struct lock_file));
1987 struct commit *head_commit = get_ref(head, o->branch1);
1988 struct commit *next_commit = get_ref(merge, o->branch2);
1989 struct commit_list *ca = NULL;
1991 if (base_list) {
1992 int i;
1993 for (i = 0; i < num_base_list; ++i) {
1994 struct commit *base;
1995 if (!(base = get_ref(base_list[i], sha1_to_hex(base_list[i]))))
1996 return error(_("Could not parse object '%s'"),
1997 sha1_to_hex(base_list[i]));
1998 commit_list_insert(base, &ca);
2002 index_fd = hold_locked_index(lock, 1);
2003 clean = merge_recursive(o, head_commit, next_commit, ca,
2004 result);
2005 if (active_cache_changed &&
2006 (write_cache(index_fd, active_cache, active_nr) ||
2007 commit_locked_index(lock)))
2008 return error(_("Unable to write index."));
2010 return clean ? 0 : 1;
2013 static int merge_recursive_config(const char *var, const char *value, void *cb)
2015 struct merge_options *o = cb;
2016 if (!strcmp(var, "merge.verbosity")) {
2017 o->verbosity = git_config_int(var, value);
2018 return 0;
2020 if (!strcmp(var, "diff.renamelimit")) {
2021 o->diff_rename_limit = git_config_int(var, value);
2022 return 0;
2024 if (!strcmp(var, "merge.renamelimit")) {
2025 o->merge_rename_limit = git_config_int(var, value);
2026 return 0;
2028 return git_xmerge_config(var, value, cb);
2031 void init_merge_options(struct merge_options *o)
2033 memset(o, 0, sizeof(struct merge_options));
2034 o->verbosity = 2;
2035 o->buffer_output = 1;
2036 o->diff_rename_limit = -1;
2037 o->merge_rename_limit = -1;
2038 o->renormalize = 0;
2039 git_config(merge_recursive_config, o);
2040 if (getenv("GIT_MERGE_VERBOSITY"))
2041 o->verbosity =
2042 strtol(getenv("GIT_MERGE_VERBOSITY"), NULL, 10);
2043 if (o->verbosity >= 5)
2044 o->buffer_output = 0;
2045 strbuf_init(&o->obuf, 0);
2046 memset(&o->current_file_set, 0, sizeof(struct string_list));
2047 o->current_file_set.strdup_strings = 1;
2048 memset(&o->current_directory_set, 0, sizeof(struct string_list));
2049 o->current_directory_set.strdup_strings = 1;
2050 memset(&o->df_conflict_file_set, 0, sizeof(struct string_list));
2051 o->df_conflict_file_set.strdup_strings = 1;
2054 int parse_merge_opt(struct merge_options *o, const char *s)
2056 if (!s || !*s)
2057 return -1;
2058 if (!strcmp(s, "ours"))
2059 o->recursive_variant = MERGE_RECURSIVE_OURS;
2060 else if (!strcmp(s, "theirs"))
2061 o->recursive_variant = MERGE_RECURSIVE_THEIRS;
2062 else if (!strcmp(s, "subtree"))
2063 o->subtree_shift = "";
2064 else if (!prefixcmp(s, "subtree="))
2065 o->subtree_shift = s + strlen("subtree=");
2066 else if (!strcmp(s, "patience"))
2067 o->xdl_opts = DIFF_WITH_ALG(o, PATIENCE_DIFF);
2068 else if (!strcmp(s, "histogram"))
2069 o->xdl_opts = DIFF_WITH_ALG(o, HISTOGRAM_DIFF);
2070 else if (!strcmp(s, "ignore-space-change"))
2071 o->xdl_opts |= XDF_IGNORE_WHITESPACE_CHANGE;
2072 else if (!strcmp(s, "ignore-all-space"))
2073 o->xdl_opts |= XDF_IGNORE_WHITESPACE;
2074 else if (!strcmp(s, "ignore-space-at-eol"))
2075 o->xdl_opts |= XDF_IGNORE_WHITESPACE_AT_EOL;
2076 else if (!strcmp(s, "renormalize"))
2077 o->renormalize = 1;
2078 else if (!strcmp(s, "no-renormalize"))
2079 o->renormalize = 0;
2080 else if (!prefixcmp(s, "rename-threshold=")) {
2081 const char *score = s + strlen("rename-threshold=");
2082 if ((o->rename_score = parse_rename_score(&score)) == -1 || *score != 0)
2083 return -1;
2085 else
2086 return -1;
2087 return 0;