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_TWO
72 struct rename_df_conflict_info
{
73 enum rename_type rename_type
;
74 struct diff_filepair
*pair1
;
75 struct diff_filepair
*pair2
;
78 struct stage_data
*dst_entry1
;
79 struct stage_data
*dst_entry2
;
83 * Since we want to write the index eventually, we cannot reuse the index
84 * for these (temporary) data.
91 unsigned char sha
[20];
93 struct rename_df_conflict_info
*rename_df_conflict_info
;
97 static inline void setup_rename_df_conflict_info(enum rename_type rename_type
,
98 struct diff_filepair
*pair1
,
99 struct diff_filepair
*pair2
,
102 struct stage_data
*dst_entry1
,
103 struct stage_data
*dst_entry2
)
105 struct rename_df_conflict_info
*ci
= xcalloc(1, sizeof(struct rename_df_conflict_info
));
106 ci
->rename_type
= rename_type
;
108 ci
->branch1
= branch1
;
109 ci
->branch2
= branch2
;
111 ci
->dst_entry1
= dst_entry1
;
112 dst_entry1
->rename_df_conflict_info
= ci
;
113 dst_entry1
->processed
= 0;
115 assert(!pair2
== !dst_entry2
);
117 ci
->dst_entry2
= dst_entry2
;
119 dst_entry2
->rename_df_conflict_info
= ci
;
120 dst_entry2
->processed
= 0;
124 static int show(struct merge_options
*o
, int v
)
126 return (!o
->call_depth
&& o
->verbosity
>= v
) || o
->verbosity
>= 5;
129 static void flush_output(struct merge_options
*o
)
132 fputs(o
->obuf
.buf
, stdout
);
133 strbuf_reset(&o
->obuf
);
137 __attribute__((format (printf
, 3, 4)))
138 static void output(struct merge_options
*o
, int v
, const char *fmt
, ...)
146 strbuf_grow(&o
->obuf
, o
->call_depth
* 2 + 2);
147 memset(o
->obuf
.buf
+ o
->obuf
.len
, ' ', o
->call_depth
* 2);
148 strbuf_setlen(&o
->obuf
, o
->obuf
.len
+ o
->call_depth
* 2);
151 len
= vsnprintf(o
->obuf
.buf
+ o
->obuf
.len
, strbuf_avail(&o
->obuf
), fmt
, ap
);
156 if (len
>= strbuf_avail(&o
->obuf
)) {
157 strbuf_grow(&o
->obuf
, len
+ 2);
159 len
= vsnprintf(o
->obuf
.buf
+ o
->obuf
.len
, strbuf_avail(&o
->obuf
), fmt
, ap
);
161 if (len
>= strbuf_avail(&o
->obuf
)) {
162 die("this should not happen, your snprintf is broken");
165 strbuf_setlen(&o
->obuf
, o
->obuf
.len
+ len
);
166 strbuf_add(&o
->obuf
, "\n", 1);
167 if (!o
->buffer_output
)
171 static void output_commit_title(struct merge_options
*o
, struct commit
*commit
)
175 for (i
= o
->call_depth
; i
--;)
178 printf("virtual %s\n", (char *)commit
->util
);
180 printf("%s ", find_unique_abbrev(commit
->object
.sha1
, DEFAULT_ABBREV
));
181 if (parse_commit(commit
) != 0)
182 printf("(bad commit)\n");
185 int len
= find_commit_subject(commit
->buffer
, &title
);
187 printf("%.*s\n", len
, title
);
192 static int add_cacheinfo(unsigned int mode
, const unsigned char *sha1
,
193 const char *path
, int stage
, int refresh
, int options
)
195 struct cache_entry
*ce
;
196 ce
= make_cache_entry(mode
, sha1
? sha1
: null_sha1
, path
, stage
, refresh
);
198 return error("addinfo_cache failed for path '%s'", path
);
199 return add_cache_entry(ce
, options
);
202 static void init_tree_desc_from_tree(struct tree_desc
*desc
, struct tree
*tree
)
205 init_tree_desc(desc
, tree
->buffer
, tree
->size
);
208 static int git_merge_trees(int index_only
,
214 struct tree_desc t
[3];
215 struct unpack_trees_options opts
;
217 memset(&opts
, 0, sizeof(opts
));
224 opts
.fn
= threeway_merge
;
225 opts
.src_index
= &the_index
;
226 opts
.dst_index
= &the_index
;
227 setup_unpack_trees_porcelain(&opts
, "merge");
229 init_tree_desc_from_tree(t
+0, common
);
230 init_tree_desc_from_tree(t
+1, head
);
231 init_tree_desc_from_tree(t
+2, merge
);
233 rc
= unpack_trees(3, t
, &opts
);
234 cache_tree_free(&active_cache_tree
);
238 struct tree
*write_tree_from_memory(struct merge_options
*o
)
240 struct tree
*result
= NULL
;
242 if (unmerged_cache()) {
244 fprintf(stderr
, "BUG: There are unmerged index entries:\n");
245 for (i
= 0; i
< active_nr
; i
++) {
246 struct cache_entry
*ce
= active_cache
[i
];
248 fprintf(stderr
, "BUG: %d %.*s", ce_stage(ce
),
249 (int)ce_namelen(ce
), ce
->name
);
251 die("Bug in merge-recursive.c");
254 if (!active_cache_tree
)
255 active_cache_tree
= cache_tree();
257 if (!cache_tree_fully_valid(active_cache_tree
) &&
258 cache_tree_update(active_cache_tree
,
259 active_cache
, active_nr
, 0, 0) < 0)
260 die("error building trees");
262 result
= lookup_tree(active_cache_tree
->sha1
);
267 static int save_files_dirs(const unsigned char *sha1
,
268 const char *base
, int baselen
, const char *path
,
269 unsigned int mode
, int stage
, void *context
)
271 int len
= strlen(path
);
272 char *newpath
= xmalloc(baselen
+ len
+ 1);
273 struct merge_options
*o
= context
;
275 memcpy(newpath
, base
, baselen
);
276 memcpy(newpath
+ baselen
, path
, len
);
277 newpath
[baselen
+ len
] = '\0';
280 string_list_insert(&o
->current_directory_set
, newpath
);
282 string_list_insert(&o
->current_file_set
, newpath
);
285 return (S_ISDIR(mode
) ? READ_TREE_RECURSIVE
: 0);
288 static int get_files_dirs(struct merge_options
*o
, struct tree
*tree
)
291 if (read_tree_recursive(tree
, "", 0, 0, NULL
, save_files_dirs
, o
))
293 n
= o
->current_file_set
.nr
+ o
->current_directory_set
.nr
;
298 * Returns an index_entry instance which doesn't have to correspond to
299 * a real cache entry in Git's index.
301 static struct stage_data
*insert_stage_data(const char *path
,
302 struct tree
*o
, struct tree
*a
, struct tree
*b
,
303 struct string_list
*entries
)
305 struct string_list_item
*item
;
306 struct stage_data
*e
= xcalloc(1, sizeof(struct stage_data
));
307 get_tree_entry(o
->object
.sha1
, path
,
308 e
->stages
[1].sha
, &e
->stages
[1].mode
);
309 get_tree_entry(a
->object
.sha1
, path
,
310 e
->stages
[2].sha
, &e
->stages
[2].mode
);
311 get_tree_entry(b
->object
.sha1
, path
,
312 e
->stages
[3].sha
, &e
->stages
[3].mode
);
313 item
= string_list_insert(entries
, path
);
319 * Create a dictionary mapping file names to stage_data objects. The
320 * dictionary contains one entry for every path with a non-zero stage entry.
322 static struct string_list
*get_unmerged(void)
324 struct string_list
*unmerged
= xcalloc(1, sizeof(struct string_list
));
327 unmerged
->strdup_strings
= 1;
329 for (i
= 0; i
< active_nr
; i
++) {
330 struct string_list_item
*item
;
331 struct stage_data
*e
;
332 struct cache_entry
*ce
= active_cache
[i
];
336 item
= string_list_lookup(unmerged
, ce
->name
);
338 item
= string_list_insert(unmerged
, ce
->name
);
339 item
->util
= xcalloc(1, sizeof(struct stage_data
));
342 e
->stages
[ce_stage(ce
)].mode
= ce
->ce_mode
;
343 hashcpy(e
->stages
[ce_stage(ce
)].sha
, ce
->sha1
);
351 struct diff_filepair
*pair
;
352 struct stage_data
*src_entry
;
353 struct stage_data
*dst_entry
;
354 unsigned processed
:1;
358 * Get information of all renames which occurred between 'o_tree' and
359 * 'tree'. We need the three trees in the merge ('o_tree', 'a_tree' and
360 * 'b_tree') to be able to associate the correct cache entries with
361 * the rename information. 'tree' is always equal to either a_tree or b_tree.
363 static struct string_list
*get_renames(struct merge_options
*o
,
368 struct string_list
*entries
)
371 struct string_list
*renames
;
372 struct diff_options opts
;
374 renames
= xcalloc(1, sizeof(struct string_list
));
376 DIFF_OPT_SET(&opts
, RECURSIVE
);
377 opts
.detect_rename
= DIFF_DETECT_RENAME
;
378 opts
.rename_limit
= o
->merge_rename_limit
>= 0 ? o
->merge_rename_limit
:
379 o
->diff_rename_limit
>= 0 ? o
->diff_rename_limit
:
381 opts
.warn_on_too_large_rename
= 1;
382 opts
.output_format
= DIFF_FORMAT_NO_OUTPUT
;
383 if (diff_setup_done(&opts
) < 0)
384 die("diff setup failed");
385 diff_tree_sha1(o_tree
->object
.sha1
, tree
->object
.sha1
, "", &opts
);
387 for (i
= 0; i
< diff_queued_diff
.nr
; ++i
) {
388 struct string_list_item
*item
;
390 struct diff_filepair
*pair
= diff_queued_diff
.queue
[i
];
391 if (pair
->status
!= 'R') {
392 diff_free_filepair(pair
);
395 re
= xmalloc(sizeof(*re
));
398 item
= string_list_lookup(entries
, re
->pair
->one
->path
);
400 re
->src_entry
= insert_stage_data(re
->pair
->one
->path
,
401 o_tree
, a_tree
, b_tree
, entries
);
403 re
->src_entry
= item
->util
;
405 item
= string_list_lookup(entries
, re
->pair
->two
->path
);
407 re
->dst_entry
= insert_stage_data(re
->pair
->two
->path
,
408 o_tree
, a_tree
, b_tree
, entries
);
410 re
->dst_entry
= item
->util
;
411 item
= string_list_insert(renames
, pair
->one
->path
);
414 opts
.output_format
= DIFF_FORMAT_NO_OUTPUT
;
415 diff_queued_diff
.nr
= 0;
420 static int update_stages_options(const char *path
, struct diff_filespec
*o
,
421 struct diff_filespec
*a
, struct diff_filespec
*b
,
422 int clear
, int options
)
425 if (remove_file_from_cache(path
))
428 if (add_cacheinfo(o
->mode
, o
->sha1
, path
, 1, 0, options
))
431 if (add_cacheinfo(a
->mode
, a
->sha1
, path
, 2, 0, options
))
434 if (add_cacheinfo(b
->mode
, b
->sha1
, path
, 3, 0, options
))
439 static int update_stages(const char *path
, struct diff_filespec
*o
,
440 struct diff_filespec
*a
, struct diff_filespec
*b
,
443 int options
= ADD_CACHE_OK_TO_ADD
| ADD_CACHE_OK_TO_REPLACE
;
444 return update_stages_options(path
, o
, a
, b
, clear
, options
);
447 static int update_stages_and_entry(const char *path
,
448 struct stage_data
*entry
,
449 struct diff_filespec
*o
,
450 struct diff_filespec
*a
,
451 struct diff_filespec
*b
,
456 entry
->processed
= 0;
457 entry
->stages
[1].mode
= o
->mode
;
458 entry
->stages
[2].mode
= a
->mode
;
459 entry
->stages
[3].mode
= b
->mode
;
460 hashcpy(entry
->stages
[1].sha
, o
->sha1
);
461 hashcpy(entry
->stages
[2].sha
, a
->sha1
);
462 hashcpy(entry
->stages
[3].sha
, b
->sha1
);
463 options
= ADD_CACHE_OK_TO_ADD
| ADD_CACHE_SKIP_DFCHECK
;
464 return update_stages_options(path
, o
, a
, b
, clear
, options
);
467 static int remove_file(struct merge_options
*o
, int clean
,
468 const char *path
, int no_wd
)
470 int update_cache
= o
->call_depth
|| clean
;
471 int update_working_directory
= !o
->call_depth
&& !no_wd
;
474 if (remove_file_from_cache(path
))
477 if (update_working_directory
) {
478 if (remove_path(path
))
484 static char *unique_path(struct merge_options
*o
, const char *path
, const char *branch
)
486 char *newpath
= xmalloc(strlen(path
) + 1 + strlen(branch
) + 8 + 1);
489 char *p
= newpath
+ strlen(path
);
490 strcpy(newpath
, path
);
496 while (string_list_has_string(&o
->current_file_set
, newpath
) ||
497 string_list_has_string(&o
->current_directory_set
, newpath
) ||
498 lstat(newpath
, &st
) == 0)
499 sprintf(p
, "_%d", suffix
++);
501 string_list_insert(&o
->current_file_set
, newpath
);
505 static void flush_buffer(int fd
, const char *buf
, unsigned long size
)
508 long ret
= write_in_full(fd
, buf
, size
);
513 die_errno("merge-recursive");
515 die("merge-recursive: disk full?");
522 static int would_lose_untracked(const char *path
)
524 int pos
= cache_name_pos(path
, strlen(path
));
528 while (pos
< active_nr
&&
529 !strcmp(path
, active_cache
[pos
]->name
)) {
531 * If stage #0, it is definitely tracked.
532 * If it has stage #2 then it was tracked
533 * before this merge started. All other
534 * cases the path was not tracked.
536 switch (ce_stage(active_cache
[pos
])) {
543 return file_exists(path
);
546 static int make_room_for_path(const char *path
)
549 const char *msg
= "failed to create path '%s'%s";
551 status
= safe_create_leading_directories_const(path
);
554 /* something else exists */
555 error(msg
, path
, ": perhaps a D/F conflict?");
562 * Do not unlink a file in the work tree if we are not
565 if (would_lose_untracked(path
))
566 return error("refusing to lose untracked file at '%s'",
569 /* Successful unlink is good.. */
572 /* .. and so is no existing file */
575 /* .. but not some other error (who really cares what?) */
576 return error(msg
, path
, ": perhaps a D/F conflict?");
579 static void update_file_flags(struct merge_options
*o
,
580 const unsigned char *sha
,
590 enum object_type type
;
594 if (S_ISGITLINK(mode
)) {
596 * We may later decide to recursively descend into
597 * the submodule directory and update its index
598 * and/or work tree, but we do not do that now.
604 buf
= read_sha1_file(sha
, &type
, &size
);
606 die("cannot read object %s '%s'", sha1_to_hex(sha
), path
);
607 if (type
!= OBJ_BLOB
)
608 die("blob expected for %s '%s'", sha1_to_hex(sha
), path
);
610 struct strbuf strbuf
= STRBUF_INIT
;
611 if (convert_to_working_tree(path
, buf
, size
, &strbuf
)) {
614 buf
= strbuf_detach(&strbuf
, NULL
);
618 if (make_room_for_path(path
) < 0) {
623 if (S_ISREG(mode
) || (!has_symlinks
&& S_ISLNK(mode
))) {
629 fd
= open(path
, O_WRONLY
| O_TRUNC
| O_CREAT
, mode
);
631 die_errno("failed to open '%s'", path
);
632 flush_buffer(fd
, buf
, size
);
634 } else if (S_ISLNK(mode
)) {
635 char *lnk
= xmemdupz(buf
, size
);
636 safe_create_leading_directories_const(path
);
638 if (symlink(lnk
, path
))
639 die_errno("failed to symlink '%s'", path
);
642 die("do not know what to do with %06o %s '%s'",
643 mode
, sha1_to_hex(sha
), path
);
648 add_cacheinfo(mode
, sha
, path
, 0, update_wd
, ADD_CACHE_OK_TO_ADD
);
651 static void update_file(struct merge_options
*o
,
653 const unsigned char *sha
,
657 update_file_flags(o
, sha
, mode
, path
, o
->call_depth
|| clean
, !o
->call_depth
);
660 /* Low level file merging, update and removal */
662 struct merge_file_info
664 unsigned char sha
[20];
670 static int merge_3way(struct merge_options
*o
,
671 mmbuffer_t
*result_buf
,
672 struct diff_filespec
*one
,
673 struct diff_filespec
*a
,
674 struct diff_filespec
*b
,
678 mmfile_t orig
, src1
, src2
;
679 char *base_name
, *name1
, *name2
;
686 switch (o
->recursive_variant
) {
687 case MERGE_RECURSIVE_OURS
:
688 favor
= XDL_MERGE_FAVOR_OURS
;
690 case MERGE_RECURSIVE_THEIRS
:
691 favor
= XDL_MERGE_FAVOR_THEIRS
;
699 if (strcmp(a
->path
, b
->path
) ||
700 (o
->ancestor
!= NULL
&& strcmp(a
->path
, one
->path
) != 0)) {
701 base_name
= o
->ancestor
== NULL
? NULL
:
702 xstrdup(mkpath("%s:%s", o
->ancestor
, one
->path
));
703 name1
= xstrdup(mkpath("%s:%s", branch1
, a
->path
));
704 name2
= xstrdup(mkpath("%s:%s", branch2
, b
->path
));
706 base_name
= o
->ancestor
== NULL
? NULL
:
707 xstrdup(mkpath("%s", o
->ancestor
));
708 name1
= xstrdup(mkpath("%s", branch1
));
709 name2
= xstrdup(mkpath("%s", branch2
));
712 read_mmblob(&orig
, one
->sha1
);
713 read_mmblob(&src1
, a
->sha1
);
714 read_mmblob(&src2
, b
->sha1
);
716 merge_status
= ll_merge(result_buf
, a
->path
, &orig
, base_name
,
717 &src1
, name1
, &src2
, name2
,
718 ((o
->call_depth
? LL_OPT_VIRTUAL_ANCESTOR
: 0) |
719 (o
->renormalize
? LL_OPT_RENORMALIZE
: 0) |
720 create_ll_flag(favor
)));
730 static struct merge_file_info
merge_file(struct merge_options
*o
,
731 struct diff_filespec
*one
,
732 struct diff_filespec
*a
,
733 struct diff_filespec
*b
,
737 struct merge_file_info result
;
741 if ((S_IFMT
& a
->mode
) != (S_IFMT
& b
->mode
)) {
743 if (S_ISREG(a
->mode
)) {
744 result
.mode
= a
->mode
;
745 hashcpy(result
.sha
, a
->sha1
);
747 result
.mode
= b
->mode
;
748 hashcpy(result
.sha
, b
->sha1
);
751 if (!sha_eq(a
->sha1
, one
->sha1
) && !sha_eq(b
->sha1
, one
->sha1
))
757 if (a
->mode
== b
->mode
|| a
->mode
== one
->mode
)
758 result
.mode
= b
->mode
;
760 result
.mode
= a
->mode
;
761 if (b
->mode
!= one
->mode
) {
767 if (sha_eq(a
->sha1
, b
->sha1
) || sha_eq(a
->sha1
, one
->sha1
))
768 hashcpy(result
.sha
, b
->sha1
);
769 else if (sha_eq(b
->sha1
, one
->sha1
))
770 hashcpy(result
.sha
, a
->sha1
);
771 else if (S_ISREG(a
->mode
)) {
772 mmbuffer_t result_buf
;
775 merge_status
= merge_3way(o
, &result_buf
, one
, a
, b
,
778 if ((merge_status
< 0) || !result_buf
.ptr
)
779 die("Failed to execute internal merge");
781 if (write_sha1_file(result_buf
.ptr
, result_buf
.size
,
782 blob_type
, result
.sha
))
783 die("Unable to add %s to database",
786 free(result_buf
.ptr
);
787 result
.clean
= (merge_status
== 0);
788 } else if (S_ISGITLINK(a
->mode
)) {
789 result
.clean
= merge_submodule(result
.sha
, one
->path
, one
->sha1
,
791 } else if (S_ISLNK(a
->mode
)) {
792 hashcpy(result
.sha
, a
->sha1
);
794 if (!sha_eq(a
->sha1
, b
->sha1
))
797 die("unsupported object type in the tree");
804 static void conflict_rename_delete(struct merge_options
*o
,
805 struct diff_filepair
*pair
,
806 const char *rename_branch
,
807 const char *other_branch
)
809 char *dest_name
= pair
->two
->path
;
811 output(o
, 1, "CONFLICT (rename/delete): Rename %s->%s in %s "
813 pair
->one
->path
, pair
->two
->path
, rename_branch
,
816 update_stages(dest_name
, NULL
,
817 rename_branch
== o
->branch1
? pair
->two
: NULL
,
818 rename_branch
== o
->branch1
? NULL
: pair
->two
,
820 update_file(o
, 0, pair
->two
->sha1
, pair
->two
->mode
, dest_name
);
823 static void conflict_rename_rename_1to2(struct merge_options
*o
,
824 struct diff_filepair
*pair1
,
826 struct diff_filepair
*pair2
,
829 /* One file was renamed in both branches, but to different names. */
832 const char *ren1_dst
= pair1
->two
->path
;
833 const char *ren2_dst
= pair2
->two
->path
;
834 const char *dst_name1
= ren1_dst
;
835 const char *dst_name2
= ren2_dst
;
836 if (string_list_has_string(&o
->current_directory_set
, ren1_dst
)) {
837 dst_name1
= del
[delp
++] = unique_path(o
, ren1_dst
, branch1
);
838 output(o
, 1, "%s is a directory in %s adding as %s instead",
839 ren1_dst
, branch2
, dst_name1
);
840 remove_file(o
, 0, ren1_dst
, 0);
842 if (string_list_has_string(&o
->current_directory_set
, ren2_dst
)) {
843 dst_name2
= del
[delp
++] = unique_path(o
, ren2_dst
, branch2
);
844 output(o
, 1, "%s is a directory in %s adding as %s instead",
845 ren2_dst
, branch1
, dst_name2
);
846 remove_file(o
, 0, ren2_dst
, 0);
849 remove_file_from_cache(dst_name1
);
850 remove_file_from_cache(dst_name2
);
852 * Uncomment to leave the conflicting names in the resulting tree
854 * update_file(o, 0, pair1->two->sha1, pair1->two->mode, dst_name1);
855 * update_file(o, 0, pair2->two->sha1, pair2->two->mode, dst_name2);
858 update_stages(ren1_dst
, NULL
, pair1
->two
, NULL
, 1);
859 update_stages(ren2_dst
, NULL
, NULL
, pair2
->two
, 1);
861 update_file(o
, 0, pair1
->two
->sha1
, pair1
->two
->mode
, dst_name1
);
862 update_file(o
, 0, pair2
->two
->sha1
, pair2
->two
->mode
, dst_name2
);
868 static void conflict_rename_rename_2to1(struct merge_options
*o
,
874 /* Two files were renamed to the same thing. */
875 char *new_path1
= unique_path(o
, ren1
->pair
->two
->path
, branch1
);
876 char *new_path2
= unique_path(o
, ren2
->pair
->two
->path
, branch2
);
877 output(o
, 1, "Renaming %s to %s and %s to %s instead",
878 ren1
->pair
->one
->path
, new_path1
,
879 ren2
->pair
->one
->path
, new_path2
);
880 remove_file(o
, 0, ren1
->pair
->two
->path
, 0);
881 update_file(o
, 0, ren1
->pair
->two
->sha1
, ren1
->pair
->two
->mode
, new_path1
);
882 update_file(o
, 0, ren2
->pair
->two
->sha1
, ren2
->pair
->two
->mode
, new_path2
);
887 static int process_renames(struct merge_options
*o
,
888 struct string_list
*a_renames
,
889 struct string_list
*b_renames
)
891 int clean_merge
= 1, i
, j
;
892 struct string_list a_by_dst
= STRING_LIST_INIT_NODUP
;
893 struct string_list b_by_dst
= STRING_LIST_INIT_NODUP
;
894 const struct rename
*sre
;
896 for (i
= 0; i
< a_renames
->nr
; i
++) {
897 sre
= a_renames
->items
[i
].util
;
898 string_list_insert(&a_by_dst
, sre
->pair
->two
->path
)->util
901 for (i
= 0; i
< b_renames
->nr
; i
++) {
902 sre
= b_renames
->items
[i
].util
;
903 string_list_insert(&b_by_dst
, sre
->pair
->two
->path
)->util
907 for (i
= 0, j
= 0; i
< a_renames
->nr
|| j
< b_renames
->nr
;) {
909 struct string_list
*renames1
, *renames2Dst
;
910 struct rename
*ren1
= NULL
, *ren2
= NULL
;
911 const char *branch1
, *branch2
;
912 const char *ren1_src
, *ren1_dst
;
914 if (i
>= a_renames
->nr
) {
915 ren2
= b_renames
->items
[j
++].util
;
916 } else if (j
>= b_renames
->nr
) {
917 ren1
= a_renames
->items
[i
++].util
;
919 int compare
= strcmp(a_renames
->items
[i
].string
,
920 b_renames
->items
[j
].string
);
922 ren1
= a_renames
->items
[i
++].util
;
924 ren2
= b_renames
->items
[j
++].util
;
927 /* TODO: refactor, so that 1/2 are not needed */
929 renames1
= a_renames
;
930 renames2Dst
= &b_by_dst
;
931 branch1
= o
->branch1
;
932 branch2
= o
->branch2
;
935 renames1
= b_renames
;
936 renames2Dst
= &a_by_dst
;
937 branch1
= o
->branch2
;
938 branch2
= o
->branch1
;
943 src
= ren1
->pair
->one
->path
;
945 ren1
->dst_entry
->processed
= 1;
946 ren1
->src_entry
->processed
= 1;
952 ren1_src
= ren1
->pair
->one
->path
;
953 ren1_dst
= ren1
->pair
->two
->path
;
956 const char *ren2_src
= ren2
->pair
->one
->path
;
957 const char *ren2_dst
= ren2
->pair
->two
->path
;
958 /* Renamed in 1 and renamed in 2 */
959 if (strcmp(ren1_src
, ren2_src
) != 0)
960 die("ren1.src != ren2.src");
961 ren2
->dst_entry
->processed
= 1;
963 if (strcmp(ren1_dst
, ren2_dst
) != 0) {
964 setup_rename_df_conflict_info(RENAME_ONE_FILE_TO_TWO
,
971 remove_file(o
, 0, ren1_dst
, 0);
972 /* ren2_dst not in head, so no need to delete */
974 remove_file(o
, 1, ren1_src
, 1);
975 update_stages_and_entry(ren1_dst
,
983 /* Renamed in 1, maybe changed in 2 */
984 struct string_list_item
*item
;
985 /* we only use sha1 and mode of these */
986 struct diff_filespec src_other
, dst_other
;
990 * unpack_trees loads entries from common-commit
991 * into stage 1, from head-commit into stage 2, and
992 * from merge-commit into stage 3. We keep track
993 * of which side corresponds to the rename.
995 int renamed_stage
= a_renames
== renames1
? 2 : 3;
996 int other_stage
= a_renames
== renames1
? 3 : 2;
998 remove_file(o
, 1, ren1_src
, o
->call_depth
|| renamed_stage
== 2);
1000 hashcpy(src_other
.sha1
, ren1
->src_entry
->stages
[other_stage
].sha
);
1001 src_other
.mode
= ren1
->src_entry
->stages
[other_stage
].mode
;
1002 hashcpy(dst_other
.sha1
, ren1
->dst_entry
->stages
[other_stage
].sha
);
1003 dst_other
.mode
= ren1
->dst_entry
->stages
[other_stage
].mode
;
1006 if (sha_eq(src_other
.sha1
, null_sha1
)) {
1007 if (string_list_has_string(&o
->current_directory_set
, ren1_dst
)) {
1008 ren1
->dst_entry
->processed
= 0;
1009 setup_rename_df_conflict_info(RENAME_DELETE
,
1016 remove_file(o
, 0, ren1_dst
, 0);
1019 conflict_rename_delete(o
, ren1
->pair
, branch1
, branch2
);
1021 } else if ((dst_other
.mode
== ren1
->pair
->two
->mode
) &&
1022 sha_eq(dst_other
.sha1
, ren1
->pair
->two
->sha1
)) {
1023 /* Added file on the other side
1024 identical to the file being
1025 renamed: clean merge */
1026 update_file(o
, 1, ren1
->pair
->two
->sha1
, ren1
->pair
->two
->mode
, ren1_dst
);
1027 } else if (!sha_eq(dst_other
.sha1
, null_sha1
)) {
1028 const char *new_path
;
1031 output(o
, 1, "CONFLICT (rename/add): Rename %s->%s in %s. "
1033 ren1_src
, ren1_dst
, branch1
,
1035 if (o
->call_depth
) {
1036 struct merge_file_info mfi
;
1037 struct diff_filespec one
, a
, b
;
1039 one
.path
= a
.path
= b
.path
=
1041 hashcpy(one
.sha1
, null_sha1
);
1043 hashcpy(a
.sha1
, ren1
->pair
->two
->sha1
);
1044 a
.mode
= ren1
->pair
->two
->mode
;
1045 hashcpy(b
.sha1
, dst_other
.sha1
);
1046 b
.mode
= dst_other
.mode
;
1047 mfi
= merge_file(o
, &one
, &a
, &b
,
1050 output(o
, 1, "Adding merged %s", ren1_dst
);
1057 new_path
= unique_path(o
, ren1_dst
, branch2
);
1058 output(o
, 1, "Adding as %s instead", new_path
);
1059 update_file(o
, 0, dst_other
.sha1
, dst_other
.mode
, new_path
);
1061 } else if ((item
= string_list_lookup(renames2Dst
, ren1_dst
))) {
1064 ren2
->processed
= 1;
1065 output(o
, 1, "CONFLICT (rename/rename): "
1066 "Rename %s->%s in %s. "
1067 "Rename %s->%s in %s",
1068 ren1_src
, ren1_dst
, branch1
,
1069 ren2
->pair
->one
->path
, ren2
->pair
->two
->path
, branch2
);
1070 conflict_rename_rename_2to1(o
, ren1
, branch1
, ren2
, branch2
);
1075 struct diff_filespec
*one
, *a
, *b
;
1076 src_other
.path
= (char *)ren1_src
;
1078 one
= ren1
->pair
->one
;
1079 if (a_renames
== renames1
) {
1080 a
= ren1
->pair
->two
;
1083 b
= ren1
->pair
->two
;
1086 update_stages_and_entry(ren1_dst
, ren1
->dst_entry
, one
, a
, b
, 1);
1087 if (string_list_has_string(&o
->current_directory_set
, ren1_dst
)) {
1088 setup_rename_df_conflict_info(RENAME_NORMAL
,
1095 remove_file(o
, 0, ren1_dst
, 0);
1100 string_list_clear(&a_by_dst
, 0);
1101 string_list_clear(&b_by_dst
, 0);
1106 static unsigned char *stage_sha(const unsigned char *sha
, unsigned mode
)
1108 return (is_null_sha1(sha
) || mode
== 0) ? NULL
: (unsigned char *)sha
;
1111 static int read_sha1_strbuf(const unsigned char *sha1
, struct strbuf
*dst
)
1114 enum object_type type
;
1116 buf
= read_sha1_file(sha1
, &type
, &size
);
1118 return error("cannot read object %s", sha1_to_hex(sha1
));
1119 if (type
!= OBJ_BLOB
) {
1121 return error("object %s is not a blob", sha1_to_hex(sha1
));
1123 strbuf_attach(dst
, buf
, size
, size
+ 1);
1127 static int blob_unchanged(const unsigned char *o_sha
,
1128 const unsigned char *a_sha
,
1129 int renormalize
, const char *path
)
1131 struct strbuf o
= STRBUF_INIT
;
1132 struct strbuf a
= STRBUF_INIT
;
1133 int ret
= 0; /* assume changed for safety */
1135 if (sha_eq(o_sha
, a_sha
))
1140 assert(o_sha
&& a_sha
);
1141 if (read_sha1_strbuf(o_sha
, &o
) || read_sha1_strbuf(a_sha
, &a
))
1144 * Note: binary | is used so that both renormalizations are
1145 * performed. Comparison can be skipped if both files are
1146 * unchanged since their sha1s have already been compared.
1148 if (renormalize_buffer(path
, o
.buf
, o
.len
, &o
) |
1149 renormalize_buffer(path
, a
.buf
, o
.len
, &a
))
1150 ret
= (o
.len
== a
.len
&& !memcmp(o
.buf
, a
.buf
, o
.len
));
1158 static void handle_delete_modify(struct merge_options
*o
,
1160 unsigned char *a_sha
, int a_mode
,
1161 unsigned char *b_sha
, int b_mode
)
1164 output(o
, 1, "CONFLICT (delete/modify): %s deleted in %s "
1165 "and modified in %s. Version %s of %s left in tree.",
1167 o
->branch2
, o
->branch2
, path
);
1168 update_file(o
, 0, b_sha
, b_mode
, path
);
1170 output(o
, 1, "CONFLICT (delete/modify): %s deleted in %s "
1171 "and modified in %s. Version %s of %s left in tree.",
1173 o
->branch1
, o
->branch1
, path
);
1174 update_file(o
, 0, a_sha
, a_mode
, path
);
1179 static int merge_content(struct merge_options
*o
,
1181 unsigned char *o_sha
, int o_mode
,
1182 unsigned char *a_sha
, int a_mode
,
1183 unsigned char *b_sha
, int b_mode
,
1184 const char *df_rename_conflict_branch
)
1186 const char *reason
= "content";
1187 struct merge_file_info mfi
;
1188 struct diff_filespec one
, a
, b
;
1192 o_sha
= (unsigned char *)null_sha1
;
1194 one
.path
= a
.path
= b
.path
= (char *)path
;
1195 hashcpy(one
.sha1
, o_sha
);
1197 hashcpy(a
.sha1
, a_sha
);
1199 hashcpy(b
.sha1
, b_sha
);
1202 mfi
= merge_file(o
, &one
, &a
, &b
, o
->branch1
, o
->branch2
);
1203 if (mfi
.clean
&& sha_eq(mfi
.sha
, a_sha
) && mfi
.mode
== a
.mode
)
1204 output(o
, 3, "Skipped %s (merged same as existing)", path
);
1206 output(o
, 2, "Auto-merging %s", path
);
1209 if (S_ISGITLINK(mfi
.mode
))
1210 reason
= "submodule";
1211 output(o
, 1, "CONFLICT (%s): Merge conflict in %s",
1215 update_file(o
, mfi
.clean
, mfi
.sha
, mfi
.mode
, path
);
1220 /* Per entry merge function */
1221 static int process_entry(struct merge_options
*o
,
1222 const char *path
, struct stage_data
*entry
)
1225 printf("processing entry, clean cache: %s\n", index_only ? "yes": "no");
1226 print_index_entry("\tpath: ", entry);
1228 int clean_merge
= 1;
1229 int normalize
= o
->renormalize
;
1230 unsigned o_mode
= entry
->stages
[1].mode
;
1231 unsigned a_mode
= entry
->stages
[2].mode
;
1232 unsigned b_mode
= entry
->stages
[3].mode
;
1233 unsigned char *o_sha
= stage_sha(entry
->stages
[1].sha
, o_mode
);
1234 unsigned char *a_sha
= stage_sha(entry
->stages
[2].sha
, a_mode
);
1235 unsigned char *b_sha
= stage_sha(entry
->stages
[3].sha
, b_mode
);
1237 if (entry
->rename_df_conflict_info
)
1238 return 1; /* Such cases are handled elsewhere. */
1240 entry
->processed
= 1;
1241 if (o_sha
&& (!a_sha
|| !b_sha
)) {
1242 /* Case A: Deleted in one */
1243 if ((!a_sha
&& !b_sha
) ||
1244 (!b_sha
&& blob_unchanged(o_sha
, a_sha
, normalize
, path
)) ||
1245 (!a_sha
&& blob_unchanged(o_sha
, b_sha
, normalize
, path
))) {
1246 /* Deleted in both or deleted in one and
1247 * unchanged in the other */
1249 output(o
, 2, "Removing %s", path
);
1250 /* do not touch working file if it did not exist */
1251 remove_file(o
, 1, path
, !a_sha
);
1253 /* Deleted in one and changed in the other */
1255 handle_delete_modify(o
, path
,
1256 a_sha
, a_mode
, b_sha
, b_mode
);
1259 } else if ((!o_sha
&& a_sha
&& !b_sha
) ||
1260 (!o_sha
&& !a_sha
&& b_sha
)) {
1261 /* Case B: Added in one. */
1263 const unsigned char *sha
;
1272 if (string_list_has_string(&o
->current_directory_set
, path
)) {
1273 /* Handle D->F conflicts after all subfiles */
1274 entry
->processed
= 0;
1275 /* But get any file out of the way now, so conflicted
1276 * entries below the directory of the same name can
1277 * be put in the working directory.
1280 output(o
, 2, "Removing %s", path
);
1281 /* do not touch working file if it did not exist */
1282 remove_file(o
, 0, path
, !a_sha
);
1283 return 1; /* Assume clean till processed */
1285 output(o
, 2, "Adding %s", path
);
1286 update_file(o
, 1, sha
, mode
, path
);
1288 } else if (a_sha
&& b_sha
) {
1289 /* Case C: Added in both (check for same permissions) and */
1290 /* case D: Modified in both, but differently. */
1291 clean_merge
= merge_content(o
, path
,
1292 o_sha
, o_mode
, a_sha
, a_mode
, b_sha
, b_mode
,
1294 } else if (!o_sha
&& !a_sha
&& !b_sha
) {
1296 * this entry was deleted altogether. a_mode == 0 means
1297 * we had that path and want to actively remove it.
1299 remove_file(o
, 1, path
, !a_mode
);
1301 die("Fatal merge failure, shouldn't happen.");
1307 * Per entry merge function for D/F (and/or rename) conflicts. In the
1308 * cases we can cleanly resolve D/F conflicts, process_entry() can
1309 * clean out all the files below the directory for us. All D/F
1310 * conflict cases must be handled here at the end to make sure any
1311 * directories that can be cleaned out, are.
1313 * Some rename conflicts may also be handled here that don't necessarily
1314 * involve D/F conflicts, since the code to handle them is generic enough
1315 * to handle those rename conflicts with or without D/F conflicts also
1318 static int process_df_entry(struct merge_options
*o
,
1319 const char *path
, struct stage_data
*entry
)
1321 int clean_merge
= 1;
1322 unsigned o_mode
= entry
->stages
[1].mode
;
1323 unsigned a_mode
= entry
->stages
[2].mode
;
1324 unsigned b_mode
= entry
->stages
[3].mode
;
1325 unsigned char *o_sha
= stage_sha(entry
->stages
[1].sha
, o_mode
);
1326 unsigned char *a_sha
= stage_sha(entry
->stages
[2].sha
, a_mode
);
1327 unsigned char *b_sha
= stage_sha(entry
->stages
[3].sha
, b_mode
);
1330 entry
->processed
= 1;
1331 if (entry
->rename_df_conflict_info
) {
1332 struct rename_df_conflict_info
*conflict_info
= entry
->rename_df_conflict_info
;
1334 switch (conflict_info
->rename_type
) {
1336 clean_merge
= merge_content(o
, path
,
1337 o_sha
, o_mode
, a_sha
, a_mode
, b_sha
, b_mode
,
1338 conflict_info
->branch1
);
1342 conflict_rename_delete(o
, conflict_info
->pair1
,
1343 conflict_info
->branch1
,
1344 conflict_info
->branch2
);
1346 case RENAME_ONE_FILE_TO_TWO
:
1347 src
= conflict_info
->pair1
->one
->path
;
1349 output(o
, 1, "CONFLICT (rename/rename): "
1350 "Rename \"%s\"->\"%s\" in branch \"%s\" "
1351 "rename \"%s\"->\"%s\" in \"%s\"%s",
1352 src
, conflict_info
->pair1
->two
->path
, conflict_info
->branch1
,
1353 src
, conflict_info
->pair2
->two
->path
, conflict_info
->branch2
,
1354 o
->call_depth
? " (left unresolved)" : "");
1355 if (o
->call_depth
) {
1356 remove_file_from_cache(src
);
1357 update_file(o
, 0, conflict_info
->pair1
->one
->sha1
,
1358 conflict_info
->pair1
->one
->mode
, src
);
1360 conflict_rename_rename_1to2(o
, conflict_info
->pair1
,
1361 conflict_info
->branch1
,
1362 conflict_info
->pair2
,
1363 conflict_info
->branch2
);
1364 conflict_info
->dst_entry2
->processed
= 1;
1367 entry
->processed
= 0;
1370 } else if (!o_sha
&& !!a_sha
!= !!b_sha
) {
1371 /* directory -> (directory, file) */
1372 const char *add_branch
;
1373 const char *other_branch
;
1375 const unsigned char *sha
;
1379 add_branch
= o
->branch1
;
1380 other_branch
= o
->branch2
;
1383 conf
= "file/directory";
1385 add_branch
= o
->branch2
;
1386 other_branch
= o
->branch1
;
1389 conf
= "directory/file";
1391 if (lstat(path
, &st
) == 0 && S_ISDIR(st
.st_mode
)) {
1392 const char *new_path
= unique_path(o
, path
, add_branch
);
1394 output(o
, 1, "CONFLICT (%s): There is a directory with name %s in %s. "
1396 conf
, path
, other_branch
, path
, new_path
);
1397 remove_file(o
, 0, path
, 0);
1398 update_file(o
, 0, sha
, mode
, new_path
);
1400 output(o
, 2, "Adding %s", path
);
1401 update_file(o
, 1, sha
, mode
, path
);
1404 entry
->processed
= 0;
1405 return 1; /* not handled; assume clean until processed */
1411 int merge_trees(struct merge_options
*o
,
1414 struct tree
*common
,
1415 struct tree
**result
)
1419 if (o
->subtree_shift
) {
1420 merge
= shift_tree_object(head
, merge
, o
->subtree_shift
);
1421 common
= shift_tree_object(head
, common
, o
->subtree_shift
);
1424 if (sha_eq(common
->object
.sha1
, merge
->object
.sha1
)) {
1425 output(o
, 0, "Already up-to-date!");
1430 code
= git_merge_trees(o
->call_depth
, common
, head
, merge
);
1433 if (show(o
, 4) || o
->call_depth
)
1434 die("merging of trees %s and %s failed",
1435 sha1_to_hex(head
->object
.sha1
),
1436 sha1_to_hex(merge
->object
.sha1
));
1441 if (unmerged_cache()) {
1442 struct string_list
*entries
, *re_head
, *re_merge
;
1444 string_list_clear(&o
->current_file_set
, 1);
1445 string_list_clear(&o
->current_directory_set
, 1);
1446 get_files_dirs(o
, head
);
1447 get_files_dirs(o
, merge
);
1449 entries
= get_unmerged();
1450 re_head
= get_renames(o
, head
, common
, head
, merge
, entries
);
1451 re_merge
= get_renames(o
, merge
, common
, head
, merge
, entries
);
1452 clean
= process_renames(o
, re_head
, re_merge
);
1453 for (i
= 0; i
< entries
->nr
; i
++) {
1454 const char *path
= entries
->items
[i
].string
;
1455 struct stage_data
*e
= entries
->items
[i
].util
;
1457 && !process_entry(o
, path
, e
))
1460 for (i
= 0; i
< entries
->nr
; i
++) {
1461 const char *path
= entries
->items
[i
].string
;
1462 struct stage_data
*e
= entries
->items
[i
].util
;
1464 && !process_df_entry(o
, path
, e
))
1467 for (i
= 0; i
< entries
->nr
; i
++) {
1468 struct stage_data
*e
= entries
->items
[i
].util
;
1470 die("Unprocessed path??? %s",
1471 entries
->items
[i
].string
);
1474 string_list_clear(re_merge
, 0);
1475 string_list_clear(re_head
, 0);
1476 string_list_clear(entries
, 1);
1483 *result
= write_tree_from_memory(o
);
1488 static struct commit_list
*reverse_commit_list(struct commit_list
*list
)
1490 struct commit_list
*next
= NULL
, *current
, *backup
;
1491 for (current
= list
; current
; current
= backup
) {
1492 backup
= current
->next
;
1493 current
->next
= next
;
1500 * Merge the commits h1 and h2, return the resulting virtual
1501 * commit object and a flag indicating the cleanness of the merge.
1503 int merge_recursive(struct merge_options
*o
,
1506 struct commit_list
*ca
,
1507 struct commit
**result
)
1509 struct commit_list
*iter
;
1510 struct commit
*merged_common_ancestors
;
1511 struct tree
*mrtree
= mrtree
;
1515 output(o
, 4, "Merging:");
1516 output_commit_title(o
, h1
);
1517 output_commit_title(o
, h2
);
1521 ca
= get_merge_bases(h1
, h2
, 1);
1522 ca
= reverse_commit_list(ca
);
1526 output(o
, 5, "found %u common ancestor(s):", commit_list_count(ca
));
1527 for (iter
= ca
; iter
; iter
= iter
->next
)
1528 output_commit_title(o
, iter
->item
);
1531 merged_common_ancestors
= pop_commit(&ca
);
1532 if (merged_common_ancestors
== NULL
) {
1533 /* if there is no common ancestor, make an empty tree */
1534 struct tree
*tree
= xcalloc(1, sizeof(struct tree
));
1536 tree
->object
.parsed
= 1;
1537 tree
->object
.type
= OBJ_TREE
;
1538 pretend_sha1_file(NULL
, 0, OBJ_TREE
, tree
->object
.sha1
);
1539 merged_common_ancestors
= make_virtual_commit(tree
, "ancestor");
1542 for (iter
= ca
; iter
; iter
= iter
->next
) {
1543 const char *saved_b1
, *saved_b2
;
1546 * When the merge fails, the result contains files
1547 * with conflict markers. The cleanness flag is
1548 * ignored, it was never actually used, as result of
1549 * merge_trees has always overwritten it: the committed
1550 * "conflicts" were already resolved.
1553 saved_b1
= o
->branch1
;
1554 saved_b2
= o
->branch2
;
1555 o
->branch1
= "Temporary merge branch 1";
1556 o
->branch2
= "Temporary merge branch 2";
1557 merge_recursive(o
, merged_common_ancestors
, iter
->item
,
1558 NULL
, &merged_common_ancestors
);
1559 o
->branch1
= saved_b1
;
1560 o
->branch2
= saved_b2
;
1563 if (!merged_common_ancestors
)
1564 die("merge returned no commit");
1571 o
->ancestor
= "merged common ancestors";
1572 clean
= merge_trees(o
, h1
->tree
, h2
->tree
, merged_common_ancestors
->tree
,
1575 if (o
->call_depth
) {
1576 *result
= make_virtual_commit(mrtree
, "merged tree");
1577 commit_list_insert(h1
, &(*result
)->parents
);
1578 commit_list_insert(h2
, &(*result
)->parents
->next
);
1584 static struct commit
*get_ref(const unsigned char *sha1
, const char *name
)
1586 struct object
*object
;
1588 object
= deref_tag(parse_object(sha1
), name
, strlen(name
));
1591 if (object
->type
== OBJ_TREE
)
1592 return make_virtual_commit((struct tree
*)object
, name
);
1593 if (object
->type
!= OBJ_COMMIT
)
1595 if (parse_commit((struct commit
*)object
))
1597 return (struct commit
*)object
;
1600 int merge_recursive_generic(struct merge_options
*o
,
1601 const unsigned char *head
,
1602 const unsigned char *merge
,
1604 const unsigned char **base_list
,
1605 struct commit
**result
)
1607 int clean
, index_fd
;
1608 struct lock_file
*lock
= xcalloc(1, sizeof(struct lock_file
));
1609 struct commit
*head_commit
= get_ref(head
, o
->branch1
);
1610 struct commit
*next_commit
= get_ref(merge
, o
->branch2
);
1611 struct commit_list
*ca
= NULL
;
1615 for (i
= 0; i
< num_base_list
; ++i
) {
1616 struct commit
*base
;
1617 if (!(base
= get_ref(base_list
[i
], sha1_to_hex(base_list
[i
]))))
1618 return error("Could not parse object '%s'",
1619 sha1_to_hex(base_list
[i
]));
1620 commit_list_insert(base
, &ca
);
1624 index_fd
= hold_locked_index(lock
, 1);
1625 clean
= merge_recursive(o
, head_commit
, next_commit
, ca
,
1627 if (active_cache_changed
&&
1628 (write_cache(index_fd
, active_cache
, active_nr
) ||
1629 commit_locked_index(lock
)))
1630 return error("Unable to write index.");
1632 return clean
? 0 : 1;
1635 static int merge_recursive_config(const char *var
, const char *value
, void *cb
)
1637 struct merge_options
*o
= cb
;
1638 if (!strcasecmp(var
, "merge.verbosity")) {
1639 o
->verbosity
= git_config_int(var
, value
);
1642 if (!strcasecmp(var
, "diff.renamelimit")) {
1643 o
->diff_rename_limit
= git_config_int(var
, value
);
1646 if (!strcasecmp(var
, "merge.renamelimit")) {
1647 o
->merge_rename_limit
= git_config_int(var
, value
);
1650 return git_xmerge_config(var
, value
, cb
);
1653 void init_merge_options(struct merge_options
*o
)
1655 memset(o
, 0, sizeof(struct merge_options
));
1657 o
->buffer_output
= 1;
1658 o
->diff_rename_limit
= -1;
1659 o
->merge_rename_limit
= -1;
1661 git_config(merge_recursive_config
, o
);
1662 if (getenv("GIT_MERGE_VERBOSITY"))
1664 strtol(getenv("GIT_MERGE_VERBOSITY"), NULL
, 10);
1665 if (o
->verbosity
>= 5)
1666 o
->buffer_output
= 0;
1667 strbuf_init(&o
->obuf
, 0);
1668 memset(&o
->current_file_set
, 0, sizeof(struct string_list
));
1669 o
->current_file_set
.strdup_strings
= 1;
1670 memset(&o
->current_directory_set
, 0, sizeof(struct string_list
));
1671 o
->current_directory_set
.strdup_strings
= 1;