2 * Recursive Merge algorithm stolen from git-merge-recursive.py by
4 * The thieves were Alex Riesen and Johannes Schindelin, in June/July 2006
8 #include "cache-tree.h"
12 #include "tree-walk.h"
16 #include "unpack-trees.h"
17 #include "string-list.h"
18 #include "xdiff-interface.h"
21 #include "merge-recursive.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);
33 shift_tree_by(one
->object
.sha1
, two
->object
.sha1
, shifted
,
36 if (!hashcmp(two
->object
.sha1
, shifted
))
38 return lookup_tree(shifted
);
42 * A virtual commit has (const char *)commit->util set to the name.
45 static struct commit
*make_virtual_commit(struct tree
*tree
, const char *comment
)
47 struct commit
*commit
= xcalloc(1, sizeof(struct commit
));
49 commit
->util
= (void*)comment
;
51 commit
->object
.parsed
= 1;
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.
59 static int sha_eq(const unsigned char *a
, const unsigned char *b
)
63 return a
&& b
&& hashcmp(a
, b
) == 0;
69 RENAME_ONE_FILE_TO_ONE
,
70 RENAME_ONE_FILE_TO_TWO
73 struct rename_conflict_info
{
74 enum rename_type rename_type
;
75 struct diff_filepair
*pair1
;
76 struct diff_filepair
*pair2
;
79 struct stage_data
*dst_entry1
;
80 struct stage_data
*dst_entry2
;
84 * Since we want to write the index eventually, we cannot reuse the index
85 * for these (temporary) data.
90 unsigned char sha
[20];
92 struct rename_conflict_info
*rename_conflict_info
;
96 static inline void setup_rename_conflict_info(enum rename_type rename_type
,
97 struct diff_filepair
*pair1
,
98 struct diff_filepair
*pair2
,
101 struct stage_data
*dst_entry1
,
102 struct stage_data
*dst_entry2
)
104 struct rename_conflict_info
*ci
= xcalloc(1, sizeof(struct rename_conflict_info
));
105 ci
->rename_type
= rename_type
;
107 ci
->branch1
= branch1
;
108 ci
->branch2
= branch2
;
110 ci
->dst_entry1
= dst_entry1
;
111 dst_entry1
->rename_conflict_info
= ci
;
112 dst_entry1
->processed
= 0;
114 assert(!pair2
== !dst_entry2
);
116 ci
->dst_entry2
= dst_entry2
;
118 dst_entry2
->rename_conflict_info
= ci
;
122 static int show(struct merge_options
*o
, int v
)
124 return (!o
->call_depth
&& o
->verbosity
>= v
) || o
->verbosity
>= 5;
127 static void flush_output(struct merge_options
*o
)
130 fputs(o
->obuf
.buf
, stdout
);
131 strbuf_reset(&o
->obuf
);
135 __attribute__((format (printf
, 3, 4)))
136 static void output(struct merge_options
*o
, int v
, const char *fmt
, ...)
143 strbuf_grow(&o
->obuf
, o
->call_depth
* 2 + 2);
144 memset(o
->obuf
.buf
+ o
->obuf
.len
, ' ', o
->call_depth
* 2);
145 strbuf_setlen(&o
->obuf
, o
->obuf
.len
+ o
->call_depth
* 2);
148 strbuf_vaddf(&o
->obuf
, fmt
, ap
);
151 strbuf_add(&o
->obuf
, "\n", 1);
152 if (!o
->buffer_output
)
156 static void output_commit_title(struct merge_options
*o
, struct commit
*commit
)
160 for (i
= o
->call_depth
; i
--;)
163 printf("virtual %s\n", (char *)commit
->util
);
165 printf("%s ", find_unique_abbrev(commit
->object
.sha1
, DEFAULT_ABBREV
));
166 if (parse_commit(commit
) != 0)
167 printf("(bad commit)\n");
170 int len
= find_commit_subject(commit
->buffer
, &title
);
172 printf("%.*s\n", len
, title
);
177 static int add_cacheinfo(unsigned int mode
, const unsigned char *sha1
,
178 const char *path
, int stage
, int refresh
, int options
)
180 struct cache_entry
*ce
;
181 ce
= make_cache_entry(mode
, sha1
? sha1
: null_sha1
, path
, stage
, refresh
);
183 return error("addinfo_cache failed for path '%s'", path
);
184 return add_cache_entry(ce
, options
);
187 static void init_tree_desc_from_tree(struct tree_desc
*desc
, struct tree
*tree
)
190 init_tree_desc(desc
, tree
->buffer
, tree
->size
);
193 static int git_merge_trees(int index_only
,
199 struct tree_desc t
[3];
200 struct unpack_trees_options opts
;
202 memset(&opts
, 0, sizeof(opts
));
209 opts
.fn
= threeway_merge
;
210 opts
.src_index
= &the_index
;
211 opts
.dst_index
= &the_index
;
212 setup_unpack_trees_porcelain(&opts
, "merge");
214 init_tree_desc_from_tree(t
+0, common
);
215 init_tree_desc_from_tree(t
+1, head
);
216 init_tree_desc_from_tree(t
+2, merge
);
218 rc
= unpack_trees(3, t
, &opts
);
219 cache_tree_free(&active_cache_tree
);
223 struct tree
*write_tree_from_memory(struct merge_options
*o
)
225 struct tree
*result
= NULL
;
227 if (unmerged_cache()) {
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
];
233 fprintf(stderr
, "BUG: %d %.*s\n", ce_stage(ce
),
234 (int)ce_namelen(ce
), ce
->name
);
236 die("Bug in merge-recursive.c");
239 if (!active_cache_tree
)
240 active_cache_tree
= cache_tree();
242 if (!cache_tree_fully_valid(active_cache_tree
) &&
243 cache_tree_update(active_cache_tree
,
244 active_cache
, active_nr
, 0, 0) < 0)
245 die("error building trees");
247 result
= lookup_tree(active_cache_tree
->sha1
);
252 static 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
)
256 int len
= strlen(path
);
257 char *newpath
= xmalloc(baselen
+ len
+ 1);
258 struct merge_options
*o
= context
;
260 memcpy(newpath
, base
, baselen
);
261 memcpy(newpath
+ baselen
, path
, len
);
262 newpath
[baselen
+ len
] = '\0';
265 string_list_insert(&o
->current_directory_set
, newpath
);
267 string_list_insert(&o
->current_file_set
, newpath
);
270 return (S_ISDIR(mode
) ? READ_TREE_RECURSIVE
: 0);
273 static int get_files_dirs(struct merge_options
*o
, struct tree
*tree
)
276 if (read_tree_recursive(tree
, "", 0, 0, NULL
, save_files_dirs
, o
))
278 n
= o
->current_file_set
.nr
+ o
->current_directory_set
.nr
;
283 * Returns an index_entry instance which doesn't have to correspond to
284 * a real cache entry in Git's index.
286 static struct stage_data
*insert_stage_data(const char *path
,
287 struct tree
*o
, struct tree
*a
, struct tree
*b
,
288 struct string_list
*entries
)
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
);
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.
307 static struct string_list
*get_unmerged(void)
309 struct string_list
*unmerged
= xcalloc(1, sizeof(struct string_list
));
312 unmerged
->strdup_strings
= 1;
314 for (i
= 0; i
< active_nr
; i
++) {
315 struct string_list_item
*item
;
316 struct stage_data
*e
;
317 struct cache_entry
*ce
= active_cache
[i
];
321 item
= string_list_lookup(unmerged
, ce
->name
);
323 item
= string_list_insert(unmerged
, ce
->name
);
324 item
->util
= xcalloc(1, sizeof(struct stage_data
));
327 e
->stages
[ce_stage(ce
)].mode
= ce
->ce_mode
;
328 hashcpy(e
->stages
[ce_stage(ce
)].sha
, ce
->sha1
);
334 static int string_list_df_name_compare(const void *a
, const void *b
)
336 const struct string_list_item
*one
= a
;
337 const struct string_list_item
*two
= b
;
338 int onelen
= strlen(one
->string
);
339 int twolen
= strlen(two
->string
);
341 * Here we only care that entries for D/F conflicts are
342 * adjacent, in particular with the file of the D/F conflict
343 * appearing before files below the corresponding directory.
344 * The order of the rest of the list is irrelevant for us.
346 * To achieve this, we sort with df_name_compare and provide
347 * the mode S_IFDIR so that D/F conflicts will sort correctly.
348 * We use the mode S_IFDIR for everything else for simplicity,
349 * since in other cases any changes in their order due to
350 * sorting cause no problems for us.
352 int cmp
= df_name_compare(one
->string
, onelen
, S_IFDIR
,
353 two
->string
, twolen
, S_IFDIR
);
355 * Now that 'foo' and 'foo/bar' compare equal, we have to make sure
356 * that 'foo' comes before 'foo/bar'.
360 return onelen
- twolen
;
363 static void record_df_conflict_files(struct merge_options
*o
,
364 struct string_list
*entries
)
366 /* If there is a D/F conflict and the file for such a conflict
367 * currently exist in the working copy, we want to allow it to be
368 * removed to make room for the corresponding directory if needed.
369 * The files underneath the directories of such D/F conflicts will
370 * be processed before the corresponding file involved in the D/F
371 * conflict. If the D/F directory ends up being removed by the
372 * merge, then we won't have to touch the D/F file. If the D/F
373 * directory needs to be written to the working copy, then the D/F
374 * file will simply be removed (in make_room_for_path()) to make
375 * room for the necessary paths. Note that if both the directory
376 * and the file need to be present, then the D/F file will be
377 * reinstated with a new unique name at the time it is processed.
379 const char *last_file
= NULL
;
384 * If we're merging merge-bases, we don't want to bother with
385 * any working directory changes.
390 /* Ensure D/F conflicts are adjacent in the entries list. */
391 qsort(entries
->items
, entries
->nr
, sizeof(*entries
->items
),
392 string_list_df_name_compare
);
394 string_list_clear(&o
->df_conflict_file_set
, 1);
395 for (i
= 0; i
< entries
->nr
; i
++) {
396 const char *path
= entries
->items
[i
].string
;
397 int len
= strlen(path
);
398 struct stage_data
*e
= entries
->items
[i
].util
;
401 * Check if last_file & path correspond to a D/F conflict;
402 * i.e. whether path is last_file+'/'+<something>.
403 * If so, record that it's okay to remove last_file to make
404 * room for path and friends if needed.
408 memcmp(path
, last_file
, last_len
) == 0 &&
409 path
[last_len
] == '/') {
410 string_list_insert(&o
->df_conflict_file_set
, last_file
);
414 * Determine whether path could exist as a file in the
415 * working directory as a possible D/F conflict. This
416 * will only occur when it exists in stage 2 as a
419 if (S_ISREG(e
->stages
[2].mode
) || S_ISLNK(e
->stages
[2].mode
)) {
429 struct diff_filepair
*pair
;
430 struct stage_data
*src_entry
;
431 struct stage_data
*dst_entry
;
432 unsigned processed
:1;
436 * Get information of all renames which occurred between 'o_tree' and
437 * 'tree'. We need the three trees in the merge ('o_tree', 'a_tree' and
438 * 'b_tree') to be able to associate the correct cache entries with
439 * the rename information. 'tree' is always equal to either a_tree or b_tree.
441 static struct string_list
*get_renames(struct merge_options
*o
,
446 struct string_list
*entries
)
449 struct string_list
*renames
;
450 struct diff_options opts
;
452 renames
= xcalloc(1, sizeof(struct string_list
));
454 DIFF_OPT_SET(&opts
, RECURSIVE
);
455 opts
.detect_rename
= DIFF_DETECT_RENAME
;
456 opts
.rename_limit
= o
->merge_rename_limit
>= 0 ? o
->merge_rename_limit
:
457 o
->diff_rename_limit
>= 0 ? o
->diff_rename_limit
:
459 opts
.rename_score
= o
->rename_score
;
460 opts
.show_rename_progress
= o
->show_rename_progress
;
461 opts
.output_format
= DIFF_FORMAT_NO_OUTPUT
;
462 if (diff_setup_done(&opts
) < 0)
463 die("diff setup failed");
464 diff_tree_sha1(o_tree
->object
.sha1
, tree
->object
.sha1
, "", &opts
);
466 if (opts
.needed_rename_limit
> o
->needed_rename_limit
)
467 o
->needed_rename_limit
= opts
.needed_rename_limit
;
468 for (i
= 0; i
< diff_queued_diff
.nr
; ++i
) {
469 struct string_list_item
*item
;
471 struct diff_filepair
*pair
= diff_queued_diff
.queue
[i
];
472 if (pair
->status
!= 'R') {
473 diff_free_filepair(pair
);
476 re
= xmalloc(sizeof(*re
));
479 item
= string_list_lookup(entries
, re
->pair
->one
->path
);
481 re
->src_entry
= insert_stage_data(re
->pair
->one
->path
,
482 o_tree
, a_tree
, b_tree
, entries
);
484 re
->src_entry
= item
->util
;
486 item
= string_list_lookup(entries
, re
->pair
->two
->path
);
488 re
->dst_entry
= insert_stage_data(re
->pair
->two
->path
,
489 o_tree
, a_tree
, b_tree
, entries
);
491 re
->dst_entry
= item
->util
;
492 item
= string_list_insert(renames
, pair
->one
->path
);
495 opts
.output_format
= DIFF_FORMAT_NO_OUTPUT
;
496 diff_queued_diff
.nr
= 0;
501 static int update_stages(const char *path
, const struct diff_filespec
*o
,
502 const struct diff_filespec
*a
,
503 const struct diff_filespec
*b
)
506 int options
= ADD_CACHE_OK_TO_ADD
| ADD_CACHE_SKIP_DFCHECK
;
508 if (remove_file_from_cache(path
))
511 if (add_cacheinfo(o
->mode
, o
->sha1
, path
, 1, 0, options
))
514 if (add_cacheinfo(a
->mode
, a
->sha1
, path
, 2, 0, options
))
517 if (add_cacheinfo(b
->mode
, b
->sha1
, path
, 3, 0, options
))
522 static void update_entry(struct stage_data
*entry
,
523 struct diff_filespec
*o
,
524 struct diff_filespec
*a
,
525 struct diff_filespec
*b
)
527 entry
->processed
= 0;
528 entry
->stages
[1].mode
= o
->mode
;
529 entry
->stages
[2].mode
= a
->mode
;
530 entry
->stages
[3].mode
= b
->mode
;
531 hashcpy(entry
->stages
[1].sha
, o
->sha1
);
532 hashcpy(entry
->stages
[2].sha
, a
->sha1
);
533 hashcpy(entry
->stages
[3].sha
, b
->sha1
);
536 static int remove_file(struct merge_options
*o
, int clean
,
537 const char *path
, int no_wd
)
539 int update_cache
= o
->call_depth
|| clean
;
540 int update_working_directory
= !o
->call_depth
&& !no_wd
;
543 if (remove_file_from_cache(path
))
546 if (update_working_directory
) {
547 if (remove_path(path
))
553 static char *unique_path(struct merge_options
*o
, const char *path
, const char *branch
)
555 char *newpath
= xmalloc(strlen(path
) + 1 + strlen(branch
) + 8 + 1);
558 char *p
= newpath
+ strlen(path
);
559 strcpy(newpath
, path
);
565 while (string_list_has_string(&o
->current_file_set
, newpath
) ||
566 string_list_has_string(&o
->current_directory_set
, newpath
) ||
567 lstat(newpath
, &st
) == 0)
568 sprintf(p
, "_%d", suffix
++);
570 string_list_insert(&o
->current_file_set
, newpath
);
574 static void flush_buffer(int fd
, const char *buf
, unsigned long size
)
577 long ret
= write_in_full(fd
, buf
, size
);
582 die_errno("merge-recursive");
584 die("merge-recursive: disk full?");
591 static int dir_in_way(const char *path
, int check_working_copy
)
593 int pos
, pathlen
= strlen(path
);
594 char *dirpath
= xmalloc(pathlen
+ 2);
597 strcpy(dirpath
, path
);
598 dirpath
[pathlen
] = '/';
599 dirpath
[pathlen
+1] = '\0';
601 pos
= cache_name_pos(dirpath
, pathlen
+1);
605 if (pos
< active_nr
&&
606 !strncmp(dirpath
, active_cache
[pos
]->name
, pathlen
+1)) {
612 return check_working_copy
&& !lstat(path
, &st
) && S_ISDIR(st
.st_mode
);
615 static int was_tracked(const char *path
)
617 int pos
= cache_name_pos(path
, strlen(path
));
621 while (pos
< active_nr
&&
622 !strcmp(path
, active_cache
[pos
]->name
)) {
624 * If stage #0, it is definitely tracked.
625 * If it has stage #2 then it was tracked
626 * before this merge started. All other
627 * cases the path was not tracked.
629 switch (ce_stage(active_cache
[pos
])) {
639 static int would_lose_untracked(const char *path
)
641 return !was_tracked(path
) && file_exists(path
);
644 static int make_room_for_path(struct merge_options
*o
, const char *path
)
647 const char *msg
= "failed to create path '%s'%s";
649 /* Unlink any D/F conflict files that are in the way */
650 for (i
= 0; i
< o
->df_conflict_file_set
.nr
; i
++) {
651 const char *df_path
= o
->df_conflict_file_set
.items
[i
].string
;
652 size_t pathlen
= strlen(path
);
653 size_t df_pathlen
= strlen(df_path
);
654 if (df_pathlen
< pathlen
&&
655 path
[df_pathlen
] == '/' &&
656 strncmp(path
, df_path
, df_pathlen
) == 0) {
658 "Removing %s to make room for subdirectory\n",
661 unsorted_string_list_delete_item(&o
->df_conflict_file_set
,
667 /* Make sure leading directories are created */
668 status
= safe_create_leading_directories_const(path
);
671 /* something else exists */
672 error(msg
, path
, ": perhaps a D/F conflict?");
679 * Do not unlink a file in the work tree if we are not
682 if (would_lose_untracked(path
))
683 return error("refusing to lose untracked file at '%s'",
686 /* Successful unlink is good.. */
689 /* .. and so is no existing file */
692 /* .. but not some other error (who really cares what?) */
693 return error(msg
, path
, ": perhaps a D/F conflict?");
696 static void update_file_flags(struct merge_options
*o
,
697 const unsigned char *sha
,
707 enum object_type type
;
711 if (S_ISGITLINK(mode
)) {
713 * We may later decide to recursively descend into
714 * the submodule directory and update its index
715 * and/or work tree, but we do not do that now.
721 buf
= read_sha1_file(sha
, &type
, &size
);
723 die("cannot read object %s '%s'", sha1_to_hex(sha
), path
);
724 if (type
!= OBJ_BLOB
)
725 die("blob expected for %s '%s'", sha1_to_hex(sha
), path
);
727 struct strbuf strbuf
= STRBUF_INIT
;
728 if (convert_to_working_tree(path
, buf
, size
, &strbuf
)) {
731 buf
= strbuf_detach(&strbuf
, NULL
);
735 if (make_room_for_path(o
, path
) < 0) {
740 if (S_ISREG(mode
) || (!has_symlinks
&& S_ISLNK(mode
))) {
746 fd
= open(path
, O_WRONLY
| O_TRUNC
| O_CREAT
, mode
);
748 die_errno("failed to open '%s'", path
);
749 flush_buffer(fd
, buf
, size
);
751 } else if (S_ISLNK(mode
)) {
752 char *lnk
= xmemdupz(buf
, size
);
753 safe_create_leading_directories_const(path
);
755 if (symlink(lnk
, path
))
756 die_errno("failed to symlink '%s'", path
);
759 die("do not know what to do with %06o %s '%s'",
760 mode
, sha1_to_hex(sha
), path
);
765 add_cacheinfo(mode
, sha
, path
, 0, update_wd
, ADD_CACHE_OK_TO_ADD
);
768 static void update_file(struct merge_options
*o
,
770 const unsigned char *sha
,
774 update_file_flags(o
, sha
, mode
, path
, o
->call_depth
|| clean
, !o
->call_depth
);
777 /* Low level file merging, update and removal */
779 struct merge_file_info
{
780 unsigned char sha
[20];
786 static int merge_3way(struct merge_options
*o
,
787 mmbuffer_t
*result_buf
,
788 const struct diff_filespec
*one
,
789 const struct diff_filespec
*a
,
790 const struct diff_filespec
*b
,
794 mmfile_t orig
, src1
, src2
;
795 struct ll_merge_options ll_opts
= {0};
796 char *base_name
, *name1
, *name2
;
799 ll_opts
.renormalize
= o
->renormalize
;
800 ll_opts
.xdl_opts
= o
->xdl_opts
;
803 ll_opts
.virtual_ancestor
= 1;
806 switch (o
->recursive_variant
) {
807 case MERGE_RECURSIVE_OURS
:
808 ll_opts
.variant
= XDL_MERGE_FAVOR_OURS
;
810 case MERGE_RECURSIVE_THEIRS
:
811 ll_opts
.variant
= XDL_MERGE_FAVOR_THEIRS
;
819 if (strcmp(a
->path
, b
->path
) ||
820 (o
->ancestor
!= NULL
&& strcmp(a
->path
, one
->path
) != 0)) {
821 base_name
= o
->ancestor
== NULL
? NULL
:
822 xstrdup(mkpath("%s:%s", o
->ancestor
, one
->path
));
823 name1
= xstrdup(mkpath("%s:%s", branch1
, a
->path
));
824 name2
= xstrdup(mkpath("%s:%s", branch2
, b
->path
));
826 base_name
= o
->ancestor
== NULL
? NULL
:
827 xstrdup(mkpath("%s", o
->ancestor
));
828 name1
= xstrdup(mkpath("%s", branch1
));
829 name2
= xstrdup(mkpath("%s", branch2
));
832 read_mmblob(&orig
, one
->sha1
);
833 read_mmblob(&src1
, a
->sha1
);
834 read_mmblob(&src2
, b
->sha1
);
836 merge_status
= ll_merge(result_buf
, a
->path
, &orig
, base_name
,
837 &src1
, name1
, &src2
, name2
, &ll_opts
);
847 static struct merge_file_info
merge_file_1(struct merge_options
*o
,
848 const struct diff_filespec
*one
,
849 const struct diff_filespec
*a
,
850 const struct diff_filespec
*b
,
854 struct merge_file_info result
;
858 if ((S_IFMT
& a
->mode
) != (S_IFMT
& b
->mode
)) {
860 if (S_ISREG(a
->mode
)) {
861 result
.mode
= a
->mode
;
862 hashcpy(result
.sha
, a
->sha1
);
864 result
.mode
= b
->mode
;
865 hashcpy(result
.sha
, b
->sha1
);
868 if (!sha_eq(a
->sha1
, one
->sha1
) && !sha_eq(b
->sha1
, one
->sha1
))
874 if (a
->mode
== b
->mode
|| a
->mode
== one
->mode
)
875 result
.mode
= b
->mode
;
877 result
.mode
= a
->mode
;
878 if (b
->mode
!= one
->mode
) {
884 if (sha_eq(a
->sha1
, b
->sha1
) || sha_eq(a
->sha1
, one
->sha1
))
885 hashcpy(result
.sha
, b
->sha1
);
886 else if (sha_eq(b
->sha1
, one
->sha1
))
887 hashcpy(result
.sha
, a
->sha1
);
888 else if (S_ISREG(a
->mode
)) {
889 mmbuffer_t result_buf
;
892 merge_status
= merge_3way(o
, &result_buf
, one
, a
, b
,
895 if ((merge_status
< 0) || !result_buf
.ptr
)
896 die("Failed to execute internal merge");
898 if (write_sha1_file(result_buf
.ptr
, result_buf
.size
,
899 blob_type
, result
.sha
))
900 die("Unable to add %s to database",
903 free(result_buf
.ptr
);
904 result
.clean
= (merge_status
== 0);
905 } else if (S_ISGITLINK(a
->mode
)) {
906 result
.clean
= merge_submodule(result
.sha
, one
->path
, one
->sha1
,
908 } else if (S_ISLNK(a
->mode
)) {
909 hashcpy(result
.sha
, a
->sha1
);
911 if (!sha_eq(a
->sha1
, b
->sha1
))
914 die("unsupported object type in the tree");
921 static struct merge_file_info
merge_file(struct merge_options
*o
,
923 const unsigned char *o_sha
, int o_mode
,
924 const unsigned char *a_sha
, int a_mode
,
925 const unsigned char *b_sha
, int b_mode
,
929 struct diff_filespec one
, a
, b
;
931 one
.path
= a
.path
= b
.path
= (char *)path
;
932 hashcpy(one
.sha1
, o_sha
);
934 hashcpy(a
.sha1
, a_sha
);
936 hashcpy(b
.sha1
, b_sha
);
938 return merge_file_1(o
, &one
, &a
, &b
, branch1
, branch2
);
941 static void conflict_rename_delete(struct merge_options
*o
,
942 struct diff_filepair
*pair
,
943 const char *rename_branch
,
944 const char *other_branch
)
946 char *dest_name
= pair
->two
->path
;
949 output(o
, 1, "CONFLICT (rename/delete): Rename %s->%s in %s "
951 pair
->one
->path
, pair
->two
->path
, rename_branch
,
954 update_stages(dest_name
, NULL
,
955 rename_branch
== o
->branch1
? pair
->two
: NULL
,
956 rename_branch
== o
->branch1
? NULL
: pair
->two
);
957 if (dir_in_way(dest_name
, !o
->call_depth
)) {
958 dest_name
= unique_path(o
, dest_name
, rename_branch
);
961 update_file(o
, 0, pair
->two
->sha1
, pair
->two
->mode
, dest_name
);
966 static void conflict_rename_rename_1to2(struct merge_options
*o
,
967 struct diff_filepair
*pair1
,
969 struct diff_filepair
*pair2
,
972 /* One file was renamed in both branches, but to different names. */
975 const char *src
= pair1
->one
->path
;
976 const char *ren1_dst
= pair1
->two
->path
;
977 const char *ren2_dst
= pair2
->two
->path
;
978 const char *dst_name1
= ren1_dst
;
979 const char *dst_name2
= ren2_dst
;
981 output(o
, 1, "CONFLICT (rename/rename): "
982 "Rename \"%s\"->\"%s\" in branch \"%s\" "
983 "rename \"%s\"->\"%s\" in \"%s\"%s",
984 src
, pair1
->two
->path
, branch1
,
985 src
, pair2
->two
->path
, branch2
,
986 o
->call_depth
? " (left unresolved)" : "");
987 if (dir_in_way(ren1_dst
, !o
->call_depth
)) {
988 dst_name1
= del
[delp
++] = unique_path(o
, ren1_dst
, branch1
);
989 output(o
, 1, "%s is a directory in %s adding as %s instead",
990 ren1_dst
, branch2
, dst_name1
);
992 if (dir_in_way(ren2_dst
, !o
->call_depth
)) {
993 dst_name2
= del
[delp
++] = unique_path(o
, ren2_dst
, branch2
);
994 output(o
, 1, "%s is a directory in %s adding as %s instead",
995 ren2_dst
, branch1
, dst_name2
);
998 struct merge_file_info mfi
;
999 mfi
= merge_file(o
, src
,
1000 pair1
->one
->sha1
, pair1
->one
->mode
,
1001 pair1
->two
->sha1
, pair1
->two
->mode
,
1002 pair2
->two
->sha1
, pair2
->two
->mode
,
1005 * FIXME: For rename/add-source conflicts (if we could detect
1006 * such), this is wrong. We should instead find a unique
1007 * pathname and then either rename the add-source file to that
1008 * unique path, or use that unique path instead of src here.
1010 update_file(o
, 0, mfi
.sha
, mfi
.mode
, src
);
1011 remove_file_from_cache(ren1_dst
);
1012 remove_file_from_cache(ren2_dst
);
1014 update_stages(ren1_dst
, NULL
, pair1
->two
, NULL
);
1015 update_stages(ren2_dst
, NULL
, NULL
, pair2
->two
);
1017 update_file(o
, 0, pair1
->two
->sha1
, pair1
->two
->mode
, dst_name1
);
1018 update_file(o
, 0, pair2
->two
->sha1
, pair2
->two
->mode
, dst_name2
);
1024 static void conflict_rename_rename_2to1(struct merge_options
*o
,
1025 struct rename
*ren1
,
1026 const char *branch1
,
1027 struct rename
*ren2
,
1028 const char *branch2
)
1030 char *path
= ren1
->pair
->two
->path
; /* same as ren2->pair->two->path */
1031 /* Two files were renamed to the same thing. */
1032 if (o
->call_depth
) {
1033 struct merge_file_info mfi
;
1034 mfi
= merge_file(o
, path
, null_sha1
, 0,
1035 ren1
->pair
->two
->sha1
, ren1
->pair
->two
->mode
,
1036 ren2
->pair
->two
->sha1
, ren2
->pair
->two
->mode
,
1038 output(o
, 1, "Adding merged %s", path
);
1039 update_file(o
, 0, mfi
.sha
, mfi
.mode
, path
);
1041 char *new_path1
= unique_path(o
, path
, branch1
);
1042 char *new_path2
= unique_path(o
, path
, branch2
);
1043 output(o
, 1, "Renaming %s to %s and %s to %s instead",
1044 ren1
->pair
->one
->path
, new_path1
,
1045 ren2
->pair
->one
->path
, new_path2
);
1046 remove_file(o
, 0, path
, 0);
1047 update_file(o
, 0, ren1
->pair
->two
->sha1
, ren1
->pair
->two
->mode
,
1049 update_file(o
, 0, ren2
->pair
->two
->sha1
, ren2
->pair
->two
->mode
,
1056 static int process_renames(struct merge_options
*o
,
1057 struct string_list
*a_renames
,
1058 struct string_list
*b_renames
)
1060 int clean_merge
= 1, i
, j
;
1061 struct string_list a_by_dst
= STRING_LIST_INIT_NODUP
;
1062 struct string_list b_by_dst
= STRING_LIST_INIT_NODUP
;
1063 const struct rename
*sre
;
1065 for (i
= 0; i
< a_renames
->nr
; i
++) {
1066 sre
= a_renames
->items
[i
].util
;
1067 string_list_insert(&a_by_dst
, sre
->pair
->two
->path
)->util
1070 for (i
= 0; i
< b_renames
->nr
; i
++) {
1071 sre
= b_renames
->items
[i
].util
;
1072 string_list_insert(&b_by_dst
, sre
->pair
->two
->path
)->util
1076 for (i
= 0, j
= 0; i
< a_renames
->nr
|| j
< b_renames
->nr
;) {
1077 struct string_list
*renames1
, *renames2Dst
;
1078 struct rename
*ren1
= NULL
, *ren2
= NULL
;
1079 const char *branch1
, *branch2
;
1080 const char *ren1_src
, *ren1_dst
;
1082 if (i
>= a_renames
->nr
) {
1083 ren2
= b_renames
->items
[j
++].util
;
1084 } else if (j
>= b_renames
->nr
) {
1085 ren1
= a_renames
->items
[i
++].util
;
1087 int compare
= strcmp(a_renames
->items
[i
].string
,
1088 b_renames
->items
[j
].string
);
1090 ren1
= a_renames
->items
[i
++].util
;
1092 ren2
= b_renames
->items
[j
++].util
;
1095 /* TODO: refactor, so that 1/2 are not needed */
1097 renames1
= a_renames
;
1098 renames2Dst
= &b_by_dst
;
1099 branch1
= o
->branch1
;
1100 branch2
= o
->branch2
;
1103 renames1
= b_renames
;
1104 renames2Dst
= &a_by_dst
;
1105 branch1
= o
->branch2
;
1106 branch2
= o
->branch1
;
1112 ren1
->dst_entry
->processed
= 1;
1113 /* BUG: We should only mark src_entry as processed if we
1114 * are not dealing with a rename + add-source case.
1116 ren1
->src_entry
->processed
= 1;
1118 if (ren1
->processed
)
1120 ren1
->processed
= 1;
1122 ren1_src
= ren1
->pair
->one
->path
;
1123 ren1_dst
= ren1
->pair
->two
->path
;
1126 const char *ren2_src
= ren2
->pair
->one
->path
;
1127 const char *ren2_dst
= ren2
->pair
->two
->path
;
1128 enum rename_type rename_type
;
1129 /* Renamed in 1 and renamed in 2 */
1130 if (strcmp(ren1_src
, ren2_src
) != 0)
1131 die("ren1.src != ren2.src");
1132 ren2
->dst_entry
->processed
= 1;
1133 ren2
->processed
= 1;
1134 if (strcmp(ren1_dst
, ren2_dst
) != 0) {
1135 rename_type
= RENAME_ONE_FILE_TO_TWO
;
1137 rename_type
= RENAME_ONE_FILE_TO_ONE
;
1138 /* BUG: We should only remove ren1_src in
1139 * the base stage (think of rename +
1140 * add-source cases).
1142 remove_file(o
, 1, ren1_src
, 1);
1143 update_entry(ren1
->dst_entry
,
1148 setup_rename_conflict_info(rename_type
,
1156 /* Renamed in 1, maybe changed in 2 */
1157 struct string_list_item
*item
;
1158 /* we only use sha1 and mode of these */
1159 struct diff_filespec src_other
, dst_other
;
1163 * unpack_trees loads entries from common-commit
1164 * into stage 1, from head-commit into stage 2, and
1165 * from merge-commit into stage 3. We keep track
1166 * of which side corresponds to the rename.
1168 int renamed_stage
= a_renames
== renames1
? 2 : 3;
1169 int other_stage
= a_renames
== renames1
? 3 : 2;
1171 /* BUG: We should only remove ren1_src in the base
1172 * stage and in other_stage (think of rename +
1175 remove_file(o
, 1, ren1_src
,
1176 renamed_stage
== 2 || !was_tracked(ren1_src
));
1178 hashcpy(src_other
.sha1
, ren1
->src_entry
->stages
[other_stage
].sha
);
1179 src_other
.mode
= ren1
->src_entry
->stages
[other_stage
].mode
;
1180 hashcpy(dst_other
.sha1
, ren1
->dst_entry
->stages
[other_stage
].sha
);
1181 dst_other
.mode
= ren1
->dst_entry
->stages
[other_stage
].mode
;
1184 if (sha_eq(src_other
.sha1
, null_sha1
)) {
1185 setup_rename_conflict_info(RENAME_DELETE
,
1192 } else if ((item
= string_list_lookup(renames2Dst
, ren1_dst
))) {
1193 char *ren2_src
, *ren2_dst
;
1195 ren2_src
= ren2
->pair
->one
->path
;
1196 ren2_dst
= ren2
->pair
->two
->path
;
1199 ren2
->processed
= 1;
1200 remove_file(o
, 1, ren2_src
,
1201 renamed_stage
== 3 || would_lose_untracked(ren1_src
));
1203 output(o
, 1, "CONFLICT (rename/rename): "
1204 "Rename %s->%s in %s. "
1205 "Rename %s->%s in %s",
1206 ren1_src
, ren1_dst
, branch1
,
1207 ren2_src
, ren2_dst
, branch2
);
1208 conflict_rename_rename_2to1(o
, ren1
, branch1
, ren2
, branch2
);
1209 } else if ((dst_other
.mode
== ren1
->pair
->two
->mode
) &&
1210 sha_eq(dst_other
.sha1
, ren1
->pair
->two
->sha1
)) {
1211 /* Added file on the other side
1212 identical to the file being
1213 renamed: clean merge */
1214 update_file(o
, 1, ren1
->pair
->two
->sha1
, ren1
->pair
->two
->mode
, ren1_dst
);
1215 } else if (!sha_eq(dst_other
.sha1
, null_sha1
)) {
1218 output(o
, 1, "CONFLICT (rename/add): Rename %s->%s in %s. "
1220 ren1_src
, ren1_dst
, branch1
,
1222 if (o
->call_depth
) {
1223 struct merge_file_info mfi
;
1224 mfi
= merge_file(o
, ren1_dst
, null_sha1
, 0,
1225 ren1
->pair
->two
->sha1
, ren1
->pair
->two
->mode
,
1226 dst_other
.sha1
, dst_other
.mode
,
1228 output(o
, 1, "Adding merged %s", ren1_dst
);
1229 update_file(o
, 0, mfi
.sha
, mfi
.mode
, ren1_dst
);
1232 char *new_path
= unique_path(o
, ren1_dst
, branch2
);
1233 output(o
, 1, "Adding as %s instead", new_path
);
1234 update_file(o
, 0, dst_other
.sha1
, dst_other
.mode
, new_path
);
1241 struct diff_filespec
*one
, *a
, *b
;
1242 src_other
.path
= (char *)ren1_src
;
1244 one
= ren1
->pair
->one
;
1245 if (a_renames
== renames1
) {
1246 a
= ren1
->pair
->two
;
1249 b
= ren1
->pair
->two
;
1252 update_entry(ren1
->dst_entry
, one
, a
, b
);
1253 setup_rename_conflict_info(RENAME_NORMAL
,
1263 string_list_clear(&a_by_dst
, 0);
1264 string_list_clear(&b_by_dst
, 0);
1269 static unsigned char *stage_sha(const unsigned char *sha
, unsigned mode
)
1271 return (is_null_sha1(sha
) || mode
== 0) ? NULL
: (unsigned char *)sha
;
1274 static int read_sha1_strbuf(const unsigned char *sha1
, struct strbuf
*dst
)
1277 enum object_type type
;
1279 buf
= read_sha1_file(sha1
, &type
, &size
);
1281 return error("cannot read object %s", sha1_to_hex(sha1
));
1282 if (type
!= OBJ_BLOB
) {
1284 return error("object %s is not a blob", sha1_to_hex(sha1
));
1286 strbuf_attach(dst
, buf
, size
, size
+ 1);
1290 static int blob_unchanged(const unsigned char *o_sha
,
1291 const unsigned char *a_sha
,
1292 int renormalize
, const char *path
)
1294 struct strbuf o
= STRBUF_INIT
;
1295 struct strbuf a
= STRBUF_INIT
;
1296 int ret
= 0; /* assume changed for safety */
1298 if (sha_eq(o_sha
, a_sha
))
1303 assert(o_sha
&& a_sha
);
1304 if (read_sha1_strbuf(o_sha
, &o
) || read_sha1_strbuf(a_sha
, &a
))
1307 * Note: binary | is used so that both renormalizations are
1308 * performed. Comparison can be skipped if both files are
1309 * unchanged since their sha1s have already been compared.
1311 if (renormalize_buffer(path
, o
.buf
, o
.len
, &o
) |
1312 renormalize_buffer(path
, a
.buf
, o
.len
, &a
))
1313 ret
= (o
.len
== a
.len
&& !memcmp(o
.buf
, a
.buf
, o
.len
));
1321 static void handle_delete_modify(struct merge_options
*o
,
1323 unsigned char *o_sha
, int o_mode
,
1324 unsigned char *a_sha
, int a_mode
,
1325 unsigned char *b_sha
, int b_mode
)
1327 char *renamed
= NULL
;
1328 if (dir_in_way(path
, !o
->call_depth
)) {
1329 renamed
= unique_path(o
, path
, a_sha
? o
->branch1
: o
->branch2
);
1332 if (o
->call_depth
) {
1334 * We cannot arbitrarily accept either a_sha or b_sha as
1335 * correct; since there is no true "middle point" between
1336 * them, simply reuse the base version for virtual merge base.
1338 remove_file_from_cache(path
);
1339 update_file(o
, 0, o_sha
, o_mode
, renamed
? renamed
: path
);
1340 } else if (!a_sha
) {
1341 output(o
, 1, "CONFLICT (delete/modify): %s deleted in %s "
1342 "and modified in %s. Version %s of %s left in tree%s%s.",
1344 o
->branch2
, o
->branch2
, path
,
1345 NULL
== renamed
? "" : " at ",
1346 NULL
== renamed
? "" : renamed
);
1347 update_file(o
, 0, b_sha
, b_mode
, renamed
? renamed
: path
);
1349 output(o
, 1, "CONFLICT (delete/modify): %s deleted in %s "
1350 "and modified in %s. Version %s of %s left in tree%s%s.",
1352 o
->branch1
, o
->branch1
, path
,
1353 NULL
== renamed
? "" : " at ",
1354 NULL
== renamed
? "" : renamed
);
1355 update_file(o
, 0, a_sha
, a_mode
, renamed
? renamed
: path
);
1361 static int merge_content(struct merge_options
*o
,
1363 unsigned char *o_sha
, int o_mode
,
1364 unsigned char *a_sha
, int a_mode
,
1365 unsigned char *b_sha
, int b_mode
,
1366 struct rename_conflict_info
*rename_conflict_info
)
1368 const char *reason
= "content";
1369 char *side1
= NULL
, *side2
= NULL
;
1370 const char *path1
= NULL
, *path2
= NULL
;
1371 struct merge_file_info mfi
;
1372 struct diff_filespec one
, a
, b
;
1373 unsigned df_conflict_remains
= 0;
1377 o_sha
= (unsigned char *)null_sha1
;
1379 one
.path
= a
.path
= b
.path
= (char *)path
;
1380 hashcpy(one
.sha1
, o_sha
);
1382 hashcpy(a
.sha1
, a_sha
);
1384 hashcpy(b
.sha1
, b_sha
);
1387 if (rename_conflict_info
) {
1388 struct diff_filepair
*pair1
= rename_conflict_info
->pair1
;
1390 path1
= (o
->branch1
== rename_conflict_info
->branch1
) ?
1391 pair1
->two
->path
: pair1
->one
->path
;
1392 /* If rename_conflict_info->pair2 != NULL, we are in
1393 * RENAME_ONE_FILE_TO_ONE case. Otherwise, we have a
1396 path2
= (rename_conflict_info
->pair2
||
1397 o
->branch2
== rename_conflict_info
->branch1
) ?
1398 pair1
->two
->path
: pair1
->one
->path
;
1399 side1
= xmalloc(strlen(o
->branch1
) + strlen(path1
) + 2);
1400 side2
= xmalloc(strlen(o
->branch2
) + strlen(path2
) + 2);
1401 sprintf(side1
, "%s:%s", o
->branch1
, path1
);
1402 sprintf(side2
, "%s:%s", o
->branch2
, path2
);
1404 if (dir_in_way(path
, !o
->call_depth
))
1405 df_conflict_remains
= 1;
1407 mfi
= merge_file_1(o
, &one
, &a
, &b
,
1408 side1
? side1
: o
->branch1
, side2
? side2
: o
->branch2
);
1412 if (mfi
.clean
&& !df_conflict_remains
&&
1413 sha_eq(mfi
.sha
, a_sha
) && mfi
.mode
== a_mode
) {
1414 int path_renamed_outside_HEAD
;
1415 output(o
, 3, "Skipped %s (merged same as existing)", path
);
1417 * The content merge resulted in the same file contents we
1418 * already had. We can return early if those file contents
1419 * are recorded at the correct path (which may not be true
1420 * if the merge involves a rename).
1422 path_renamed_outside_HEAD
= !path2
|| !strcmp(path
, path2
);
1423 if (!path_renamed_outside_HEAD
) {
1424 add_cacheinfo(mfi
.mode
, mfi
.sha
, path
,
1425 0 /*stage*/, 1 /*refresh*/, 0 /*options*/);
1429 output(o
, 2, "Auto-merging %s", path
);
1432 if (S_ISGITLINK(mfi
.mode
))
1433 reason
= "submodule";
1434 output(o
, 1, "CONFLICT (%s): Merge conflict in %s",
1436 if (rename_conflict_info
&& !df_conflict_remains
)
1437 update_stages(path
, &one
, &a
, &b
);
1440 if (df_conflict_remains
) {
1442 if (o
->call_depth
) {
1443 remove_file_from_cache(path
);
1446 update_stages(path
, &one
, &a
, &b
);
1448 int file_from_stage2
= was_tracked(path
);
1449 struct diff_filespec merged
;
1450 hashcpy(merged
.sha1
, mfi
.sha
);
1451 merged
.mode
= mfi
.mode
;
1453 update_stages(path
, NULL
,
1454 file_from_stage2
? &merged
: NULL
,
1455 file_from_stage2
? NULL
: &merged
);
1459 new_path
= unique_path(o
, path
, rename_conflict_info
->branch1
);
1460 output(o
, 1, "Adding as %s instead", new_path
);
1461 update_file(o
, 0, mfi
.sha
, mfi
.mode
, new_path
);
1465 update_file(o
, mfi
.clean
, mfi
.sha
, mfi
.mode
, path
);
1471 /* Per entry merge function */
1472 static int process_entry(struct merge_options
*o
,
1473 const char *path
, struct stage_data
*entry
)
1476 printf("processing entry, clean cache: %s\n", index_only ? "yes": "no");
1477 print_index_entry("\tpath: ", entry);
1479 int clean_merge
= 1;
1480 int normalize
= o
->renormalize
;
1481 unsigned o_mode
= entry
->stages
[1].mode
;
1482 unsigned a_mode
= entry
->stages
[2].mode
;
1483 unsigned b_mode
= entry
->stages
[3].mode
;
1484 unsigned char *o_sha
= stage_sha(entry
->stages
[1].sha
, o_mode
);
1485 unsigned char *a_sha
= stage_sha(entry
->stages
[2].sha
, a_mode
);
1486 unsigned char *b_sha
= stage_sha(entry
->stages
[3].sha
, b_mode
);
1488 entry
->processed
= 1;
1489 if (entry
->rename_conflict_info
) {
1490 struct rename_conflict_info
*conflict_info
= entry
->rename_conflict_info
;
1491 switch (conflict_info
->rename_type
) {
1493 case RENAME_ONE_FILE_TO_ONE
:
1494 clean_merge
= merge_content(o
, path
,
1495 o_sha
, o_mode
, a_sha
, a_mode
, b_sha
, b_mode
,
1500 conflict_rename_delete(o
, conflict_info
->pair1
,
1501 conflict_info
->branch1
,
1502 conflict_info
->branch2
);
1504 case RENAME_ONE_FILE_TO_TWO
:
1506 conflict_rename_rename_1to2(o
, conflict_info
->pair1
,
1507 conflict_info
->branch1
,
1508 conflict_info
->pair2
,
1509 conflict_info
->branch2
);
1512 entry
->processed
= 0;
1515 } else if (o_sha
&& (!a_sha
|| !b_sha
)) {
1516 /* Case A: Deleted in one */
1517 if ((!a_sha
&& !b_sha
) ||
1518 (!b_sha
&& blob_unchanged(o_sha
, a_sha
, normalize
, path
)) ||
1519 (!a_sha
&& blob_unchanged(o_sha
, b_sha
, normalize
, path
))) {
1520 /* Deleted in both or deleted in one and
1521 * unchanged in the other */
1523 output(o
, 2, "Removing %s", path
);
1524 /* do not touch working file if it did not exist */
1525 remove_file(o
, 1, path
, !a_sha
);
1527 /* Modify/delete; deleted side may have put a directory in the way */
1529 handle_delete_modify(o
, path
, o_sha
, o_mode
,
1530 a_sha
, a_mode
, b_sha
, b_mode
);
1532 } else if ((!o_sha
&& a_sha
&& !b_sha
) ||
1533 (!o_sha
&& !a_sha
&& b_sha
)) {
1534 /* Case B: Added in one. */
1535 /* [nothing|directory] -> ([nothing|directory], file) */
1537 const char *add_branch
;
1538 const char *other_branch
;
1540 const unsigned char *sha
;
1544 add_branch
= o
->branch1
;
1545 other_branch
= o
->branch2
;
1548 conf
= "file/directory";
1550 add_branch
= o
->branch2
;
1551 other_branch
= o
->branch1
;
1554 conf
= "directory/file";
1556 if (dir_in_way(path
, !o
->call_depth
)) {
1557 char *new_path
= unique_path(o
, path
, add_branch
);
1559 output(o
, 1, "CONFLICT (%s): There is a directory with name %s in %s. "
1561 conf
, path
, other_branch
, path
, new_path
);
1563 remove_file_from_cache(path
);
1564 update_file(o
, 0, sha
, mode
, new_path
);
1566 remove_file_from_cache(path
);
1569 output(o
, 2, "Adding %s", path
);
1570 update_file(o
, 1, sha
, mode
, path
);
1572 } else if (a_sha
&& b_sha
) {
1573 /* Case C: Added in both (check for same permissions) and */
1574 /* case D: Modified in both, but differently. */
1575 clean_merge
= merge_content(o
, path
,
1576 o_sha
, o_mode
, a_sha
, a_mode
, b_sha
, b_mode
,
1578 } else if (!o_sha
&& !a_sha
&& !b_sha
) {
1580 * this entry was deleted altogether. a_mode == 0 means
1581 * we had that path and want to actively remove it.
1583 remove_file(o
, 1, path
, !a_mode
);
1585 die("Fatal merge failure, shouldn't happen.");
1590 int merge_trees(struct merge_options
*o
,
1593 struct tree
*common
,
1594 struct tree
**result
)
1598 if (o
->subtree_shift
) {
1599 merge
= shift_tree_object(head
, merge
, o
->subtree_shift
);
1600 common
= shift_tree_object(head
, common
, o
->subtree_shift
);
1603 if (sha_eq(common
->object
.sha1
, merge
->object
.sha1
)) {
1604 output(o
, 0, "Already up-to-date!");
1609 code
= git_merge_trees(o
->call_depth
, common
, head
, merge
);
1612 if (show(o
, 4) || o
->call_depth
)
1613 die("merging of trees %s and %s failed",
1614 sha1_to_hex(head
->object
.sha1
),
1615 sha1_to_hex(merge
->object
.sha1
));
1620 if (unmerged_cache()) {
1621 struct string_list
*entries
, *re_head
, *re_merge
;
1623 string_list_clear(&o
->current_file_set
, 1);
1624 string_list_clear(&o
->current_directory_set
, 1);
1625 get_files_dirs(o
, head
);
1626 get_files_dirs(o
, merge
);
1628 entries
= get_unmerged();
1629 record_df_conflict_files(o
, entries
);
1630 re_head
= get_renames(o
, head
, common
, head
, merge
, entries
);
1631 re_merge
= get_renames(o
, merge
, common
, head
, merge
, entries
);
1632 clean
= process_renames(o
, re_head
, re_merge
);
1633 for (i
= entries
->nr
-1; 0 <= i
; i
--) {
1634 const char *path
= entries
->items
[i
].string
;
1635 struct stage_data
*e
= entries
->items
[i
].util
;
1637 && !process_entry(o
, path
, e
))
1640 for (i
= 0; i
< entries
->nr
; i
++) {
1641 struct stage_data
*e
= entries
->items
[i
].util
;
1643 die("Unprocessed path??? %s",
1644 entries
->items
[i
].string
);
1647 string_list_clear(re_merge
, 0);
1648 string_list_clear(re_head
, 0);
1649 string_list_clear(entries
, 1);
1656 *result
= write_tree_from_memory(o
);
1661 static struct commit_list
*reverse_commit_list(struct commit_list
*list
)
1663 struct commit_list
*next
= NULL
, *current
, *backup
;
1664 for (current
= list
; current
; current
= backup
) {
1665 backup
= current
->next
;
1666 current
->next
= next
;
1673 * Merge the commits h1 and h2, return the resulting virtual
1674 * commit object and a flag indicating the cleanness of the merge.
1676 int merge_recursive(struct merge_options
*o
,
1679 struct commit_list
*ca
,
1680 struct commit
**result
)
1682 struct commit_list
*iter
;
1683 struct commit
*merged_common_ancestors
;
1684 struct tree
*mrtree
= mrtree
;
1688 output(o
, 4, "Merging:");
1689 output_commit_title(o
, h1
);
1690 output_commit_title(o
, h2
);
1694 ca
= get_merge_bases(h1
, h2
, 1);
1695 ca
= reverse_commit_list(ca
);
1699 output(o
, 5, "found %u common ancestor(s):", commit_list_count(ca
));
1700 for (iter
= ca
; iter
; iter
= iter
->next
)
1701 output_commit_title(o
, iter
->item
);
1704 merged_common_ancestors
= pop_commit(&ca
);
1705 if (merged_common_ancestors
== NULL
) {
1706 /* if there is no common ancestor, make an empty tree */
1707 struct tree
*tree
= xcalloc(1, sizeof(struct tree
));
1709 tree
->object
.parsed
= 1;
1710 tree
->object
.type
= OBJ_TREE
;
1711 pretend_sha1_file(NULL
, 0, OBJ_TREE
, tree
->object
.sha1
);
1712 merged_common_ancestors
= make_virtual_commit(tree
, "ancestor");
1715 for (iter
= ca
; iter
; iter
= iter
->next
) {
1716 const char *saved_b1
, *saved_b2
;
1719 * When the merge fails, the result contains files
1720 * with conflict markers. The cleanness flag is
1721 * ignored, it was never actually used, as result of
1722 * merge_trees has always overwritten it: the committed
1723 * "conflicts" were already resolved.
1726 saved_b1
= o
->branch1
;
1727 saved_b2
= o
->branch2
;
1728 o
->branch1
= "Temporary merge branch 1";
1729 o
->branch2
= "Temporary merge branch 2";
1730 merge_recursive(o
, merged_common_ancestors
, iter
->item
,
1731 NULL
, &merged_common_ancestors
);
1732 o
->branch1
= saved_b1
;
1733 o
->branch2
= saved_b2
;
1736 if (!merged_common_ancestors
)
1737 die("merge returned no commit");
1744 o
->ancestor
= "merged common ancestors";
1745 clean
= merge_trees(o
, h1
->tree
, h2
->tree
, merged_common_ancestors
->tree
,
1748 if (o
->call_depth
) {
1749 *result
= make_virtual_commit(mrtree
, "merged tree");
1750 commit_list_insert(h1
, &(*result
)->parents
);
1751 commit_list_insert(h2
, &(*result
)->parents
->next
);
1755 diff_warn_rename_limit("merge.renamelimit",
1756 o
->needed_rename_limit
, 0);
1760 static struct commit
*get_ref(const unsigned char *sha1
, const char *name
)
1762 struct object
*object
;
1764 object
= deref_tag(parse_object(sha1
), name
, strlen(name
));
1767 if (object
->type
== OBJ_TREE
)
1768 return make_virtual_commit((struct tree
*)object
, name
);
1769 if (object
->type
!= OBJ_COMMIT
)
1771 if (parse_commit((struct commit
*)object
))
1773 return (struct commit
*)object
;
1776 int merge_recursive_generic(struct merge_options
*o
,
1777 const unsigned char *head
,
1778 const unsigned char *merge
,
1780 const unsigned char **base_list
,
1781 struct commit
**result
)
1783 int clean
, index_fd
;
1784 struct lock_file
*lock
= xcalloc(1, sizeof(struct lock_file
));
1785 struct commit
*head_commit
= get_ref(head
, o
->branch1
);
1786 struct commit
*next_commit
= get_ref(merge
, o
->branch2
);
1787 struct commit_list
*ca
= NULL
;
1791 for (i
= 0; i
< num_base_list
; ++i
) {
1792 struct commit
*base
;
1793 if (!(base
= get_ref(base_list
[i
], sha1_to_hex(base_list
[i
]))))
1794 return error("Could not parse object '%s'",
1795 sha1_to_hex(base_list
[i
]));
1796 commit_list_insert(base
, &ca
);
1800 index_fd
= hold_locked_index(lock
, 1);
1801 clean
= merge_recursive(o
, head_commit
, next_commit
, ca
,
1803 if (active_cache_changed
&&
1804 (write_cache(index_fd
, active_cache
, active_nr
) ||
1805 commit_locked_index(lock
)))
1806 return error("Unable to write index.");
1808 return clean
? 0 : 1;
1811 static int merge_recursive_config(const char *var
, const char *value
, void *cb
)
1813 struct merge_options
*o
= cb
;
1814 if (!strcmp(var
, "merge.verbosity")) {
1815 o
->verbosity
= git_config_int(var
, value
);
1818 if (!strcmp(var
, "diff.renamelimit")) {
1819 o
->diff_rename_limit
= git_config_int(var
, value
);
1822 if (!strcmp(var
, "merge.renamelimit")) {
1823 o
->merge_rename_limit
= git_config_int(var
, value
);
1826 return git_xmerge_config(var
, value
, cb
);
1829 void init_merge_options(struct merge_options
*o
)
1831 memset(o
, 0, sizeof(struct merge_options
));
1833 o
->buffer_output
= 1;
1834 o
->diff_rename_limit
= -1;
1835 o
->merge_rename_limit
= -1;
1837 git_config(merge_recursive_config
, o
);
1838 if (getenv("GIT_MERGE_VERBOSITY"))
1840 strtol(getenv("GIT_MERGE_VERBOSITY"), NULL
, 10);
1841 if (o
->verbosity
>= 5)
1842 o
->buffer_output
= 0;
1843 strbuf_init(&o
->obuf
, 0);
1844 memset(&o
->current_file_set
, 0, sizeof(struct string_list
));
1845 o
->current_file_set
.strdup_strings
= 1;
1846 memset(&o
->current_directory_set
, 0, sizeof(struct string_list
));
1847 o
->current_directory_set
.strdup_strings
= 1;
1848 memset(&o
->df_conflict_file_set
, 0, sizeof(struct string_list
));
1849 o
->df_conflict_file_set
.strdup_strings
= 1;
1852 int parse_merge_opt(struct merge_options
*o
, const char *s
)
1856 if (!strcmp(s
, "ours"))
1857 o
->recursive_variant
= MERGE_RECURSIVE_OURS
;
1858 else if (!strcmp(s
, "theirs"))
1859 o
->recursive_variant
= MERGE_RECURSIVE_THEIRS
;
1860 else if (!strcmp(s
, "subtree"))
1861 o
->subtree_shift
= "";
1862 else if (!prefixcmp(s
, "subtree="))
1863 o
->subtree_shift
= s
+ strlen("subtree=");
1864 else if (!strcmp(s
, "patience"))
1865 o
->xdl_opts
|= XDF_PATIENCE_DIFF
;
1866 else if (!strcmp(s
, "ignore-space-change"))
1867 o
->xdl_opts
|= XDF_IGNORE_WHITESPACE_CHANGE
;
1868 else if (!strcmp(s
, "ignore-all-space"))
1869 o
->xdl_opts
|= XDF_IGNORE_WHITESPACE
;
1870 else if (!strcmp(s
, "ignore-space-at-eol"))
1871 o
->xdl_opts
|= XDF_IGNORE_WHITESPACE_AT_EOL
;
1872 else if (!strcmp(s
, "renormalize"))
1874 else if (!strcmp(s
, "no-renormalize"))
1876 else if (!prefixcmp(s
, "rename-threshold=")) {
1877 const char *score
= s
+ strlen("rename-threshold=");
1878 if ((o
->rename_score
= parse_rename_score(&score
)) == -1 || *score
!= 0)