2 * Recursive Merge algorithm stolen from git-merge-recursive.py by
4 * The thieves were Alex Riesen and Johannes Schindelin, in June/July 2006
7 #include "cache-tree.h"
10 #include "tree-walk.h"
13 #include "run-command.h"
15 #include "unpack-trees.h"
16 #include "path-list.h"
17 #include "xdiff-interface.h"
18 #include "interpolate.h"
21 static int subtree_merge
;
23 static struct tree
*shift_tree_object(struct tree
*one
, struct tree
*two
)
25 unsigned char shifted
[20];
28 * NEEDSWORK: this limits the recursion depth to hardcoded
29 * value '2' to avoid excessive overhead.
31 shift_tree(one
->object
.sha1
, two
->object
.sha1
, shifted
, 2);
32 if (!hashcmp(two
->object
.sha1
, shifted
))
34 return lookup_tree(shifted
);
38 * A virtual commit has
39 * - (const char *)commit->util set to the name, and
40 * - *(int *)commit->object.sha1 set to the virtual id.
43 static unsigned commit_list_count(const struct commit_list
*l
)
46 for (; l
; l
= l
->next
)
51 static struct commit
*make_virtual_commit(struct tree
*tree
, const char *comment
)
53 struct commit
*commit
= xcalloc(1, sizeof(struct commit
));
54 static unsigned virtual_id
= 1;
56 commit
->util
= (void*)comment
;
57 *(int*)commit
->object
.sha1
= virtual_id
++;
59 commit
->object
.parsed
= 1;
64 * Since we use get_tree_entry(), which does not put the read object into
65 * the object pool, we cannot rely on a == b.
67 static int sha_eq(const unsigned char *a
, const unsigned char *b
)
71 return a
&& b
&& hashcmp(a
, b
) == 0;
75 * Since we want to write the index eventually, we cannot reuse the index
76 * for these (temporary) data.
83 unsigned char sha
[20];
88 static struct path_list current_file_set
= {NULL
, 0, 0, 1};
89 static struct path_list current_directory_set
= {NULL
, 0, 0, 1};
91 static int call_depth
= 0;
92 static int verbosity
= 2;
93 static int rename_limit
= -1;
94 static int buffer_output
= 1;
95 static struct strbuf obuf
= STRBUF_INIT
;
97 static int show(int v
)
99 return (!call_depth
&& verbosity
>= v
) || verbosity
>= 5;
102 static void flush_output(void)
105 fputs(obuf
.buf
, stdout
);
110 static void output(int v
, const char *fmt
, ...)
118 strbuf_grow(&obuf
, call_depth
* 2 + 2);
119 memset(obuf
.buf
+ obuf
.len
, ' ', call_depth
* 2);
120 strbuf_setlen(&obuf
, obuf
.len
+ call_depth
* 2);
123 len
= vsnprintf(obuf
.buf
+ obuf
.len
, strbuf_avail(&obuf
), fmt
, ap
);
128 if (len
>= strbuf_avail(&obuf
)) {
129 strbuf_grow(&obuf
, len
+ 2);
131 len
= vsnprintf(obuf
.buf
+ obuf
.len
, strbuf_avail(&obuf
), fmt
, ap
);
133 if (len
>= strbuf_avail(&obuf
)) {
134 die("this should not happen, your snprintf is broken");
137 strbuf_setlen(&obuf
, obuf
.len
+ len
);
138 strbuf_add(&obuf
, "\n", 1);
143 static void output_commit_title(struct commit
*commit
)
147 for (i
= call_depth
; i
--;)
150 printf("virtual %s\n", (char *)commit
->util
);
152 printf("%s ", find_unique_abbrev(commit
->object
.sha1
, DEFAULT_ABBREV
));
153 if (parse_commit(commit
) != 0)
154 printf("(bad commit)\n");
158 for (s
= commit
->buffer
; *s
; s
++)
159 if (*s
== '\n' && s
[1] == '\n') {
163 for (len
= 0; s
[len
] && '\n' != s
[len
]; len
++)
165 printf("%.*s\n", len
, s
);
170 static int add_cacheinfo(unsigned int mode
, const unsigned char *sha1
,
171 const char *path
, int stage
, int refresh
, int options
)
173 struct cache_entry
*ce
;
174 ce
= make_cache_entry(mode
, sha1
? sha1
: null_sha1
, path
, stage
, refresh
);
176 return error("addinfo_cache failed for path '%s'", path
);
177 return add_cache_entry(ce
, options
);
181 * This is a global variable which is used in a number of places but
182 * only written to in the 'merge' function.
184 * index_only == 1 => Don't leave any non-stage 0 entries in the cache and
185 * don't update the working directory.
186 * 0 => Leave unmerged entries in the cache and update
187 * the working directory.
189 static int index_only
= 0;
191 static void init_tree_desc_from_tree(struct tree_desc
*desc
, struct tree
*tree
)
194 init_tree_desc(desc
, tree
->buffer
, tree
->size
);
197 static int git_merge_trees(int index_only
,
203 struct tree_desc t
[3];
204 struct unpack_trees_options opts
;
206 memset(&opts
, 0, sizeof(opts
));
213 opts
.fn
= threeway_merge
;
215 init_tree_desc_from_tree(t
+0, common
);
216 init_tree_desc_from_tree(t
+1, head
);
217 init_tree_desc_from_tree(t
+2, merge
);
219 rc
= unpack_trees(3, t
, &opts
);
220 cache_tree_free(&active_cache_tree
);
224 static int unmerged_index(void)
227 for (i
= 0; i
< active_nr
; i
++) {
228 struct cache_entry
*ce
= active_cache
[i
];
235 static struct tree
*git_write_tree(void)
237 struct tree
*result
= NULL
;
239 if (unmerged_index()) {
241 output(0, "There are unmerged index entries:");
242 for (i
= 0; i
< active_nr
; i
++) {
243 struct cache_entry
*ce
= active_cache
[i
];
245 output(0, "%d %.*s", ce_stage(ce
), ce_namelen(ce
), ce
->name
);
250 if (!active_cache_tree
)
251 active_cache_tree
= cache_tree();
253 if (!cache_tree_fully_valid(active_cache_tree
) &&
254 cache_tree_update(active_cache_tree
,
255 active_cache
, active_nr
, 0, 0) < 0)
256 die("error building trees");
258 result
= lookup_tree(active_cache_tree
->sha1
);
263 static int save_files_dirs(const unsigned char *sha1
,
264 const char *base
, int baselen
, const char *path
,
265 unsigned int mode
, int stage
)
267 int len
= strlen(path
);
268 char *newpath
= xmalloc(baselen
+ len
+ 1);
269 memcpy(newpath
, base
, baselen
);
270 memcpy(newpath
+ baselen
, path
, len
);
271 newpath
[baselen
+ len
] = '\0';
274 path_list_insert(newpath
, ¤t_directory_set
);
276 path_list_insert(newpath
, ¤t_file_set
);
279 return READ_TREE_RECURSIVE
;
282 static int get_files_dirs(struct tree
*tree
)
285 if (read_tree_recursive(tree
, "", 0, 0, NULL
, save_files_dirs
) != 0)
287 n
= current_file_set
.nr
+ current_directory_set
.nr
;
292 * Returns a index_entry instance which doesn't have to correspond to
293 * a real cache entry in Git's index.
295 static struct stage_data
*insert_stage_data(const char *path
,
296 struct tree
*o
, struct tree
*a
, struct tree
*b
,
297 struct path_list
*entries
)
299 struct path_list_item
*item
;
300 struct stage_data
*e
= xcalloc(1, sizeof(struct stage_data
));
301 get_tree_entry(o
->object
.sha1
, path
,
302 e
->stages
[1].sha
, &e
->stages
[1].mode
);
303 get_tree_entry(a
->object
.sha1
, path
,
304 e
->stages
[2].sha
, &e
->stages
[2].mode
);
305 get_tree_entry(b
->object
.sha1
, path
,
306 e
->stages
[3].sha
, &e
->stages
[3].mode
);
307 item
= path_list_insert(path
, entries
);
313 * Create a dictionary mapping file names to stage_data objects. The
314 * dictionary contains one entry for every path with a non-zero stage entry.
316 static struct path_list
*get_unmerged(void)
318 struct path_list
*unmerged
= xcalloc(1, sizeof(struct path_list
));
321 unmerged
->strdup_paths
= 1;
323 for (i
= 0; i
< active_nr
; i
++) {
324 struct path_list_item
*item
;
325 struct stage_data
*e
;
326 struct cache_entry
*ce
= active_cache
[i
];
330 item
= path_list_lookup(ce
->name
, unmerged
);
332 item
= path_list_insert(ce
->name
, unmerged
);
333 item
->util
= xcalloc(1, sizeof(struct stage_data
));
336 e
->stages
[ce_stage(ce
)].mode
= ntohl(ce
->ce_mode
);
337 hashcpy(e
->stages
[ce_stage(ce
)].sha
, ce
->sha1
);
345 struct diff_filepair
*pair
;
346 struct stage_data
*src_entry
;
347 struct stage_data
*dst_entry
;
348 unsigned processed
:1;
352 * Get information of all renames which occurred between 'o_tree' and
353 * 'tree'. We need the three trees in the merge ('o_tree', 'a_tree' and
354 * 'b_tree') to be able to associate the correct cache entries with
355 * the rename information. 'tree' is always equal to either a_tree or b_tree.
357 static struct path_list
*get_renames(struct tree
*tree
,
361 struct path_list
*entries
)
364 struct path_list
*renames
;
365 struct diff_options opts
;
367 renames
= xcalloc(1, sizeof(struct path_list
));
370 opts
.detect_rename
= DIFF_DETECT_RENAME
;
371 opts
.rename_limit
= rename_limit
;
372 opts
.output_format
= DIFF_FORMAT_NO_OUTPUT
;
373 if (diff_setup_done(&opts
) < 0)
374 die("diff setup failed");
375 diff_tree_sha1(o_tree
->object
.sha1
, tree
->object
.sha1
, "", &opts
);
377 for (i
= 0; i
< diff_queued_diff
.nr
; ++i
) {
378 struct path_list_item
*item
;
380 struct diff_filepair
*pair
= diff_queued_diff
.queue
[i
];
381 if (pair
->status
!= 'R') {
382 diff_free_filepair(pair
);
385 re
= xmalloc(sizeof(*re
));
388 item
= path_list_lookup(re
->pair
->one
->path
, entries
);
390 re
->src_entry
= insert_stage_data(re
->pair
->one
->path
,
391 o_tree
, a_tree
, b_tree
, entries
);
393 re
->src_entry
= item
->util
;
395 item
= path_list_lookup(re
->pair
->two
->path
, entries
);
397 re
->dst_entry
= insert_stage_data(re
->pair
->two
->path
,
398 o_tree
, a_tree
, b_tree
, entries
);
400 re
->dst_entry
= item
->util
;
401 item
= path_list_insert(pair
->one
->path
, renames
);
404 opts
.output_format
= DIFF_FORMAT_NO_OUTPUT
;
405 diff_queued_diff
.nr
= 0;
410 static int update_stages(const char *path
, struct diff_filespec
*o
,
411 struct diff_filespec
*a
, struct diff_filespec
*b
,
414 int options
= ADD_CACHE_OK_TO_ADD
| ADD_CACHE_OK_TO_REPLACE
;
416 if (remove_file_from_cache(path
))
419 if (add_cacheinfo(o
->mode
, o
->sha1
, path
, 1, 0, options
))
422 if (add_cacheinfo(a
->mode
, a
->sha1
, path
, 2, 0, options
))
425 if (add_cacheinfo(b
->mode
, b
->sha1
, path
, 3, 0, options
))
430 static int remove_path(const char *name
)
438 dirs
= xstrdup(name
);
439 while ((slash
= strrchr(name
, '/'))) {
441 if (rmdir(name
) != 0)
448 static int remove_file(int clean
, const char *path
, int no_wd
)
450 int update_cache
= index_only
|| clean
;
451 int update_working_directory
= !index_only
&& !no_wd
;
454 if (remove_file_from_cache(path
))
457 if (update_working_directory
) {
459 if (errno
!= ENOENT
|| errno
!= EISDIR
)
466 static char *unique_path(const char *path
, const char *branch
)
468 char *newpath
= xmalloc(strlen(path
) + 1 + strlen(branch
) + 8 + 1);
471 char *p
= newpath
+ strlen(path
);
472 strcpy(newpath
, path
);
478 while (path_list_has_path(¤t_file_set
, newpath
) ||
479 path_list_has_path(¤t_directory_set
, newpath
) ||
480 lstat(newpath
, &st
) == 0)
481 sprintf(p
, "_%d", suffix
++);
483 path_list_insert(newpath
, ¤t_file_set
);
487 static int mkdir_p(const char *path
, unsigned long mode
)
489 /* path points to cache entries, so xstrdup before messing with it */
490 char *buf
= xstrdup(path
);
491 int result
= safe_create_leading_directories(buf
);
496 static void flush_buffer(int fd
, const char *buf
, unsigned long size
)
499 long ret
= write_in_full(fd
, buf
, size
);
504 die("merge-recursive: %s", strerror(errno
));
506 die("merge-recursive: disk full?");
513 static int make_room_for_path(const char *path
)
516 const char *msg
= "failed to create path '%s'%s";
518 status
= mkdir_p(path
, 0777);
521 /* something else exists */
522 error(msg
, path
, ": perhaps a D/F conflict?");
528 /* Successful unlink is good.. */
531 /* .. and so is no existing file */
534 /* .. but not some other error (who really cares what?) */
535 return error(msg
, path
, ": perhaps a D/F conflict?");
538 static void update_file_flags(const unsigned char *sha
,
548 enum object_type type
;
552 buf
= read_sha1_file(sha
, &type
, &size
);
554 die("cannot read object %s '%s'", sha1_to_hex(sha
), path
);
555 if (type
!= OBJ_BLOB
)
556 die("blob expected for %s '%s'", sha1_to_hex(sha
), path
);
558 if (make_room_for_path(path
) < 0) {
562 if (S_ISREG(mode
) || (!has_symlinks
&& S_ISLNK(mode
))) {
568 fd
= open(path
, O_WRONLY
| O_TRUNC
| O_CREAT
, mode
);
570 die("failed to open %s: %s", path
, strerror(errno
));
571 flush_buffer(fd
, buf
, size
);
573 } else if (S_ISLNK(mode
)) {
574 char *lnk
= xmemdupz(buf
, size
);
580 die("do not know what to do with %06o %s '%s'",
581 mode
, sha1_to_hex(sha
), path
);
585 add_cacheinfo(mode
, sha
, path
, 0, update_wd
, ADD_CACHE_OK_TO_ADD
);
588 static void update_file(int clean
,
589 const unsigned char *sha
,
593 update_file_flags(sha
, mode
, path
, index_only
|| clean
, !index_only
);
596 /* Low level file merging, update and removal */
598 struct merge_file_info
600 unsigned char sha
[20];
606 static void fill_mm(const unsigned char *sha1
, mmfile_t
*mm
)
609 enum object_type type
;
611 if (!hashcmp(sha1
, null_sha1
)) {
612 mm
->ptr
= xstrdup("");
617 mm
->ptr
= read_sha1_file(sha1
, &type
, &size
);
618 if (!mm
->ptr
|| type
!= OBJ_BLOB
)
619 die("unable to read blob object %s", sha1_to_hex(sha1
));
624 * Customizable low-level merge drivers support.
627 struct ll_merge_driver
;
628 typedef int (*ll_merge_fn
)(const struct ll_merge_driver
*,
631 mmfile_t
*src1
, const char *name1
,
632 mmfile_t
*src2
, const char *name2
,
635 struct ll_merge_driver
{
637 const char *description
;
639 const char *recursive
;
640 struct ll_merge_driver
*next
;
645 * Built-in low-levels
647 static int ll_binary_merge(const struct ll_merge_driver
*drv_unused
,
648 const char *path_unused
,
650 mmfile_t
*src1
, const char *name1
,
651 mmfile_t
*src2
, const char *name2
,
655 * The tentative merge result is "ours" for the final round,
656 * or common ancestor for an internal merge. Still return
657 * "conflicted merge" status.
659 mmfile_t
*stolen
= index_only
? orig
: src1
;
661 result
->ptr
= stolen
->ptr
;
662 result
->size
= stolen
->size
;
667 static int ll_xdl_merge(const struct ll_merge_driver
*drv_unused
,
668 const char *path_unused
,
670 mmfile_t
*src1
, const char *name1
,
671 mmfile_t
*src2
, const char *name2
,
676 if (buffer_is_binary(orig
->ptr
, orig
->size
) ||
677 buffer_is_binary(src1
->ptr
, src1
->size
) ||
678 buffer_is_binary(src2
->ptr
, src2
->size
)) {
679 warning("Cannot merge binary files: %s vs. %s\n",
681 return ll_binary_merge(drv_unused
, path_unused
,
687 memset(&xpp
, 0, sizeof(xpp
));
688 return xdl_merge(orig
,
691 &xpp
, XDL_MERGE_ZEALOUS
,
695 static int ll_union_merge(const struct ll_merge_driver
*drv_unused
,
696 const char *path_unused
,
698 mmfile_t
*src1
, const char *name1
,
699 mmfile_t
*src2
, const char *name2
,
704 const int marker_size
= 7;
706 int status
= ll_xdl_merge(drv_unused
, path_unused
,
707 orig
, src1
, NULL
, src2
, NULL
, result
);
711 src
= dst
= result
->ptr
;
714 if ((marker_size
< size
) &&
715 (*src
== '<' || *src
== '=' || *src
== '>')) {
718 for (i
= 0; i
< marker_size
; i
++)
721 if (src
[marker_size
] != '\n')
723 src
+= marker_size
+ 1;
724 size
-= marker_size
+ 1;
732 } while (ch
!= '\n' && size
);
734 result
->size
= dst
- result
->ptr
;
738 #define LL_BINARY_MERGE 0
739 #define LL_TEXT_MERGE 1
740 #define LL_UNION_MERGE 2
741 static struct ll_merge_driver ll_merge_drv
[] = {
742 { "binary", "built-in binary merge", ll_binary_merge
},
743 { "text", "built-in 3-way text merge", ll_xdl_merge
},
744 { "union", "built-in union merge", ll_union_merge
},
747 static void create_temp(mmfile_t
*src
, char *path
)
751 strcpy(path
, ".merge_file_XXXXXX");
753 if (write_in_full(fd
, src
->ptr
, src
->size
) != src
->size
)
754 die("unable to write temp-file");
759 * User defined low-level merge driver support.
761 static int ll_ext_merge(const struct ll_merge_driver
*fn
,
764 mmfile_t
*src1
, const char *name1
,
765 mmfile_t
*src2
, const char *name2
,
770 struct interp table
[] = {
775 struct child_process child
;
776 const char *args
[20];
780 if (fn
->cmdline
== NULL
)
781 die("custom merge driver %s lacks command line.", fn
->name
);
785 create_temp(orig
, temp
[0]);
786 create_temp(src1
, temp
[1]);
787 create_temp(src2
, temp
[2]);
789 interp_set_entry(table
, 0, temp
[0]);
790 interp_set_entry(table
, 1, temp
[1]);
791 interp_set_entry(table
, 2, temp
[2]);
793 output(1, "merging %s using %s", path
,
794 fn
->description
? fn
->description
: fn
->name
);
796 interpolate(cmdbuf
, sizeof(cmdbuf
), fn
->cmdline
, table
, 3);
798 memset(&child
, 0, sizeof(child
));
805 status
= run_command(&child
);
806 if (status
< -ERR_RUN_COMMAND_FORK
)
807 ; /* failure in run-command */
810 fd
= open(temp
[1], O_RDONLY
);
815 result
->size
= st
.st_size
;
816 result
->ptr
= xmalloc(result
->size
+ 1);
817 if (read_in_full(fd
, result
->ptr
, result
->size
) != result
->size
) {
825 for (i
= 0; i
< 3; i
++)
831 * merge.default and merge.driver configuration items
833 static struct ll_merge_driver
*ll_user_merge
, **ll_user_merge_tail
;
834 static const char *default_ll_merge
;
836 static int read_merge_config(const char *var
, const char *value
)
838 struct ll_merge_driver
*fn
;
839 const char *ep
, *name
;
842 if (!strcmp(var
, "merge.default")) {
844 default_ll_merge
= strdup(value
);
849 * We are not interested in anything but "merge.<name>.variable";
850 * especially, we do not want to look at variables such as
851 * "merge.summary", "merge.tool", and "merge.verbosity".
853 if (prefixcmp(var
, "merge.") || (ep
= strrchr(var
, '.')) == var
+ 5)
857 * Find existing one as we might be processing merge.<name>.var2
858 * after seeing merge.<name>.var1.
862 for (fn
= ll_user_merge
; fn
; fn
= fn
->next
)
863 if (!strncmp(fn
->name
, name
, namelen
) && !fn
->name
[namelen
])
866 fn
= xcalloc(1, sizeof(struct ll_merge_driver
));
867 fn
->name
= xmemdupz(name
, namelen
);
868 fn
->fn
= ll_ext_merge
;
869 *ll_user_merge_tail
= fn
;
870 ll_user_merge_tail
= &(fn
->next
);
875 if (!strcmp("name", ep
)) {
877 return error("%s: lacks value", var
);
878 fn
->description
= strdup(value
);
882 if (!strcmp("driver", ep
)) {
884 return error("%s: lacks value", var
);
886 * merge.<name>.driver specifies the command line:
890 * The command-line will be interpolated with the following
891 * tokens and is given to the shell:
893 * %O - temporary file name for the merge base.
894 * %A - temporary file name for our version.
895 * %B - temporary file name for the other branches' version.
897 * The external merge driver should write the results in the
898 * file named by %A, and signal that it has done with zero exit
901 fn
->cmdline
= strdup(value
);
905 if (!strcmp("recursive", ep
)) {
907 return error("%s: lacks value", var
);
908 fn
->recursive
= strdup(value
);
915 static void initialize_ll_merge(void)
917 if (ll_user_merge_tail
)
919 ll_user_merge_tail
= &ll_user_merge
;
920 git_config(read_merge_config
);
923 static const struct ll_merge_driver
*find_ll_merge_driver(const char *merge_attr
)
925 struct ll_merge_driver
*fn
;
929 initialize_ll_merge();
931 if (ATTR_TRUE(merge_attr
))
932 return &ll_merge_drv
[LL_TEXT_MERGE
];
933 else if (ATTR_FALSE(merge_attr
))
934 return &ll_merge_drv
[LL_BINARY_MERGE
];
935 else if (ATTR_UNSET(merge_attr
)) {
936 if (!default_ll_merge
)
937 return &ll_merge_drv
[LL_TEXT_MERGE
];
939 name
= default_ll_merge
;
944 for (fn
= ll_user_merge
; fn
; fn
= fn
->next
)
945 if (!strcmp(fn
->name
, name
))
948 for (i
= 0; i
< ARRAY_SIZE(ll_merge_drv
); i
++)
949 if (!strcmp(ll_merge_drv
[i
].name
, name
))
950 return &ll_merge_drv
[i
];
952 /* default to the 3-way */
953 return &ll_merge_drv
[LL_TEXT_MERGE
];
956 static const char *git_path_check_merge(const char *path
)
958 static struct git_attr_check attr_merge_check
;
960 if (!attr_merge_check
.attr
)
961 attr_merge_check
.attr
= git_attr("merge", 5);
963 if (git_checkattr(path
, 1, &attr_merge_check
))
965 return attr_merge_check
.value
;
968 static int ll_merge(mmbuffer_t
*result_buf
,
969 struct diff_filespec
*o
,
970 struct diff_filespec
*a
,
971 struct diff_filespec
*b
,
975 mmfile_t orig
, src1
, src2
;
978 const char *ll_driver_name
;
979 const struct ll_merge_driver
*driver
;
981 name1
= xstrdup(mkpath("%s:%s", branch1
, a
->path
));
982 name2
= xstrdup(mkpath("%s:%s", branch2
, b
->path
));
984 fill_mm(o
->sha1
, &orig
);
985 fill_mm(a
->sha1
, &src1
);
986 fill_mm(b
->sha1
, &src2
);
988 ll_driver_name
= git_path_check_merge(a
->path
);
989 driver
= find_ll_merge_driver(ll_driver_name
);
991 if (index_only
&& driver
->recursive
)
992 driver
= find_ll_merge_driver(driver
->recursive
);
993 merge_status
= driver
->fn(driver
, a
->path
,
994 &orig
, &src1
, name1
, &src2
, name2
,
1002 return merge_status
;
1005 static struct merge_file_info
merge_file(struct diff_filespec
*o
,
1006 struct diff_filespec
*a
, struct diff_filespec
*b
,
1007 const char *branch1
, const char *branch2
)
1009 struct merge_file_info result
;
1013 if ((S_IFMT
& a
->mode
) != (S_IFMT
& b
->mode
)) {
1015 if (S_ISREG(a
->mode
)) {
1016 result
.mode
= a
->mode
;
1017 hashcpy(result
.sha
, a
->sha1
);
1019 result
.mode
= b
->mode
;
1020 hashcpy(result
.sha
, b
->sha1
);
1023 if (!sha_eq(a
->sha1
, o
->sha1
) && !sha_eq(b
->sha1
, o
->sha1
))
1026 result
.mode
= a
->mode
== o
->mode
? b
->mode
: a
->mode
;
1028 if (sha_eq(a
->sha1
, o
->sha1
))
1029 hashcpy(result
.sha
, b
->sha1
);
1030 else if (sha_eq(b
->sha1
, o
->sha1
))
1031 hashcpy(result
.sha
, a
->sha1
);
1032 else if (S_ISREG(a
->mode
)) {
1033 mmbuffer_t result_buf
;
1036 merge_status
= ll_merge(&result_buf
, o
, a
, b
,
1039 if ((merge_status
< 0) || !result_buf
.ptr
)
1040 die("Failed to execute internal merge");
1042 if (write_sha1_file(result_buf
.ptr
, result_buf
.size
,
1043 blob_type
, result
.sha
))
1044 die("Unable to add %s to database",
1047 free(result_buf
.ptr
);
1048 result
.clean
= (merge_status
== 0);
1050 if (!(S_ISLNK(a
->mode
) || S_ISLNK(b
->mode
)))
1051 die("cannot merge modes?");
1053 hashcpy(result
.sha
, a
->sha1
);
1055 if (!sha_eq(a
->sha1
, b
->sha1
))
1063 static void conflict_rename_rename(struct rename
*ren1
,
1064 const char *branch1
,
1065 struct rename
*ren2
,
1066 const char *branch2
)
1070 const char *ren1_dst
= ren1
->pair
->two
->path
;
1071 const char *ren2_dst
= ren2
->pair
->two
->path
;
1072 const char *dst_name1
= ren1_dst
;
1073 const char *dst_name2
= ren2_dst
;
1074 if (path_list_has_path(¤t_directory_set
, ren1_dst
)) {
1075 dst_name1
= del
[delp
++] = unique_path(ren1_dst
, branch1
);
1076 output(1, "%s is a directory in %s added as %s instead",
1077 ren1_dst
, branch2
, dst_name1
);
1078 remove_file(0, ren1_dst
, 0);
1080 if (path_list_has_path(¤t_directory_set
, ren2_dst
)) {
1081 dst_name2
= del
[delp
++] = unique_path(ren2_dst
, branch2
);
1082 output(1, "%s is a directory in %s added as %s instead",
1083 ren2_dst
, branch1
, dst_name2
);
1084 remove_file(0, ren2_dst
, 0);
1087 remove_file_from_cache(dst_name1
);
1088 remove_file_from_cache(dst_name2
);
1090 * Uncomment to leave the conflicting names in the resulting tree
1092 * update_file(0, ren1->pair->two->sha1, ren1->pair->two->mode, dst_name1);
1093 * update_file(0, ren2->pair->two->sha1, ren2->pair->two->mode, dst_name2);
1096 update_stages(dst_name1
, NULL
, ren1
->pair
->two
, NULL
, 1);
1097 update_stages(dst_name2
, NULL
, NULL
, ren2
->pair
->two
, 1);
1103 static void conflict_rename_dir(struct rename
*ren1
,
1104 const char *branch1
)
1106 char *new_path
= unique_path(ren1
->pair
->two
->path
, branch1
);
1107 output(1, "Renamed %s to %s instead", ren1
->pair
->one
->path
, new_path
);
1108 remove_file(0, ren1
->pair
->two
->path
, 0);
1109 update_file(0, ren1
->pair
->two
->sha1
, ren1
->pair
->two
->mode
, new_path
);
1113 static void conflict_rename_rename_2(struct rename
*ren1
,
1114 const char *branch1
,
1115 struct rename
*ren2
,
1116 const char *branch2
)
1118 char *new_path1
= unique_path(ren1
->pair
->two
->path
, branch1
);
1119 char *new_path2
= unique_path(ren2
->pair
->two
->path
, branch2
);
1120 output(1, "Renamed %s to %s and %s to %s instead",
1121 ren1
->pair
->one
->path
, new_path1
,
1122 ren2
->pair
->one
->path
, new_path2
);
1123 remove_file(0, ren1
->pair
->two
->path
, 0);
1124 update_file(0, ren1
->pair
->two
->sha1
, ren1
->pair
->two
->mode
, new_path1
);
1125 update_file(0, ren2
->pair
->two
->sha1
, ren2
->pair
->two
->mode
, new_path2
);
1130 static int process_renames(struct path_list
*a_renames
,
1131 struct path_list
*b_renames
,
1132 const char *a_branch
,
1133 const char *b_branch
)
1135 int clean_merge
= 1, i
, j
;
1136 struct path_list a_by_dst
= {NULL
, 0, 0, 0}, b_by_dst
= {NULL
, 0, 0, 0};
1137 const struct rename
*sre
;
1139 for (i
= 0; i
< a_renames
->nr
; i
++) {
1140 sre
= a_renames
->items
[i
].util
;
1141 path_list_insert(sre
->pair
->two
->path
, &a_by_dst
)->util
1144 for (i
= 0; i
< b_renames
->nr
; i
++) {
1145 sre
= b_renames
->items
[i
].util
;
1146 path_list_insert(sre
->pair
->two
->path
, &b_by_dst
)->util
1150 for (i
= 0, j
= 0; i
< a_renames
->nr
|| j
< b_renames
->nr
;) {
1153 struct path_list
*renames1
, *renames2
, *renames2Dst
;
1154 struct rename
*ren1
= NULL
, *ren2
= NULL
;
1155 const char *branch1
, *branch2
;
1156 const char *ren1_src
, *ren1_dst
;
1158 if (i
>= a_renames
->nr
) {
1160 ren2
= b_renames
->items
[j
++].util
;
1161 } else if (j
>= b_renames
->nr
) {
1163 ren1
= a_renames
->items
[i
++].util
;
1165 compare
= strcmp(a_renames
->items
[i
].path
,
1166 b_renames
->items
[j
].path
);
1168 ren1
= a_renames
->items
[i
++].util
;
1170 ren2
= b_renames
->items
[j
++].util
;
1173 /* TODO: refactor, so that 1/2 are not needed */
1175 renames1
= a_renames
;
1176 renames2
= b_renames
;
1177 renames2Dst
= &b_by_dst
;
1182 renames1
= b_renames
;
1183 renames2
= a_renames
;
1184 renames2Dst
= &a_by_dst
;
1191 src
= ren1
->pair
->one
->path
;
1193 ren1
->dst_entry
->processed
= 1;
1194 ren1
->src_entry
->processed
= 1;
1196 if (ren1
->processed
)
1198 ren1
->processed
= 1;
1200 ren1_src
= ren1
->pair
->one
->path
;
1201 ren1_dst
= ren1
->pair
->two
->path
;
1204 const char *ren2_src
= ren2
->pair
->one
->path
;
1205 const char *ren2_dst
= ren2
->pair
->two
->path
;
1206 /* Renamed in 1 and renamed in 2 */
1207 if (strcmp(ren1_src
, ren2_src
) != 0)
1208 die("ren1.src != ren2.src");
1209 ren2
->dst_entry
->processed
= 1;
1210 ren2
->processed
= 1;
1211 if (strcmp(ren1_dst
, ren2_dst
) != 0) {
1213 output(1, "CONFLICT (rename/rename): "
1214 "Rename \"%s\"->\"%s\" in branch \"%s\" "
1215 "rename \"%s\"->\"%s\" in \"%s\"%s",
1216 src
, ren1_dst
, branch1
,
1217 src
, ren2_dst
, branch2
,
1218 index_only
? " (left unresolved)": "");
1220 remove_file_from_cache(src
);
1221 update_file(0, ren1
->pair
->one
->sha1
,
1222 ren1
->pair
->one
->mode
, src
);
1224 conflict_rename_rename(ren1
, branch1
, ren2
, branch2
);
1226 struct merge_file_info mfi
;
1227 remove_file(1, ren1_src
, 1);
1228 mfi
= merge_file(ren1
->pair
->one
,
1233 if (mfi
.merge
|| !mfi
.clean
)
1234 output(1, "Renamed %s->%s", src
, ren1_dst
);
1237 output(2, "Auto-merged %s", ren1_dst
);
1240 output(1, "CONFLICT (content): merge conflict in %s",
1245 update_stages(ren1_dst
,
1251 update_file(mfi
.clean
, mfi
.sha
, mfi
.mode
, ren1_dst
);
1254 /* Renamed in 1, maybe changed in 2 */
1255 struct path_list_item
*item
;
1256 /* we only use sha1 and mode of these */
1257 struct diff_filespec src_other
, dst_other
;
1258 int try_merge
, stage
= a_renames
== renames1
? 3: 2;
1260 remove_file(1, ren1_src
, index_only
|| stage
== 3);
1262 hashcpy(src_other
.sha1
, ren1
->src_entry
->stages
[stage
].sha
);
1263 src_other
.mode
= ren1
->src_entry
->stages
[stage
].mode
;
1264 hashcpy(dst_other
.sha1
, ren1
->dst_entry
->stages
[stage
].sha
);
1265 dst_other
.mode
= ren1
->dst_entry
->stages
[stage
].mode
;
1269 if (path_list_has_path(¤t_directory_set
, ren1_dst
)) {
1271 output(1, "CONFLICT (rename/directory): Renamed %s->%s in %s "
1272 " directory %s added in %s",
1273 ren1_src
, ren1_dst
, branch1
,
1275 conflict_rename_dir(ren1
, branch1
);
1276 } else if (sha_eq(src_other
.sha1
, null_sha1
)) {
1278 output(1, "CONFLICT (rename/delete): Renamed %s->%s in %s "
1279 "and deleted in %s",
1280 ren1_src
, ren1_dst
, branch1
,
1282 update_file(0, ren1
->pair
->two
->sha1
, ren1
->pair
->two
->mode
, ren1_dst
);
1283 } else if (!sha_eq(dst_other
.sha1
, null_sha1
)) {
1284 const char *new_path
;
1287 output(1, "CONFLICT (rename/add): Renamed %s->%s in %s. "
1289 ren1_src
, ren1_dst
, branch1
,
1291 new_path
= unique_path(ren1_dst
, branch2
);
1292 output(1, "Added as %s instead", new_path
);
1293 update_file(0, dst_other
.sha1
, dst_other
.mode
, new_path
);
1294 } else if ((item
= path_list_lookup(ren1_dst
, renames2Dst
))) {
1297 ren2
->processed
= 1;
1298 output(1, "CONFLICT (rename/rename): Renamed %s->%s in %s. "
1299 "Renamed %s->%s in %s",
1300 ren1_src
, ren1_dst
, branch1
,
1301 ren2
->pair
->one
->path
, ren2
->pair
->two
->path
, branch2
);
1302 conflict_rename_rename_2(ren1
, branch1
, ren2
, branch2
);
1307 struct diff_filespec
*o
, *a
, *b
;
1308 struct merge_file_info mfi
;
1309 src_other
.path
= (char *)ren1_src
;
1311 o
= ren1
->pair
->one
;
1312 if (a_renames
== renames1
) {
1313 a
= ren1
->pair
->two
;
1316 b
= ren1
->pair
->two
;
1319 mfi
= merge_file(o
, a
, b
,
1320 a_branch
, b_branch
);
1323 sha_eq(mfi
.sha
, ren1
->pair
->two
->sha1
) &&
1324 mfi
.mode
== ren1
->pair
->two
->mode
)
1326 * This messaged is part of
1327 * t6022 test. If you change
1328 * it update the test too.
1330 output(3, "Skipped %s (merged same as existing)", ren1_dst
);
1332 if (mfi
.merge
|| !mfi
.clean
)
1333 output(1, "Renamed %s => %s", ren1_src
, ren1_dst
);
1335 output(2, "Auto-merged %s", ren1_dst
);
1337 output(1, "CONFLICT (rename/modify): Merge conflict in %s",
1342 update_stages(ren1_dst
,
1345 update_file(mfi
.clean
, mfi
.sha
, mfi
.mode
, ren1_dst
);
1350 path_list_clear(&a_by_dst
, 0);
1351 path_list_clear(&b_by_dst
, 0);
1356 static unsigned char *stage_sha(const unsigned char *sha
, unsigned mode
)
1358 return (is_null_sha1(sha
) || mode
== 0) ? NULL
: (unsigned char *)sha
;
1361 /* Per entry merge function */
1362 static int process_entry(const char *path
, struct stage_data
*entry
,
1363 const char *branch1
,
1364 const char *branch2
)
1367 printf("processing entry, clean cache: %s\n", index_only ? "yes": "no");
1368 print_index_entry("\tpath: ", entry);
1370 int clean_merge
= 1;
1371 unsigned o_mode
= entry
->stages
[1].mode
;
1372 unsigned a_mode
= entry
->stages
[2].mode
;
1373 unsigned b_mode
= entry
->stages
[3].mode
;
1374 unsigned char *o_sha
= stage_sha(entry
->stages
[1].sha
, o_mode
);
1375 unsigned char *a_sha
= stage_sha(entry
->stages
[2].sha
, a_mode
);
1376 unsigned char *b_sha
= stage_sha(entry
->stages
[3].sha
, b_mode
);
1378 if (o_sha
&& (!a_sha
|| !b_sha
)) {
1379 /* Case A: Deleted in one */
1380 if ((!a_sha
&& !b_sha
) ||
1381 (sha_eq(a_sha
, o_sha
) && !b_sha
) ||
1382 (!a_sha
&& sha_eq(b_sha
, o_sha
))) {
1383 /* Deleted in both or deleted in one and
1384 * unchanged in the other */
1386 output(2, "Removed %s", path
);
1387 /* do not touch working file if it did not exist */
1388 remove_file(1, path
, !a_sha
);
1390 /* Deleted in one and changed in the other */
1393 output(1, "CONFLICT (delete/modify): %s deleted in %s "
1394 "and modified in %s. Version %s of %s left in tree.",
1396 branch2
, branch2
, path
);
1397 update_file(0, b_sha
, b_mode
, path
);
1399 output(1, "CONFLICT (delete/modify): %s deleted in %s "
1400 "and modified in %s. Version %s of %s left in tree.",
1402 branch1
, branch1
, path
);
1403 update_file(0, a_sha
, a_mode
, path
);
1407 } else if ((!o_sha
&& a_sha
&& !b_sha
) ||
1408 (!o_sha
&& !a_sha
&& b_sha
)) {
1409 /* Case B: Added in one. */
1410 const char *add_branch
;
1411 const char *other_branch
;
1413 const unsigned char *sha
;
1417 add_branch
= branch1
;
1418 other_branch
= branch2
;
1421 conf
= "file/directory";
1423 add_branch
= branch2
;
1424 other_branch
= branch1
;
1427 conf
= "directory/file";
1429 if (path_list_has_path(¤t_directory_set
, path
)) {
1430 const char *new_path
= unique_path(path
, add_branch
);
1432 output(1, "CONFLICT (%s): There is a directory with name %s in %s. "
1434 conf
, path
, other_branch
, path
, new_path
);
1435 remove_file(0, path
, 0);
1436 update_file(0, sha
, mode
, new_path
);
1438 output(2, "Added %s", path
);
1439 update_file(1, sha
, mode
, path
);
1441 } else if (a_sha
&& b_sha
) {
1442 /* Case C: Added in both (check for same permissions) and */
1443 /* case D: Modified in both, but differently. */
1444 const char *reason
= "content";
1445 struct merge_file_info mfi
;
1446 struct diff_filespec o
, a
, b
;
1450 o_sha
= (unsigned char *)null_sha1
;
1452 output(2, "Auto-merged %s", path
);
1453 o
.path
= a
.path
= b
.path
= (char *)path
;
1454 hashcpy(o
.sha1
, o_sha
);
1456 hashcpy(a
.sha1
, a_sha
);
1458 hashcpy(b
.sha1
, b_sha
);
1461 mfi
= merge_file(&o
, &a
, &b
,
1465 update_file(1, mfi
.sha
, mfi
.mode
, path
);
1468 output(1, "CONFLICT (%s): Merge conflict in %s",
1472 update_file(0, mfi
.sha
, mfi
.mode
, path
);
1474 update_file_flags(mfi
.sha
, mfi
.mode
, path
,
1475 0 /* update_cache */, 1 /* update_working_directory */);
1477 } else if (!o_sha
&& !a_sha
&& !b_sha
) {
1479 * this entry was deleted altogether. a_mode == 0 means
1480 * we had that path and want to actively remove it.
1482 remove_file(1, path
, !a_mode
);
1484 die("Fatal merge failure, shouldn't happen.");
1489 static int merge_trees(struct tree
*head
,
1491 struct tree
*common
,
1492 const char *branch1
,
1493 const char *branch2
,
1494 struct tree
**result
)
1498 if (subtree_merge
) {
1499 merge
= shift_tree_object(head
, merge
);
1500 common
= shift_tree_object(head
, common
);
1503 if (sha_eq(common
->object
.sha1
, merge
->object
.sha1
)) {
1504 output(0, "Already uptodate!");
1509 code
= git_merge_trees(index_only
, common
, head
, merge
);
1512 die("merging of trees %s and %s failed",
1513 sha1_to_hex(head
->object
.sha1
),
1514 sha1_to_hex(merge
->object
.sha1
));
1516 if (unmerged_index()) {
1517 struct path_list
*entries
, *re_head
, *re_merge
;
1519 path_list_clear(¤t_file_set
, 1);
1520 path_list_clear(¤t_directory_set
, 1);
1521 get_files_dirs(head
);
1522 get_files_dirs(merge
);
1524 entries
= get_unmerged();
1525 re_head
= get_renames(head
, common
, head
, merge
, entries
);
1526 re_merge
= get_renames(merge
, common
, head
, merge
, entries
);
1527 clean
= process_renames(re_head
, re_merge
,
1529 for (i
= 0; i
< entries
->nr
; i
++) {
1530 const char *path
= entries
->items
[i
].path
;
1531 struct stage_data
*e
= entries
->items
[i
].util
;
1533 && !process_entry(path
, e
, branch1
, branch2
))
1537 path_list_clear(re_merge
, 0);
1538 path_list_clear(re_head
, 0);
1539 path_list_clear(entries
, 1);
1546 *result
= git_write_tree();
1551 static struct commit_list
*reverse_commit_list(struct commit_list
*list
)
1553 struct commit_list
*next
= NULL
, *current
, *backup
;
1554 for (current
= list
; current
; current
= backup
) {
1555 backup
= current
->next
;
1556 current
->next
= next
;
1563 * Merge the commits h1 and h2, return the resulting virtual
1564 * commit object and a flag indicating the cleanness of the merge.
1566 static int merge(struct commit
*h1
,
1568 const char *branch1
,
1569 const char *branch2
,
1570 struct commit_list
*ca
,
1571 struct commit
**result
)
1573 struct commit_list
*iter
;
1574 struct commit
*merged_common_ancestors
;
1575 struct tree
*mrtree
= mrtree
;
1579 output(4, "Merging:");
1580 output_commit_title(h1
);
1581 output_commit_title(h2
);
1585 ca
= get_merge_bases(h1
, h2
, 1);
1586 ca
= reverse_commit_list(ca
);
1590 output(5, "found %u common ancestor(s):", commit_list_count(ca
));
1591 for (iter
= ca
; iter
; iter
= iter
->next
)
1592 output_commit_title(iter
->item
);
1595 merged_common_ancestors
= pop_commit(&ca
);
1596 if (merged_common_ancestors
== NULL
) {
1597 /* if there is no common ancestor, make an empty tree */
1598 struct tree
*tree
= xcalloc(1, sizeof(struct tree
));
1600 tree
->object
.parsed
= 1;
1601 tree
->object
.type
= OBJ_TREE
;
1602 pretend_sha1_file(NULL
, 0, OBJ_TREE
, tree
->object
.sha1
);
1603 merged_common_ancestors
= make_virtual_commit(tree
, "ancestor");
1606 for (iter
= ca
; iter
; iter
= iter
->next
) {
1609 * When the merge fails, the result contains files
1610 * with conflict markers. The cleanness flag is
1611 * ignored, it was never actually used, as result of
1612 * merge_trees has always overwritten it: the committed
1613 * "conflicts" were already resolved.
1616 merge(merged_common_ancestors
, iter
->item
,
1617 "Temporary merge branch 1",
1618 "Temporary merge branch 2",
1620 &merged_common_ancestors
);
1623 if (!merged_common_ancestors
)
1624 die("merge returned no commit");
1634 clean
= merge_trees(h1
->tree
, h2
->tree
, merged_common_ancestors
->tree
,
1635 branch1
, branch2
, &mrtree
);
1638 *result
= make_virtual_commit(mrtree
, "merged tree");
1639 commit_list_insert(h1
, &(*result
)->parents
);
1640 commit_list_insert(h2
, &(*result
)->parents
->next
);
1646 static const char *better_branch_name(const char *branch
)
1648 static char githead_env
[8 + 40 + 1];
1651 if (strlen(branch
) != 40)
1653 sprintf(githead_env
, "GITHEAD_%s", branch
);
1654 name
= getenv(githead_env
);
1655 return name
? name
: branch
;
1658 static struct commit
*get_ref(const char *ref
)
1660 unsigned char sha1
[20];
1661 struct object
*object
;
1663 if (get_sha1(ref
, sha1
))
1664 die("Could not resolve ref '%s'", ref
);
1665 object
= deref_tag(parse_object(sha1
), ref
, strlen(ref
));
1666 if (object
->type
== OBJ_TREE
)
1667 return make_virtual_commit((struct tree
*)object
,
1668 better_branch_name(ref
));
1669 if (object
->type
!= OBJ_COMMIT
)
1671 if (parse_commit((struct commit
*)object
))
1672 die("Could not parse commit '%s'", sha1_to_hex(object
->sha1
));
1673 return (struct commit
*)object
;
1676 static int merge_config(const char *var
, const char *value
)
1678 if (!strcasecmp(var
, "merge.verbosity")) {
1679 verbosity
= git_config_int(var
, value
);
1682 if (!strcasecmp(var
, "diff.renamelimit")) {
1683 rename_limit
= git_config_int(var
, value
);
1686 return git_default_config(var
, value
);
1689 int main(int argc
, char *argv
[])
1691 static const char *bases
[20];
1692 static unsigned bases_count
= 0;
1694 const char *branch1
, *branch2
;
1695 struct commit
*result
, *h1
, *h2
;
1696 struct commit_list
*ca
= NULL
;
1697 struct lock_file
*lock
= xcalloc(1, sizeof(struct lock_file
));
1701 int namelen
= strlen(argv
[0]);
1703 !strcmp(argv
[0] + namelen
- 8, "-subtree"))
1707 git_config(merge_config
);
1708 if (getenv("GIT_MERGE_VERBOSITY"))
1709 verbosity
= strtol(getenv("GIT_MERGE_VERBOSITY"), NULL
, 10);
1712 die("Usage: %s <base>... -- <head> <remote> ...\n", argv
[0]);
1714 for (i
= 1; i
< argc
; ++i
) {
1715 if (!strcmp(argv
[i
], "--"))
1717 if (bases_count
< sizeof(bases
)/sizeof(*bases
))
1718 bases
[bases_count
++] = argv
[i
];
1720 if (argc
- i
!= 3) /* "--" "<head>" "<remote>" */
1721 die("Not handling anything other than two heads merge.");
1725 branch1
= argv
[++i
];
1726 branch2
= argv
[++i
];
1728 h1
= get_ref(branch1
);
1729 h2
= get_ref(branch2
);
1731 branch1
= better_branch_name(branch1
);
1732 branch2
= better_branch_name(branch2
);
1735 printf("Merging %s with %s\n", branch1
, branch2
);
1737 index_fd
= hold_locked_index(lock
, 1);
1739 for (i
= 0; i
< bases_count
; i
++) {
1740 struct commit
*ancestor
= get_ref(bases
[i
]);
1741 ca
= commit_list_insert(ancestor
, &ca
);
1743 clean
= merge(h1
, h2
, branch1
, branch2
, ca
, &result
);
1745 if (active_cache_changed
&&
1746 (write_cache(index_fd
, active_cache
, active_nr
) ||
1747 close(index_fd
) || commit_locked_index(lock
)))
1748 die ("unable to write %s", get_index_file());
1750 return clean
? 0: 1;