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.
89 unsigned char sha
[20];
91 struct rename_df_conflict_info
*rename_df_conflict_info
;
95 static inline void setup_rename_df_conflict_info(enum rename_type rename_type
,
96 struct diff_filepair
*pair1
,
97 struct diff_filepair
*pair2
,
100 struct stage_data
*dst_entry1
,
101 struct stage_data
*dst_entry2
)
103 struct rename_df_conflict_info
*ci
= xcalloc(1, sizeof(struct rename_df_conflict_info
));
104 ci
->rename_type
= rename_type
;
106 ci
->branch1
= branch1
;
107 ci
->branch2
= branch2
;
109 ci
->dst_entry1
= dst_entry1
;
110 dst_entry1
->rename_df_conflict_info
= ci
;
111 dst_entry1
->processed
= 0;
113 assert(!pair2
== !dst_entry2
);
115 ci
->dst_entry2
= dst_entry2
;
117 dst_entry2
->rename_df_conflict_info
= ci
;
118 dst_entry2
->processed
= 0;
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
368 * be removed to make room for the corresponding directory if
369 * needed. The files underneath the directories of such D/F
370 * conflicts will be handled in process_entry(), while the
371 * files of such D/F conflicts will be processed later in
372 * process_df_entry(). If the corresponding directory ends up
373 * being removed by the merge, then no additional work needs
374 * to be done by process_df_entry() for the conflicting file.
375 * If the directory needs to be written to the working copy,
376 * then the conflicting file will simply be removed (e.g. in
377 * make_room_for_path). If the directory is written to the
378 * working copy but the file also has a conflict that needs to
379 * be resolved, then process_df_entry() will reinstate the
380 * file with a new unique name.
382 const char *last_file
= NULL
;
387 * If we're merging merge-bases, we don't want to bother with
388 * any working directory changes.
393 /* Ensure D/F conflicts are adjacent in the entries list. */
394 qsort(entries
->items
, entries
->nr
, sizeof(*entries
->items
),
395 string_list_df_name_compare
);
397 string_list_clear(&o
->df_conflict_file_set
, 1);
398 for (i
= 0; i
< entries
->nr
; i
++) {
399 const char *path
= entries
->items
[i
].string
;
400 int len
= strlen(path
);
401 struct stage_data
*e
= entries
->items
[i
].util
;
404 * Check if last_file & path correspond to a D/F conflict;
405 * i.e. whether path is last_file+'/'+<something>.
406 * If so, record that it's okay to remove last_file to make
407 * room for path and friends if needed.
411 memcmp(path
, last_file
, last_len
) == 0 &&
412 path
[last_len
] == '/') {
413 string_list_insert(&o
->df_conflict_file_set
, last_file
);
417 * Determine whether path could exist as a file in the
418 * working directory as a possible D/F conflict. This
419 * will only occur when it exists in stage 2 as a
422 if (S_ISREG(e
->stages
[2].mode
) || S_ISLNK(e
->stages
[2].mode
)) {
432 struct diff_filepair
*pair
;
433 struct stage_data
*src_entry
;
434 struct stage_data
*dst_entry
;
435 unsigned processed
:1;
439 * Get information of all renames which occurred between 'o_tree' and
440 * 'tree'. We need the three trees in the merge ('o_tree', 'a_tree' and
441 * 'b_tree') to be able to associate the correct cache entries with
442 * the rename information. 'tree' is always equal to either a_tree or b_tree.
444 static struct string_list
*get_renames(struct merge_options
*o
,
449 struct string_list
*entries
)
452 struct string_list
*renames
;
453 struct diff_options opts
;
455 renames
= xcalloc(1, sizeof(struct string_list
));
457 DIFF_OPT_SET(&opts
, RECURSIVE
);
458 opts
.detect_rename
= DIFF_DETECT_RENAME
;
459 opts
.rename_limit
= o
->merge_rename_limit
>= 0 ? o
->merge_rename_limit
:
460 o
->diff_rename_limit
>= 0 ? o
->diff_rename_limit
:
462 opts
.rename_score
= o
->rename_score
;
463 opts
.show_rename_progress
= o
->show_rename_progress
;
464 opts
.output_format
= DIFF_FORMAT_NO_OUTPUT
;
465 if (diff_setup_done(&opts
) < 0)
466 die("diff setup failed");
467 diff_tree_sha1(o_tree
->object
.sha1
, tree
->object
.sha1
, "", &opts
);
469 if (opts
.needed_rename_limit
> o
->needed_rename_limit
)
470 o
->needed_rename_limit
= opts
.needed_rename_limit
;
471 for (i
= 0; i
< diff_queued_diff
.nr
; ++i
) {
472 struct string_list_item
*item
;
474 struct diff_filepair
*pair
= diff_queued_diff
.queue
[i
];
475 if (pair
->status
!= 'R') {
476 diff_free_filepair(pair
);
479 re
= xmalloc(sizeof(*re
));
482 item
= string_list_lookup(entries
, re
->pair
->one
->path
);
484 re
->src_entry
= insert_stage_data(re
->pair
->one
->path
,
485 o_tree
, a_tree
, b_tree
, entries
);
487 re
->src_entry
= item
->util
;
489 item
= string_list_lookup(entries
, re
->pair
->two
->path
);
491 re
->dst_entry
= insert_stage_data(re
->pair
->two
->path
,
492 o_tree
, a_tree
, b_tree
, entries
);
494 re
->dst_entry
= item
->util
;
495 item
= string_list_insert(renames
, pair
->one
->path
);
498 opts
.output_format
= DIFF_FORMAT_NO_OUTPUT
;
499 diff_queued_diff
.nr
= 0;
504 static int update_stages(const char *path
, const struct diff_filespec
*o
,
505 const struct diff_filespec
*a
,
506 const struct diff_filespec
*b
)
509 int options
= ADD_CACHE_OK_TO_ADD
| ADD_CACHE_SKIP_DFCHECK
;
511 if (remove_file_from_cache(path
))
514 if (add_cacheinfo(o
->mode
, o
->sha1
, path
, 1, 0, options
))
517 if (add_cacheinfo(a
->mode
, a
->sha1
, path
, 2, 0, options
))
520 if (add_cacheinfo(b
->mode
, b
->sha1
, path
, 3, 0, options
))
525 static int update_stages_and_entry(const char *path
,
526 struct stage_data
*entry
,
527 struct diff_filespec
*o
,
528 struct diff_filespec
*a
,
529 struct diff_filespec
*b
,
534 entry
->processed
= 0;
535 entry
->stages
[1].mode
= o
->mode
;
536 entry
->stages
[2].mode
= a
->mode
;
537 entry
->stages
[3].mode
= b
->mode
;
538 hashcpy(entry
->stages
[1].sha
, o
->sha1
);
539 hashcpy(entry
->stages
[2].sha
, a
->sha1
);
540 hashcpy(entry
->stages
[3].sha
, b
->sha1
);
541 return update_stages(path
, o
, a
, b
);
544 static int remove_file(struct merge_options
*o
, int clean
,
545 const char *path
, int no_wd
)
547 int update_cache
= o
->call_depth
|| clean
;
548 int update_working_directory
= !o
->call_depth
&& !no_wd
;
551 if (remove_file_from_cache(path
))
554 if (update_working_directory
) {
555 if (remove_path(path
))
561 static char *unique_path(struct merge_options
*o
, const char *path
, const char *branch
)
563 char *newpath
= xmalloc(strlen(path
) + 1 + strlen(branch
) + 8 + 1);
566 char *p
= newpath
+ strlen(path
);
567 strcpy(newpath
, path
);
573 while (string_list_has_string(&o
->current_file_set
, newpath
) ||
574 string_list_has_string(&o
->current_directory_set
, newpath
) ||
575 lstat(newpath
, &st
) == 0)
576 sprintf(p
, "_%d", suffix
++);
578 string_list_insert(&o
->current_file_set
, newpath
);
582 static void flush_buffer(int fd
, const char *buf
, unsigned long size
)
585 long ret
= write_in_full(fd
, buf
, size
);
590 die_errno("merge-recursive");
592 die("merge-recursive: disk full?");
599 static int dir_in_way(const char *path
, int check_working_copy
)
601 int pos
, pathlen
= strlen(path
);
602 char *dirpath
= xmalloc(pathlen
+ 2);
605 strcpy(dirpath
, path
);
606 dirpath
[pathlen
] = '/';
607 dirpath
[pathlen
+1] = '\0';
609 pos
= cache_name_pos(dirpath
, pathlen
+1);
613 if (pos
< active_nr
&&
614 !strncmp(dirpath
, active_cache
[pos
]->name
, pathlen
+1)) {
620 return check_working_copy
&& !lstat(path
, &st
) && S_ISDIR(st
.st_mode
);
623 static int was_tracked(const char *path
)
625 int pos
= cache_name_pos(path
, strlen(path
));
629 while (pos
< active_nr
&&
630 !strcmp(path
, active_cache
[pos
]->name
)) {
632 * If stage #0, it is definitely tracked.
633 * If it has stage #2 then it was tracked
634 * before this merge started. All other
635 * cases the path was not tracked.
637 switch (ce_stage(active_cache
[pos
])) {
647 static int would_lose_untracked(const char *path
)
649 return !was_tracked(path
) && file_exists(path
);
652 static int make_room_for_path(struct merge_options
*o
, const char *path
)
655 const char *msg
= "failed to create path '%s'%s";
657 /* Unlink any D/F conflict files that are in the way */
658 for (i
= 0; i
< o
->df_conflict_file_set
.nr
; i
++) {
659 const char *df_path
= o
->df_conflict_file_set
.items
[i
].string
;
660 size_t pathlen
= strlen(path
);
661 size_t df_pathlen
= strlen(df_path
);
662 if (df_pathlen
< pathlen
&&
663 path
[df_pathlen
] == '/' &&
664 strncmp(path
, df_path
, df_pathlen
) == 0) {
666 "Removing %s to make room for subdirectory\n",
669 unsorted_string_list_delete_item(&o
->df_conflict_file_set
,
675 /* Make sure leading directories are created */
676 status
= safe_create_leading_directories_const(path
);
679 /* something else exists */
680 error(msg
, path
, ": perhaps a D/F conflict?");
687 * Do not unlink a file in the work tree if we are not
690 if (would_lose_untracked(path
))
691 return error("refusing to lose untracked file at '%s'",
694 /* Successful unlink is good.. */
697 /* .. and so is no existing file */
700 /* .. but not some other error (who really cares what?) */
701 return error(msg
, path
, ": perhaps a D/F conflict?");
704 static void update_file_flags(struct merge_options
*o
,
705 const unsigned char *sha
,
715 enum object_type type
;
719 if (S_ISGITLINK(mode
)) {
721 * We may later decide to recursively descend into
722 * the submodule directory and update its index
723 * and/or work tree, but we do not do that now.
729 buf
= read_sha1_file(sha
, &type
, &size
);
731 die("cannot read object %s '%s'", sha1_to_hex(sha
), path
);
732 if (type
!= OBJ_BLOB
)
733 die("blob expected for %s '%s'", sha1_to_hex(sha
), path
);
735 struct strbuf strbuf
= STRBUF_INIT
;
736 if (convert_to_working_tree(path
, buf
, size
, &strbuf
)) {
739 buf
= strbuf_detach(&strbuf
, NULL
);
743 if (make_room_for_path(o
, path
) < 0) {
748 if (S_ISREG(mode
) || (!has_symlinks
&& S_ISLNK(mode
))) {
754 fd
= open(path
, O_WRONLY
| O_TRUNC
| O_CREAT
, mode
);
756 die_errno("failed to open '%s'", path
);
757 flush_buffer(fd
, buf
, size
);
759 } else if (S_ISLNK(mode
)) {
760 char *lnk
= xmemdupz(buf
, size
);
761 safe_create_leading_directories_const(path
);
763 if (symlink(lnk
, path
))
764 die_errno("failed to symlink '%s'", path
);
767 die("do not know what to do with %06o %s '%s'",
768 mode
, sha1_to_hex(sha
), path
);
773 add_cacheinfo(mode
, sha
, path
, 0, update_wd
, ADD_CACHE_OK_TO_ADD
);
776 static void update_file(struct merge_options
*o
,
778 const unsigned char *sha
,
782 update_file_flags(o
, sha
, mode
, path
, o
->call_depth
|| clean
, !o
->call_depth
);
785 /* Low level file merging, update and removal */
787 struct merge_file_info
{
788 unsigned char sha
[20];
794 static int merge_3way(struct merge_options
*o
,
795 mmbuffer_t
*result_buf
,
796 const struct diff_filespec
*one
,
797 const struct diff_filespec
*a
,
798 const struct diff_filespec
*b
,
802 mmfile_t orig
, src1
, src2
;
803 struct ll_merge_options ll_opts
= {0};
804 char *base_name
, *name1
, *name2
;
807 ll_opts
.renormalize
= o
->renormalize
;
808 ll_opts
.xdl_opts
= o
->xdl_opts
;
811 ll_opts
.virtual_ancestor
= 1;
814 switch (o
->recursive_variant
) {
815 case MERGE_RECURSIVE_OURS
:
816 ll_opts
.variant
= XDL_MERGE_FAVOR_OURS
;
818 case MERGE_RECURSIVE_THEIRS
:
819 ll_opts
.variant
= XDL_MERGE_FAVOR_THEIRS
;
827 if (strcmp(a
->path
, b
->path
) ||
828 (o
->ancestor
!= NULL
&& strcmp(a
->path
, one
->path
) != 0)) {
829 base_name
= o
->ancestor
== NULL
? NULL
:
830 xstrdup(mkpath("%s:%s", o
->ancestor
, one
->path
));
831 name1
= xstrdup(mkpath("%s:%s", branch1
, a
->path
));
832 name2
= xstrdup(mkpath("%s:%s", branch2
, b
->path
));
834 base_name
= o
->ancestor
== NULL
? NULL
:
835 xstrdup(mkpath("%s", o
->ancestor
));
836 name1
= xstrdup(mkpath("%s", branch1
));
837 name2
= xstrdup(mkpath("%s", branch2
));
840 read_mmblob(&orig
, one
->sha1
);
841 read_mmblob(&src1
, a
->sha1
);
842 read_mmblob(&src2
, b
->sha1
);
844 merge_status
= ll_merge(result_buf
, a
->path
, &orig
, base_name
,
845 &src1
, name1
, &src2
, name2
, &ll_opts
);
855 static struct merge_file_info
merge_file(struct merge_options
*o
,
856 const struct diff_filespec
*one
,
857 const struct diff_filespec
*a
,
858 const struct diff_filespec
*b
,
862 struct merge_file_info result
;
866 if ((S_IFMT
& a
->mode
) != (S_IFMT
& b
->mode
)) {
868 if (S_ISREG(a
->mode
)) {
869 result
.mode
= a
->mode
;
870 hashcpy(result
.sha
, a
->sha1
);
872 result
.mode
= b
->mode
;
873 hashcpy(result
.sha
, b
->sha1
);
876 if (!sha_eq(a
->sha1
, one
->sha1
) && !sha_eq(b
->sha1
, one
->sha1
))
882 if (a
->mode
== b
->mode
|| a
->mode
== one
->mode
)
883 result
.mode
= b
->mode
;
885 result
.mode
= a
->mode
;
886 if (b
->mode
!= one
->mode
) {
892 if (sha_eq(a
->sha1
, b
->sha1
) || sha_eq(a
->sha1
, one
->sha1
))
893 hashcpy(result
.sha
, b
->sha1
);
894 else if (sha_eq(b
->sha1
, one
->sha1
))
895 hashcpy(result
.sha
, a
->sha1
);
896 else if (S_ISREG(a
->mode
)) {
897 mmbuffer_t result_buf
;
900 merge_status
= merge_3way(o
, &result_buf
, one
, a
, b
,
903 if ((merge_status
< 0) || !result_buf
.ptr
)
904 die("Failed to execute internal merge");
906 if (write_sha1_file(result_buf
.ptr
, result_buf
.size
,
907 blob_type
, result
.sha
))
908 die("Unable to add %s to database",
911 free(result_buf
.ptr
);
912 result
.clean
= (merge_status
== 0);
913 } else if (S_ISGITLINK(a
->mode
)) {
914 result
.clean
= merge_submodule(result
.sha
, one
->path
, one
->sha1
,
916 } else if (S_ISLNK(a
->mode
)) {
917 hashcpy(result
.sha
, a
->sha1
);
919 if (!sha_eq(a
->sha1
, b
->sha1
))
922 die("unsupported object type in the tree");
929 static void conflict_rename_delete(struct merge_options
*o
,
930 struct diff_filepair
*pair
,
931 const char *rename_branch
,
932 const char *other_branch
)
934 char *dest_name
= pair
->two
->path
;
937 output(o
, 1, "CONFLICT (rename/delete): Rename %s->%s in %s "
939 pair
->one
->path
, pair
->two
->path
, rename_branch
,
942 update_stages(dest_name
, NULL
,
943 rename_branch
== o
->branch1
? pair
->two
: NULL
,
944 rename_branch
== o
->branch1
? NULL
: pair
->two
);
945 if (dir_in_way(dest_name
, !o
->call_depth
)) {
946 dest_name
= unique_path(o
, dest_name
, rename_branch
);
949 update_file(o
, 0, pair
->two
->sha1
, pair
->two
->mode
, dest_name
);
954 static void conflict_rename_rename_1to2(struct merge_options
*o
,
955 struct diff_filepair
*pair1
,
957 struct diff_filepair
*pair2
,
960 /* One file was renamed in both branches, but to different names. */
963 const char *ren1_dst
= pair1
->two
->path
;
964 const char *ren2_dst
= pair2
->two
->path
;
965 const char *dst_name1
= ren1_dst
;
966 const char *dst_name2
= ren2_dst
;
967 if (dir_in_way(ren1_dst
, !o
->call_depth
)) {
968 dst_name1
= del
[delp
++] = unique_path(o
, ren1_dst
, branch1
);
969 output(o
, 1, "%s is a directory in %s adding as %s instead",
970 ren1_dst
, branch2
, dst_name1
);
972 if (dir_in_way(ren2_dst
, !o
->call_depth
)) {
973 dst_name2
= del
[delp
++] = unique_path(o
, ren2_dst
, branch2
);
974 output(o
, 1, "%s is a directory in %s adding as %s instead",
975 ren2_dst
, branch1
, dst_name2
);
978 remove_file_from_cache(dst_name1
);
979 remove_file_from_cache(dst_name2
);
981 * Uncomment to leave the conflicting names in the resulting tree
983 * update_file(o, 0, pair1->two->sha1, pair1->two->mode, dst_name1);
984 * update_file(o, 0, pair2->two->sha1, pair2->two->mode, dst_name2);
987 update_stages(ren1_dst
, NULL
, pair1
->two
, NULL
);
988 update_stages(ren2_dst
, NULL
, NULL
, pair2
->two
);
990 update_file(o
, 0, pair1
->two
->sha1
, pair1
->two
->mode
, dst_name1
);
991 update_file(o
, 0, pair2
->two
->sha1
, pair2
->two
->mode
, dst_name2
);
997 static void conflict_rename_rename_2to1(struct merge_options
*o
,
1000 struct rename
*ren2
,
1001 const char *branch2
)
1003 /* Two files were renamed to the same thing. */
1004 char *new_path1
= unique_path(o
, ren1
->pair
->two
->path
, branch1
);
1005 char *new_path2
= unique_path(o
, ren2
->pair
->two
->path
, branch2
);
1006 output(o
, 1, "Renaming %s to %s and %s to %s instead",
1007 ren1
->pair
->one
->path
, new_path1
,
1008 ren2
->pair
->one
->path
, new_path2
);
1009 remove_file(o
, 0, ren1
->pair
->two
->path
, 0);
1010 update_file(o
, 0, ren1
->pair
->two
->sha1
, ren1
->pair
->two
->mode
, new_path1
);
1011 update_file(o
, 0, ren2
->pair
->two
->sha1
, ren2
->pair
->two
->mode
, new_path2
);
1016 static int process_renames(struct merge_options
*o
,
1017 struct string_list
*a_renames
,
1018 struct string_list
*b_renames
)
1020 int clean_merge
= 1, i
, j
;
1021 struct string_list a_by_dst
= STRING_LIST_INIT_NODUP
;
1022 struct string_list b_by_dst
= STRING_LIST_INIT_NODUP
;
1023 const struct rename
*sre
;
1025 for (i
= 0; i
< a_renames
->nr
; i
++) {
1026 sre
= a_renames
->items
[i
].util
;
1027 string_list_insert(&a_by_dst
, sre
->pair
->two
->path
)->util
1030 for (i
= 0; i
< b_renames
->nr
; i
++) {
1031 sre
= b_renames
->items
[i
].util
;
1032 string_list_insert(&b_by_dst
, sre
->pair
->two
->path
)->util
1036 for (i
= 0, j
= 0; i
< a_renames
->nr
|| j
< b_renames
->nr
;) {
1037 struct string_list
*renames1
, *renames2Dst
;
1038 struct rename
*ren1
= NULL
, *ren2
= NULL
;
1039 const char *branch1
, *branch2
;
1040 const char *ren1_src
, *ren1_dst
;
1042 if (i
>= a_renames
->nr
) {
1043 ren2
= b_renames
->items
[j
++].util
;
1044 } else if (j
>= b_renames
->nr
) {
1045 ren1
= a_renames
->items
[i
++].util
;
1047 int compare
= strcmp(a_renames
->items
[i
].string
,
1048 b_renames
->items
[j
].string
);
1050 ren1
= a_renames
->items
[i
++].util
;
1052 ren2
= b_renames
->items
[j
++].util
;
1055 /* TODO: refactor, so that 1/2 are not needed */
1057 renames1
= a_renames
;
1058 renames2Dst
= &b_by_dst
;
1059 branch1
= o
->branch1
;
1060 branch2
= o
->branch2
;
1063 renames1
= b_renames
;
1064 renames2Dst
= &a_by_dst
;
1065 branch1
= o
->branch2
;
1066 branch2
= o
->branch1
;
1072 ren1
->dst_entry
->processed
= 1;
1073 ren1
->src_entry
->processed
= 1;
1075 if (ren1
->processed
)
1077 ren1
->processed
= 1;
1079 ren1_src
= ren1
->pair
->one
->path
;
1080 ren1_dst
= ren1
->pair
->two
->path
;
1083 const char *ren2_src
= ren2
->pair
->one
->path
;
1084 const char *ren2_dst
= ren2
->pair
->two
->path
;
1085 /* Renamed in 1 and renamed in 2 */
1086 if (strcmp(ren1_src
, ren2_src
) != 0)
1087 die("ren1.src != ren2.src");
1088 ren2
->dst_entry
->processed
= 1;
1089 ren2
->processed
= 1;
1090 if (strcmp(ren1_dst
, ren2_dst
) != 0) {
1091 setup_rename_df_conflict_info(RENAME_ONE_FILE_TO_TWO
,
1099 remove_file(o
, 1, ren1_src
, 1);
1100 update_stages_and_entry(ren1_dst
,
1108 /* Renamed in 1, maybe changed in 2 */
1109 struct string_list_item
*item
;
1110 /* we only use sha1 and mode of these */
1111 struct diff_filespec src_other
, dst_other
;
1115 * unpack_trees loads entries from common-commit
1116 * into stage 1, from head-commit into stage 2, and
1117 * from merge-commit into stage 3. We keep track
1118 * of which side corresponds to the rename.
1120 int renamed_stage
= a_renames
== renames1
? 2 : 3;
1121 int other_stage
= a_renames
== renames1
? 3 : 2;
1123 remove_file(o
, 1, ren1_src
, o
->call_depth
|| renamed_stage
== 2);
1125 hashcpy(src_other
.sha1
, ren1
->src_entry
->stages
[other_stage
].sha
);
1126 src_other
.mode
= ren1
->src_entry
->stages
[other_stage
].mode
;
1127 hashcpy(dst_other
.sha1
, ren1
->dst_entry
->stages
[other_stage
].sha
);
1128 dst_other
.mode
= ren1
->dst_entry
->stages
[other_stage
].mode
;
1131 if (sha_eq(src_other
.sha1
, null_sha1
)) {
1132 if (dir_in_way(ren1_dst
, 0 /*check_wc*/)) {
1133 ren1
->dst_entry
->processed
= 0;
1134 setup_rename_df_conflict_info(RENAME_DELETE
,
1143 conflict_rename_delete(o
, ren1
->pair
, branch1
, branch2
);
1145 } else if ((dst_other
.mode
== ren1
->pair
->two
->mode
) &&
1146 sha_eq(dst_other
.sha1
, ren1
->pair
->two
->sha1
)) {
1147 /* Added file on the other side
1148 identical to the file being
1149 renamed: clean merge */
1150 update_file(o
, 1, ren1
->pair
->two
->sha1
, ren1
->pair
->two
->mode
, ren1_dst
);
1151 } else if (!sha_eq(dst_other
.sha1
, null_sha1
)) {
1154 output(o
, 1, "CONFLICT (rename/add): Rename %s->%s in %s. "
1156 ren1_src
, ren1_dst
, branch1
,
1158 if (o
->call_depth
) {
1159 struct merge_file_info mfi
;
1160 struct diff_filespec one
, a
, b
;
1162 one
.path
= a
.path
= b
.path
=
1164 hashcpy(one
.sha1
, null_sha1
);
1166 hashcpy(a
.sha1
, ren1
->pair
->two
->sha1
);
1167 a
.mode
= ren1
->pair
->two
->mode
;
1168 hashcpy(b
.sha1
, dst_other
.sha1
);
1169 b
.mode
= dst_other
.mode
;
1170 mfi
= merge_file(o
, &one
, &a
, &b
,
1173 output(o
, 1, "Adding merged %s", ren1_dst
);
1180 char *new_path
= unique_path(o
, ren1_dst
, branch2
);
1181 output(o
, 1, "Adding as %s instead", new_path
);
1182 update_file(o
, 0, dst_other
.sha1
, dst_other
.mode
, new_path
);
1185 } else if ((item
= string_list_lookup(renames2Dst
, ren1_dst
))) {
1188 ren2
->processed
= 1;
1189 output(o
, 1, "CONFLICT (rename/rename): "
1190 "Rename %s->%s in %s. "
1191 "Rename %s->%s in %s",
1192 ren1_src
, ren1_dst
, branch1
,
1193 ren2
->pair
->one
->path
, ren2
->pair
->two
->path
, branch2
);
1194 conflict_rename_rename_2to1(o
, ren1
, branch1
, ren2
, branch2
);
1199 struct diff_filespec
*one
, *a
, *b
;
1200 src_other
.path
= (char *)ren1_src
;
1202 one
= ren1
->pair
->one
;
1203 if (a_renames
== renames1
) {
1204 a
= ren1
->pair
->two
;
1207 b
= ren1
->pair
->two
;
1210 update_stages_and_entry(ren1_dst
, ren1
->dst_entry
, one
, a
, b
, 1);
1211 if (dir_in_way(ren1_dst
, 0 /*check_wc*/)) {
1212 setup_rename_df_conflict_info(RENAME_NORMAL
,
1223 string_list_clear(&a_by_dst
, 0);
1224 string_list_clear(&b_by_dst
, 0);
1229 static unsigned char *stage_sha(const unsigned char *sha
, unsigned mode
)
1231 return (is_null_sha1(sha
) || mode
== 0) ? NULL
: (unsigned char *)sha
;
1234 static int read_sha1_strbuf(const unsigned char *sha1
, struct strbuf
*dst
)
1237 enum object_type type
;
1239 buf
= read_sha1_file(sha1
, &type
, &size
);
1241 return error("cannot read object %s", sha1_to_hex(sha1
));
1242 if (type
!= OBJ_BLOB
) {
1244 return error("object %s is not a blob", sha1_to_hex(sha1
));
1246 strbuf_attach(dst
, buf
, size
, size
+ 1);
1250 static int blob_unchanged(const unsigned char *o_sha
,
1251 const unsigned char *a_sha
,
1252 int renormalize
, const char *path
)
1254 struct strbuf o
= STRBUF_INIT
;
1255 struct strbuf a
= STRBUF_INIT
;
1256 int ret
= 0; /* assume changed for safety */
1258 if (sha_eq(o_sha
, a_sha
))
1263 assert(o_sha
&& a_sha
);
1264 if (read_sha1_strbuf(o_sha
, &o
) || read_sha1_strbuf(a_sha
, &a
))
1267 * Note: binary | is used so that both renormalizations are
1268 * performed. Comparison can be skipped if both files are
1269 * unchanged since their sha1s have already been compared.
1271 if (renormalize_buffer(path
, o
.buf
, o
.len
, &o
) |
1272 renormalize_buffer(path
, a
.buf
, o
.len
, &a
))
1273 ret
= (o
.len
== a
.len
&& !memcmp(o
.buf
, a
.buf
, o
.len
));
1281 static void handle_delete_modify(struct merge_options
*o
,
1283 const char *new_path
,
1284 unsigned char *a_sha
, int a_mode
,
1285 unsigned char *b_sha
, int b_mode
)
1288 output(o
, 1, "CONFLICT (delete/modify): %s deleted in %s "
1289 "and modified in %s. Version %s of %s left in tree%s%s.",
1291 o
->branch2
, o
->branch2
, path
,
1292 path
== new_path
? "" : " at ",
1293 path
== new_path
? "" : new_path
);
1294 update_file(o
, 0, b_sha
, b_mode
, new_path
);
1296 output(o
, 1, "CONFLICT (delete/modify): %s deleted in %s "
1297 "and modified in %s. Version %s of %s left in tree%s%s.",
1299 o
->branch1
, o
->branch1
, path
,
1300 path
== new_path
? "" : " at ",
1301 path
== new_path
? "" : new_path
);
1302 update_file(o
, 0, a_sha
, a_mode
, new_path
);
1306 static int merge_content(struct merge_options
*o
,
1308 unsigned char *o_sha
, int o_mode
,
1309 unsigned char *a_sha
, int a_mode
,
1310 unsigned char *b_sha
, int b_mode
,
1311 const char *df_rename_conflict_branch
)
1313 const char *reason
= "content";
1314 struct merge_file_info mfi
;
1315 struct diff_filespec one
, a
, b
;
1316 unsigned df_conflict_remains
= 0;
1320 o_sha
= (unsigned char *)null_sha1
;
1322 one
.path
= a
.path
= b
.path
= (char *)path
;
1323 hashcpy(one
.sha1
, o_sha
);
1325 hashcpy(a
.sha1
, a_sha
);
1327 hashcpy(b
.sha1
, b_sha
);
1330 mfi
= merge_file(o
, &one
, &a
, &b
, o
->branch1
, o
->branch2
);
1331 if (df_rename_conflict_branch
&&
1332 dir_in_way(path
, !o
->call_depth
)) {
1333 df_conflict_remains
= 1;
1336 if (mfi
.clean
&& !df_conflict_remains
&&
1337 sha_eq(mfi
.sha
, a_sha
) && mfi
.mode
== a
.mode
)
1338 output(o
, 3, "Skipped %s (merged same as existing)", path
);
1340 output(o
, 2, "Auto-merging %s", path
);
1343 if (S_ISGITLINK(mfi
.mode
))
1344 reason
= "submodule";
1345 output(o
, 1, "CONFLICT (%s): Merge conflict in %s",
1349 if (df_conflict_remains
) {
1351 update_file_flags(o
, mfi
.sha
, mfi
.mode
, path
,
1352 o
->call_depth
|| mfi
.clean
, 0);
1353 new_path
= unique_path(o
, path
, df_rename_conflict_branch
);
1355 output(o
, 1, "Adding as %s instead", new_path
);
1356 update_file_flags(o
, mfi
.sha
, mfi
.mode
, new_path
, 0, 1);
1359 update_file(o
, mfi
.clean
, mfi
.sha
, mfi
.mode
, path
);
1365 /* Per entry merge function */
1366 static int process_entry(struct merge_options
*o
,
1367 const char *path
, struct stage_data
*entry
)
1370 printf("processing entry, clean cache: %s\n", index_only ? "yes": "no");
1371 print_index_entry("\tpath: ", entry);
1373 int clean_merge
= 1;
1374 int normalize
= o
->renormalize
;
1375 unsigned o_mode
= entry
->stages
[1].mode
;
1376 unsigned a_mode
= entry
->stages
[2].mode
;
1377 unsigned b_mode
= entry
->stages
[3].mode
;
1378 unsigned char *o_sha
= stage_sha(entry
->stages
[1].sha
, o_mode
);
1379 unsigned char *a_sha
= stage_sha(entry
->stages
[2].sha
, a_mode
);
1380 unsigned char *b_sha
= stage_sha(entry
->stages
[3].sha
, b_mode
);
1382 if (entry
->rename_df_conflict_info
)
1383 return 1; /* Such cases are handled elsewhere. */
1385 entry
->processed
= 1;
1386 if (o_sha
&& (!a_sha
|| !b_sha
)) {
1387 /* Case A: Deleted in one */
1388 if ((!a_sha
&& !b_sha
) ||
1389 (!b_sha
&& blob_unchanged(o_sha
, a_sha
, normalize
, path
)) ||
1390 (!a_sha
&& blob_unchanged(o_sha
, b_sha
, normalize
, path
))) {
1391 /* Deleted in both or deleted in one and
1392 * unchanged in the other */
1394 output(o
, 2, "Removing %s", path
);
1395 /* do not touch working file if it did not exist */
1396 remove_file(o
, 1, path
, !a_sha
);
1397 } else if (dir_in_way(path
, 0 /*check_wc*/)) {
1398 entry
->processed
= 0;
1399 return 1; /* Assume clean until processed */
1401 /* Deleted in one and changed in the other */
1403 handle_delete_modify(o
, path
, path
,
1404 a_sha
, a_mode
, b_sha
, b_mode
);
1407 } else if ((!o_sha
&& a_sha
&& !b_sha
) ||
1408 (!o_sha
&& !a_sha
&& b_sha
)) {
1409 /* Case B: Added in one. */
1411 const unsigned char *sha
;
1420 if (dir_in_way(path
, 0 /*check_wc*/)) {
1421 /* Handle D->F conflicts after all subfiles */
1422 entry
->processed
= 0;
1423 return 1; /* Assume clean until processed */
1425 output(o
, 2, "Adding %s", path
);
1426 update_file(o
, 1, sha
, mode
, path
);
1428 } else if (a_sha
&& b_sha
) {
1429 /* Case C: Added in both (check for same permissions) and */
1430 /* case D: Modified in both, but differently. */
1431 clean_merge
= merge_content(o
, path
,
1432 o_sha
, o_mode
, a_sha
, a_mode
, b_sha
, b_mode
,
1434 } else if (!o_sha
&& !a_sha
&& !b_sha
) {
1436 * this entry was deleted altogether. a_mode == 0 means
1437 * we had that path and want to actively remove it.
1439 remove_file(o
, 1, path
, !a_mode
);
1441 die("Fatal merge failure, shouldn't happen.");
1447 * Per entry merge function for D/F (and/or rename) conflicts. In the
1448 * cases we can cleanly resolve D/F conflicts, process_entry() can
1449 * clean out all the files below the directory for us. All D/F
1450 * conflict cases must be handled here at the end to make sure any
1451 * directories that can be cleaned out, are.
1453 * Some rename conflicts may also be handled here that don't necessarily
1454 * involve D/F conflicts, since the code to handle them is generic enough
1455 * to handle those rename conflicts with or without D/F conflicts also
1458 static int process_df_entry(struct merge_options
*o
,
1459 const char *path
, struct stage_data
*entry
)
1461 int clean_merge
= 1;
1462 unsigned o_mode
= entry
->stages
[1].mode
;
1463 unsigned a_mode
= entry
->stages
[2].mode
;
1464 unsigned b_mode
= entry
->stages
[3].mode
;
1465 unsigned char *o_sha
= stage_sha(entry
->stages
[1].sha
, o_mode
);
1466 unsigned char *a_sha
= stage_sha(entry
->stages
[2].sha
, a_mode
);
1467 unsigned char *b_sha
= stage_sha(entry
->stages
[3].sha
, b_mode
);
1469 entry
->processed
= 1;
1470 if (entry
->rename_df_conflict_info
) {
1471 struct rename_df_conflict_info
*conflict_info
= entry
->rename_df_conflict_info
;
1473 switch (conflict_info
->rename_type
) {
1475 clean_merge
= merge_content(o
, path
,
1476 o_sha
, o_mode
, a_sha
, a_mode
, b_sha
, b_mode
,
1477 conflict_info
->branch1
);
1481 conflict_rename_delete(o
, conflict_info
->pair1
,
1482 conflict_info
->branch1
,
1483 conflict_info
->branch2
);
1485 case RENAME_ONE_FILE_TO_TWO
:
1486 src
= conflict_info
->pair1
->one
->path
;
1488 output(o
, 1, "CONFLICT (rename/rename): "
1489 "Rename \"%s\"->\"%s\" in branch \"%s\" "
1490 "rename \"%s\"->\"%s\" in \"%s\"%s",
1491 src
, conflict_info
->pair1
->two
->path
, conflict_info
->branch1
,
1492 src
, conflict_info
->pair2
->two
->path
, conflict_info
->branch2
,
1493 o
->call_depth
? " (left unresolved)" : "");
1494 if (o
->call_depth
) {
1495 remove_file_from_cache(src
);
1496 update_file(o
, 0, conflict_info
->pair1
->one
->sha1
,
1497 conflict_info
->pair1
->one
->mode
, src
);
1499 conflict_rename_rename_1to2(o
, conflict_info
->pair1
,
1500 conflict_info
->branch1
,
1501 conflict_info
->pair2
,
1502 conflict_info
->branch2
);
1503 conflict_info
->dst_entry2
->processed
= 1;
1506 entry
->processed
= 0;
1509 } else if (o_sha
&& (!a_sha
|| !b_sha
)) {
1510 /* Modify/delete; deleted side may have put a directory in the way */
1511 char *renamed
= NULL
;
1512 if (dir_in_way(path
, !o
->call_depth
)) {
1513 renamed
= unique_path(o
, path
, a_sha
? o
->branch1
: o
->branch2
);
1516 handle_delete_modify(o
, path
, renamed
? renamed
: path
,
1517 a_sha
, a_mode
, b_sha
, b_mode
);
1519 } else if (!o_sha
&& !!a_sha
!= !!b_sha
) {
1520 /* directory -> (directory, file) or <nothing> -> (directory, file) */
1521 const char *add_branch
;
1522 const char *other_branch
;
1524 const unsigned char *sha
;
1528 add_branch
= o
->branch1
;
1529 other_branch
= o
->branch2
;
1532 conf
= "file/directory";
1534 add_branch
= o
->branch2
;
1535 other_branch
= o
->branch1
;
1538 conf
= "directory/file";
1540 if (dir_in_way(path
, !o
->call_depth
)) {
1541 char *new_path
= unique_path(o
, path
, add_branch
);
1543 output(o
, 1, "CONFLICT (%s): There is a directory with name %s in %s. "
1545 conf
, path
, other_branch
, path
, new_path
);
1546 update_file(o
, 0, sha
, mode
, new_path
);
1548 remove_file_from_cache(path
);
1551 output(o
, 2, "Adding %s", path
);
1552 update_file(o
, 1, sha
, mode
, path
);
1555 entry
->processed
= 0;
1556 return 1; /* not handled; assume clean until processed */
1562 int merge_trees(struct merge_options
*o
,
1565 struct tree
*common
,
1566 struct tree
**result
)
1570 if (o
->subtree_shift
) {
1571 merge
= shift_tree_object(head
, merge
, o
->subtree_shift
);
1572 common
= shift_tree_object(head
, common
, o
->subtree_shift
);
1575 if (sha_eq(common
->object
.sha1
, merge
->object
.sha1
)) {
1576 output(o
, 0, "Already up-to-date!");
1581 code
= git_merge_trees(o
->call_depth
, common
, head
, merge
);
1584 if (show(o
, 4) || o
->call_depth
)
1585 die("merging of trees %s and %s failed",
1586 sha1_to_hex(head
->object
.sha1
),
1587 sha1_to_hex(merge
->object
.sha1
));
1592 if (unmerged_cache()) {
1593 struct string_list
*entries
, *re_head
, *re_merge
;
1595 string_list_clear(&o
->current_file_set
, 1);
1596 string_list_clear(&o
->current_directory_set
, 1);
1597 get_files_dirs(o
, head
);
1598 get_files_dirs(o
, merge
);
1600 entries
= get_unmerged();
1601 record_df_conflict_files(o
, entries
);
1602 re_head
= get_renames(o
, head
, common
, head
, merge
, entries
);
1603 re_merge
= get_renames(o
, merge
, common
, head
, merge
, entries
);
1604 clean
= process_renames(o
, re_head
, re_merge
);
1605 for (i
= 0; i
< entries
->nr
; i
++) {
1606 const char *path
= entries
->items
[i
].string
;
1607 struct stage_data
*e
= entries
->items
[i
].util
;
1609 && !process_entry(o
, path
, e
))
1612 for (i
= 0; i
< entries
->nr
; i
++) {
1613 const char *path
= entries
->items
[i
].string
;
1614 struct stage_data
*e
= entries
->items
[i
].util
;
1616 && !process_df_entry(o
, path
, e
))
1619 for (i
= 0; i
< entries
->nr
; i
++) {
1620 struct stage_data
*e
= entries
->items
[i
].util
;
1622 die("Unprocessed path??? %s",
1623 entries
->items
[i
].string
);
1626 string_list_clear(re_merge
, 0);
1627 string_list_clear(re_head
, 0);
1628 string_list_clear(entries
, 1);
1635 *result
= write_tree_from_memory(o
);
1640 static struct commit_list
*reverse_commit_list(struct commit_list
*list
)
1642 struct commit_list
*next
= NULL
, *current
, *backup
;
1643 for (current
= list
; current
; current
= backup
) {
1644 backup
= current
->next
;
1645 current
->next
= next
;
1652 * Merge the commits h1 and h2, return the resulting virtual
1653 * commit object and a flag indicating the cleanness of the merge.
1655 int merge_recursive(struct merge_options
*o
,
1658 struct commit_list
*ca
,
1659 struct commit
**result
)
1661 struct commit_list
*iter
;
1662 struct commit
*merged_common_ancestors
;
1663 struct tree
*mrtree
= mrtree
;
1667 output(o
, 4, "Merging:");
1668 output_commit_title(o
, h1
);
1669 output_commit_title(o
, h2
);
1673 ca
= get_merge_bases(h1
, h2
, 1);
1674 ca
= reverse_commit_list(ca
);
1678 output(o
, 5, "found %u common ancestor(s):", commit_list_count(ca
));
1679 for (iter
= ca
; iter
; iter
= iter
->next
)
1680 output_commit_title(o
, iter
->item
);
1683 merged_common_ancestors
= pop_commit(&ca
);
1684 if (merged_common_ancestors
== NULL
) {
1685 /* if there is no common ancestor, make an empty tree */
1686 struct tree
*tree
= xcalloc(1, sizeof(struct tree
));
1688 tree
->object
.parsed
= 1;
1689 tree
->object
.type
= OBJ_TREE
;
1690 pretend_sha1_file(NULL
, 0, OBJ_TREE
, tree
->object
.sha1
);
1691 merged_common_ancestors
= make_virtual_commit(tree
, "ancestor");
1694 for (iter
= ca
; iter
; iter
= iter
->next
) {
1695 const char *saved_b1
, *saved_b2
;
1698 * When the merge fails, the result contains files
1699 * with conflict markers. The cleanness flag is
1700 * ignored, it was never actually used, as result of
1701 * merge_trees has always overwritten it: the committed
1702 * "conflicts" were already resolved.
1705 saved_b1
= o
->branch1
;
1706 saved_b2
= o
->branch2
;
1707 o
->branch1
= "Temporary merge branch 1";
1708 o
->branch2
= "Temporary merge branch 2";
1709 merge_recursive(o
, merged_common_ancestors
, iter
->item
,
1710 NULL
, &merged_common_ancestors
);
1711 o
->branch1
= saved_b1
;
1712 o
->branch2
= saved_b2
;
1715 if (!merged_common_ancestors
)
1716 die("merge returned no commit");
1723 o
->ancestor
= "merged common ancestors";
1724 clean
= merge_trees(o
, h1
->tree
, h2
->tree
, merged_common_ancestors
->tree
,
1727 if (o
->call_depth
) {
1728 *result
= make_virtual_commit(mrtree
, "merged tree");
1729 commit_list_insert(h1
, &(*result
)->parents
);
1730 commit_list_insert(h2
, &(*result
)->parents
->next
);
1734 diff_warn_rename_limit("merge.renamelimit",
1735 o
->needed_rename_limit
, 0);
1739 static struct commit
*get_ref(const unsigned char *sha1
, const char *name
)
1741 struct object
*object
;
1743 object
= deref_tag(parse_object(sha1
), name
, strlen(name
));
1746 if (object
->type
== OBJ_TREE
)
1747 return make_virtual_commit((struct tree
*)object
, name
);
1748 if (object
->type
!= OBJ_COMMIT
)
1750 if (parse_commit((struct commit
*)object
))
1752 return (struct commit
*)object
;
1755 int merge_recursive_generic(struct merge_options
*o
,
1756 const unsigned char *head
,
1757 const unsigned char *merge
,
1759 const unsigned char **base_list
,
1760 struct commit
**result
)
1762 int clean
, index_fd
;
1763 struct lock_file
*lock
= xcalloc(1, sizeof(struct lock_file
));
1764 struct commit
*head_commit
= get_ref(head
, o
->branch1
);
1765 struct commit
*next_commit
= get_ref(merge
, o
->branch2
);
1766 struct commit_list
*ca
= NULL
;
1770 for (i
= 0; i
< num_base_list
; ++i
) {
1771 struct commit
*base
;
1772 if (!(base
= get_ref(base_list
[i
], sha1_to_hex(base_list
[i
]))))
1773 return error("Could not parse object '%s'",
1774 sha1_to_hex(base_list
[i
]));
1775 commit_list_insert(base
, &ca
);
1779 index_fd
= hold_locked_index(lock
, 1);
1780 clean
= merge_recursive(o
, head_commit
, next_commit
, ca
,
1782 if (active_cache_changed
&&
1783 (write_cache(index_fd
, active_cache
, active_nr
) ||
1784 commit_locked_index(lock
)))
1785 return error("Unable to write index.");
1787 return clean
? 0 : 1;
1790 static int merge_recursive_config(const char *var
, const char *value
, void *cb
)
1792 struct merge_options
*o
= cb
;
1793 if (!strcmp(var
, "merge.verbosity")) {
1794 o
->verbosity
= git_config_int(var
, value
);
1797 if (!strcmp(var
, "diff.renamelimit")) {
1798 o
->diff_rename_limit
= git_config_int(var
, value
);
1801 if (!strcmp(var
, "merge.renamelimit")) {
1802 o
->merge_rename_limit
= git_config_int(var
, value
);
1805 return git_xmerge_config(var
, value
, cb
);
1808 void init_merge_options(struct merge_options
*o
)
1810 memset(o
, 0, sizeof(struct merge_options
));
1812 o
->buffer_output
= 1;
1813 o
->diff_rename_limit
= -1;
1814 o
->merge_rename_limit
= -1;
1816 git_config(merge_recursive_config
, o
);
1817 if (getenv("GIT_MERGE_VERBOSITY"))
1819 strtol(getenv("GIT_MERGE_VERBOSITY"), NULL
, 10);
1820 if (o
->verbosity
>= 5)
1821 o
->buffer_output
= 0;
1822 strbuf_init(&o
->obuf
, 0);
1823 memset(&o
->current_file_set
, 0, sizeof(struct string_list
));
1824 o
->current_file_set
.strdup_strings
= 1;
1825 memset(&o
->current_directory_set
, 0, sizeof(struct string_list
));
1826 o
->current_directory_set
.strdup_strings
= 1;
1827 memset(&o
->df_conflict_file_set
, 0, sizeof(struct string_list
));
1828 o
->df_conflict_file_set
.strdup_strings
= 1;
1831 int parse_merge_opt(struct merge_options
*o
, const char *s
)
1835 if (!strcmp(s
, "ours"))
1836 o
->recursive_variant
= MERGE_RECURSIVE_OURS
;
1837 else if (!strcmp(s
, "theirs"))
1838 o
->recursive_variant
= MERGE_RECURSIVE_THEIRS
;
1839 else if (!strcmp(s
, "subtree"))
1840 o
->subtree_shift
= "";
1841 else if (!prefixcmp(s
, "subtree="))
1842 o
->subtree_shift
= s
+ strlen("subtree=");
1843 else if (!strcmp(s
, "patience"))
1844 o
->xdl_opts
|= XDF_PATIENCE_DIFF
;
1845 else if (!strcmp(s
, "ignore-space-change"))
1846 o
->xdl_opts
|= XDF_IGNORE_WHITESPACE_CHANGE
;
1847 else if (!strcmp(s
, "ignore-all-space"))
1848 o
->xdl_opts
|= XDF_IGNORE_WHITESPACE
;
1849 else if (!strcmp(s
, "ignore-space-at-eol"))
1850 o
->xdl_opts
|= XDF_IGNORE_WHITESPACE_AT_EOL
;
1851 else if (!strcmp(s
, "renormalize"))
1853 else if (!strcmp(s
, "no-renormalize"))
1855 else if (!prefixcmp(s
, "rename-threshold=")) {
1856 const char *score
= s
+ strlen("rename-threshold=");
1857 if ((o
->rename_score
= parse_rename_score(&score
)) == -1 || *score
!= 0)