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
;
93 unsigned involved_in_rename
:1;
96 static inline void setup_rename_df_conflict_info(enum rename_type rename_type
,
97 struct diff_filepair
*pair1
,
98 struct diff_filepair
*pair2
,
101 struct stage_data
*dst_entry1
,
102 struct stage_data
*dst_entry2
)
104 struct rename_df_conflict_info
*ci
= xcalloc(1, sizeof(struct rename_df_conflict_info
));
105 ci
->rename_type
= rename_type
;
107 ci
->branch1
= branch1
;
108 ci
->branch2
= branch2
;
110 ci
->dst_entry1
= dst_entry1
;
111 dst_entry1
->rename_df_conflict_info
= ci
;
112 dst_entry1
->processed
= 0;
114 assert(!pair2
== !dst_entry2
);
116 ci
->dst_entry2
= dst_entry2
;
118 dst_entry2
->rename_df_conflict_info
= ci
;
119 dst_entry2
->processed
= 0;
123 static int show(struct merge_options
*o
, int v
)
125 return (!o
->call_depth
&& o
->verbosity
>= v
) || o
->verbosity
>= 5;
128 static void flush_output(struct merge_options
*o
)
131 fputs(o
->obuf
.buf
, stdout
);
132 strbuf_reset(&o
->obuf
);
136 __attribute__((format (printf
, 3, 4)))
137 static void output(struct merge_options
*o
, int v
, const char *fmt
, ...)
144 strbuf_grow(&o
->obuf
, o
->call_depth
* 2 + 2);
145 memset(o
->obuf
.buf
+ o
->obuf
.len
, ' ', o
->call_depth
* 2);
146 strbuf_setlen(&o
->obuf
, o
->obuf
.len
+ o
->call_depth
* 2);
149 strbuf_vaddf(&o
->obuf
, fmt
, ap
);
152 strbuf_add(&o
->obuf
, "\n", 1);
153 if (!o
->buffer_output
)
157 static void output_commit_title(struct merge_options
*o
, struct commit
*commit
)
161 for (i
= o
->call_depth
; i
--;)
164 printf("virtual %s\n", (char *)commit
->util
);
166 printf("%s ", find_unique_abbrev(commit
->object
.sha1
, DEFAULT_ABBREV
));
167 if (parse_commit(commit
) != 0)
168 printf("(bad commit)\n");
171 int len
= find_commit_subject(commit
->buffer
, &title
);
173 printf("%.*s\n", len
, title
);
178 static int add_cacheinfo(unsigned int mode
, const unsigned char *sha1
,
179 const char *path
, int stage
, int refresh
, int options
)
181 struct cache_entry
*ce
;
182 ce
= make_cache_entry(mode
, sha1
? sha1
: null_sha1
, path
, stage
, refresh
);
184 return error("addinfo_cache failed for path '%s'", path
);
185 return add_cache_entry(ce
, options
);
188 static void init_tree_desc_from_tree(struct tree_desc
*desc
, struct tree
*tree
)
191 init_tree_desc(desc
, tree
->buffer
, tree
->size
);
194 static int git_merge_trees(int index_only
,
200 struct tree_desc t
[3];
201 struct unpack_trees_options opts
;
203 memset(&opts
, 0, sizeof(opts
));
210 opts
.fn
= threeway_merge
;
211 opts
.src_index
= &the_index
;
212 opts
.dst_index
= &the_index
;
213 setup_unpack_trees_porcelain(&opts
, "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 struct tree
*write_tree_from_memory(struct merge_options
*o
)
226 struct tree
*result
= NULL
;
228 if (unmerged_cache()) {
230 fprintf(stderr
, "BUG: There are unmerged index entries:\n");
231 for (i
= 0; i
< active_nr
; i
++) {
232 struct cache_entry
*ce
= active_cache
[i
];
234 fprintf(stderr
, "BUG: %d %.*s\n", ce_stage(ce
),
235 (int)ce_namelen(ce
), ce
->name
);
237 die("Bug in merge-recursive.c");
240 if (!active_cache_tree
)
241 active_cache_tree
= cache_tree();
243 if (!cache_tree_fully_valid(active_cache_tree
) &&
244 cache_tree_update(active_cache_tree
,
245 active_cache
, active_nr
, 0, 0) < 0)
246 die("error building trees");
248 result
= lookup_tree(active_cache_tree
->sha1
);
253 static int save_files_dirs(const unsigned char *sha1
,
254 const char *base
, int baselen
, const char *path
,
255 unsigned int mode
, int stage
, void *context
)
257 int len
= strlen(path
);
258 char *newpath
= xmalloc(baselen
+ len
+ 1);
259 struct merge_options
*o
= context
;
261 memcpy(newpath
, base
, baselen
);
262 memcpy(newpath
+ baselen
, path
, len
);
263 newpath
[baselen
+ len
] = '\0';
266 string_list_insert(&o
->current_directory_set
, newpath
);
268 string_list_insert(&o
->current_file_set
, newpath
);
271 return (S_ISDIR(mode
) ? READ_TREE_RECURSIVE
: 0);
274 static int get_files_dirs(struct merge_options
*o
, struct tree
*tree
)
277 if (read_tree_recursive(tree
, "", 0, 0, NULL
, save_files_dirs
, o
))
279 n
= o
->current_file_set
.nr
+ o
->current_directory_set
.nr
;
284 * Returns an index_entry instance which doesn't have to correspond to
285 * a real cache entry in Git's index.
287 static struct stage_data
*insert_stage_data(const char *path
,
288 struct tree
*o
, struct tree
*a
, struct tree
*b
,
289 struct string_list
*entries
)
291 struct string_list_item
*item
;
292 struct stage_data
*e
= xcalloc(1, sizeof(struct stage_data
));
293 get_tree_entry(o
->object
.sha1
, path
,
294 e
->stages
[1].sha
, &e
->stages
[1].mode
);
295 get_tree_entry(a
->object
.sha1
, path
,
296 e
->stages
[2].sha
, &e
->stages
[2].mode
);
297 get_tree_entry(b
->object
.sha1
, path
,
298 e
->stages
[3].sha
, &e
->stages
[3].mode
);
299 item
= string_list_insert(entries
, path
);
305 * Create a dictionary mapping file names to stage_data objects. The
306 * dictionary contains one entry for every path with a non-zero stage entry.
308 static struct string_list
*get_unmerged(void)
310 struct string_list
*unmerged
= xcalloc(1, sizeof(struct string_list
));
313 unmerged
->strdup_strings
= 1;
315 for (i
= 0; i
< active_nr
; i
++) {
316 struct string_list_item
*item
;
317 struct stage_data
*e
;
318 struct cache_entry
*ce
= active_cache
[i
];
322 item
= string_list_lookup(unmerged
, ce
->name
);
324 item
= string_list_insert(unmerged
, ce
->name
);
325 item
->util
= xcalloc(1, sizeof(struct stage_data
));
328 e
->stages
[ce_stage(ce
)].mode
= ce
->ce_mode
;
329 hashcpy(e
->stages
[ce_stage(ce
)].sha
, ce
->sha1
);
335 static int string_list_df_name_compare(const void *a
, const void *b
)
337 const struct string_list_item
*one
= a
;
338 const struct string_list_item
*two
= b
;
339 int onelen
= strlen(one
->string
);
340 int twolen
= strlen(two
->string
);
342 * Here we only care that entries for D/F conflicts are
343 * adjacent, in particular with the file of the D/F conflict
344 * appearing before files below the corresponding directory.
345 * The order of the rest of the list is irrelevant for us.
347 * To achieve this, we sort with df_name_compare and provide
348 * the mode S_IFDIR so that D/F conflicts will sort correctly.
349 * We use the mode S_IFDIR for everything else for simplicity,
350 * since in other cases any changes in their order due to
351 * sorting cause no problems for us.
353 int cmp
= df_name_compare(one
->string
, onelen
, S_IFDIR
,
354 two
->string
, twolen
, S_IFDIR
);
356 * Now that 'foo' and 'foo/bar' compare equal, we have to make sure
357 * that 'foo' comes before 'foo/bar'.
361 return onelen
- twolen
;
364 static void record_df_conflict_files(struct merge_options
*o
,
365 struct string_list
*entries
)
367 /* If there is a D/F conflict and the file for such a conflict
368 * currently exist in the working copy, we want to allow it to
369 * be removed to make room for the corresponding directory if
370 * needed. The files underneath the directories of such D/F
371 * conflicts will be handled in process_entry(), while the
372 * files of such D/F conflicts will be processed later in
373 * process_df_entry(). If the corresponding directory ends up
374 * being removed by the merge, then no additional work needs
375 * to be done by process_df_entry() for the conflicting file.
376 * If the directory needs to be written to the working copy,
377 * then the conflicting file will simply be removed (e.g. in
378 * make_room_for_path). If the directory is written to the
379 * working copy but the file also has a conflict that needs to
380 * be resolved, then process_df_entry() will reinstate the
381 * file with a new unique name.
383 const char *last_file
= NULL
;
388 * If we're merging merge-bases, we don't want to bother with
389 * any working directory changes.
394 /* Ensure D/F conflicts are adjacent in the entries list. */
395 qsort(entries
->items
, entries
->nr
, sizeof(*entries
->items
),
396 string_list_df_name_compare
);
398 string_list_clear(&o
->df_conflict_file_set
, 1);
399 for (i
= 0; i
< entries
->nr
; i
++) {
400 const char *path
= entries
->items
[i
].string
;
401 int len
= strlen(path
);
402 struct stage_data
*e
= entries
->items
[i
].util
;
405 * Check if last_file & path correspond to a D/F conflict;
406 * i.e. whether path is last_file+'/'+<something>.
407 * If so, record that it's okay to remove last_file to make
408 * room for path and friends if needed.
412 memcmp(path
, last_file
, last_len
) == 0 &&
413 path
[last_len
] == '/') {
414 string_list_insert(&o
->df_conflict_file_set
, last_file
);
418 * Determine whether path could exist as a file in the
419 * working directory as a possible D/F conflict. This
420 * will only occur when it exists in stage 2 as a
423 if (S_ISREG(e
->stages
[2].mode
) || S_ISLNK(e
->stages
[2].mode
)) {
433 struct diff_filepair
*pair
;
434 struct stage_data
*src_entry
;
435 struct stage_data
*dst_entry
;
436 unsigned processed
:1;
440 * Get information of all renames which occurred between 'o_tree' and
441 * 'tree'. We need the three trees in the merge ('o_tree', 'a_tree' and
442 * 'b_tree') to be able to associate the correct cache entries with
443 * the rename information. 'tree' is always equal to either a_tree or b_tree.
445 static struct string_list
*get_renames(struct merge_options
*o
,
450 struct string_list
*entries
)
453 struct string_list
*renames
;
454 struct diff_options opts
;
456 renames
= xcalloc(1, sizeof(struct string_list
));
458 DIFF_OPT_SET(&opts
, RECURSIVE
);
459 opts
.detect_rename
= DIFF_DETECT_RENAME
;
460 opts
.rename_limit
= o
->merge_rename_limit
>= 0 ? o
->merge_rename_limit
:
461 o
->diff_rename_limit
>= 0 ? o
->diff_rename_limit
:
463 opts
.rename_score
= o
->rename_score
;
464 opts
.show_rename_progress
= o
->show_rename_progress
;
465 opts
.output_format
= DIFF_FORMAT_NO_OUTPUT
;
466 if (diff_setup_done(&opts
) < 0)
467 die("diff setup failed");
468 diff_tree_sha1(o_tree
->object
.sha1
, tree
->object
.sha1
, "", &opts
);
470 if (opts
.needed_rename_limit
> o
->needed_rename_limit
)
471 o
->needed_rename_limit
= opts
.needed_rename_limit
;
472 for (i
= 0; i
< diff_queued_diff
.nr
; ++i
) {
473 struct string_list_item
*item
;
475 struct diff_filepair
*pair
= diff_queued_diff
.queue
[i
];
476 if (pair
->status
!= 'R') {
477 diff_free_filepair(pair
);
480 re
= xmalloc(sizeof(*re
));
483 item
= string_list_lookup(entries
, re
->pair
->one
->path
);
485 re
->src_entry
= insert_stage_data(re
->pair
->one
->path
,
486 o_tree
, a_tree
, b_tree
, entries
);
488 re
->src_entry
= item
->util
;
490 item
= string_list_lookup(entries
, re
->pair
->two
->path
);
492 re
->dst_entry
= insert_stage_data(re
->pair
->two
->path
,
493 o_tree
, a_tree
, b_tree
, entries
);
495 re
->dst_entry
= item
->util
;
496 item
= string_list_insert(renames
, pair
->one
->path
);
499 opts
.output_format
= DIFF_FORMAT_NO_OUTPUT
;
500 diff_queued_diff
.nr
= 0;
505 static int update_stages(const char *path
, const struct diff_filespec
*o
,
506 const struct diff_filespec
*a
,
507 const struct diff_filespec
*b
)
510 int options
= ADD_CACHE_OK_TO_ADD
| ADD_CACHE_SKIP_DFCHECK
;
512 if (remove_file_from_cache(path
))
515 if (add_cacheinfo(o
->mode
, o
->sha1
, path
, 1, 0, options
))
518 if (add_cacheinfo(a
->mode
, a
->sha1
, path
, 2, 0, options
))
521 if (add_cacheinfo(b
->mode
, b
->sha1
, path
, 3, 0, options
))
526 static void update_entry(struct stage_data
*entry
,
527 struct diff_filespec
*o
,
528 struct diff_filespec
*a
,
529 struct diff_filespec
*b
)
531 entry
->processed
= 0;
532 entry
->stages
[1].mode
= o
->mode
;
533 entry
->stages
[2].mode
= a
->mode
;
534 entry
->stages
[3].mode
= b
->mode
;
535 hashcpy(entry
->stages
[1].sha
, o
->sha1
);
536 hashcpy(entry
->stages
[2].sha
, a
->sha1
);
537 hashcpy(entry
->stages
[3].sha
, b
->sha1
);
540 static int remove_file(struct merge_options
*o
, int clean
,
541 const char *path
, int no_wd
)
543 int update_cache
= o
->call_depth
|| clean
;
544 int update_working_directory
= !o
->call_depth
&& !no_wd
;
547 if (remove_file_from_cache(path
))
550 if (update_working_directory
) {
551 if (remove_path(path
))
557 static char *unique_path(struct merge_options
*o
, const char *path
, const char *branch
)
559 char *newpath
= xmalloc(strlen(path
) + 1 + strlen(branch
) + 8 + 1);
562 char *p
= newpath
+ strlen(path
);
563 strcpy(newpath
, path
);
569 while (string_list_has_string(&o
->current_file_set
, newpath
) ||
570 string_list_has_string(&o
->current_directory_set
, newpath
) ||
571 lstat(newpath
, &st
) == 0)
572 sprintf(p
, "_%d", suffix
++);
574 string_list_insert(&o
->current_file_set
, newpath
);
578 static void flush_buffer(int fd
, const char *buf
, unsigned long size
)
581 long ret
= write_in_full(fd
, buf
, size
);
586 die_errno("merge-recursive");
588 die("merge-recursive: disk full?");
595 static int dir_in_way(const char *path
, int check_working_copy
)
597 int pos
, pathlen
= strlen(path
);
598 char *dirpath
= xmalloc(pathlen
+ 2);
601 strcpy(dirpath
, path
);
602 dirpath
[pathlen
] = '/';
603 dirpath
[pathlen
+1] = '\0';
605 pos
= cache_name_pos(dirpath
, pathlen
+1);
609 if (pos
< active_nr
&&
610 !strncmp(dirpath
, active_cache
[pos
]->name
, pathlen
+1)) {
616 return check_working_copy
&& !lstat(path
, &st
) && S_ISDIR(st
.st_mode
);
619 static int was_tracked(const char *path
)
621 int pos
= cache_name_pos(path
, strlen(path
));
625 while (pos
< active_nr
&&
626 !strcmp(path
, active_cache
[pos
]->name
)) {
628 * If stage #0, it is definitely tracked.
629 * If it has stage #2 then it was tracked
630 * before this merge started. All other
631 * cases the path was not tracked.
633 switch (ce_stage(active_cache
[pos
])) {
643 static int would_lose_untracked(const char *path
)
645 return !was_tracked(path
) && file_exists(path
);
648 static int make_room_for_path(struct merge_options
*o
, const char *path
)
651 const char *msg
= "failed to create path '%s'%s";
653 /* Unlink any D/F conflict files that are in the way */
654 for (i
= 0; i
< o
->df_conflict_file_set
.nr
; i
++) {
655 const char *df_path
= o
->df_conflict_file_set
.items
[i
].string
;
656 size_t pathlen
= strlen(path
);
657 size_t df_pathlen
= strlen(df_path
);
658 if (df_pathlen
< pathlen
&&
659 path
[df_pathlen
] == '/' &&
660 strncmp(path
, df_path
, df_pathlen
) == 0) {
662 "Removing %s to make room for subdirectory\n",
665 unsorted_string_list_delete_item(&o
->df_conflict_file_set
,
671 /* Make sure leading directories are created */
672 status
= safe_create_leading_directories_const(path
);
675 /* something else exists */
676 error(msg
, path
, ": perhaps a D/F conflict?");
683 * Do not unlink a file in the work tree if we are not
686 if (would_lose_untracked(path
))
687 return error("refusing to lose untracked file at '%s'",
690 /* Successful unlink is good.. */
693 /* .. and so is no existing file */
696 /* .. but not some other error (who really cares what?) */
697 return error(msg
, path
, ": perhaps a D/F conflict?");
700 static void update_file_flags(struct merge_options
*o
,
701 const unsigned char *sha
,
711 enum object_type type
;
715 if (S_ISGITLINK(mode
)) {
717 * We may later decide to recursively descend into
718 * the submodule directory and update its index
719 * and/or work tree, but we do not do that now.
725 buf
= read_sha1_file(sha
, &type
, &size
);
727 die("cannot read object %s '%s'", sha1_to_hex(sha
), path
);
728 if (type
!= OBJ_BLOB
)
729 die("blob expected for %s '%s'", sha1_to_hex(sha
), path
);
731 struct strbuf strbuf
= STRBUF_INIT
;
732 if (convert_to_working_tree(path
, buf
, size
, &strbuf
)) {
735 buf
= strbuf_detach(&strbuf
, NULL
);
739 if (make_room_for_path(o
, path
) < 0) {
744 if (S_ISREG(mode
) || (!has_symlinks
&& S_ISLNK(mode
))) {
750 fd
= open(path
, O_WRONLY
| O_TRUNC
| O_CREAT
, mode
);
752 die_errno("failed to open '%s'", path
);
753 flush_buffer(fd
, buf
, size
);
755 } else if (S_ISLNK(mode
)) {
756 char *lnk
= xmemdupz(buf
, size
);
757 safe_create_leading_directories_const(path
);
759 if (symlink(lnk
, path
))
760 die_errno("failed to symlink '%s'", path
);
763 die("do not know what to do with %06o %s '%s'",
764 mode
, sha1_to_hex(sha
), path
);
769 add_cacheinfo(mode
, sha
, path
, 0, update_wd
, ADD_CACHE_OK_TO_ADD
);
772 static void update_file(struct merge_options
*o
,
774 const unsigned char *sha
,
778 update_file_flags(o
, sha
, mode
, path
, o
->call_depth
|| clean
, !o
->call_depth
);
781 /* Low level file merging, update and removal */
783 struct merge_file_info
{
784 unsigned char sha
[20];
790 static int merge_3way(struct merge_options
*o
,
791 mmbuffer_t
*result_buf
,
792 const struct diff_filespec
*one
,
793 const struct diff_filespec
*a
,
794 const struct diff_filespec
*b
,
798 mmfile_t orig
, src1
, src2
;
799 struct ll_merge_options ll_opts
= {0};
800 char *base_name
, *name1
, *name2
;
803 ll_opts
.renormalize
= o
->renormalize
;
804 ll_opts
.xdl_opts
= o
->xdl_opts
;
807 ll_opts
.virtual_ancestor
= 1;
810 switch (o
->recursive_variant
) {
811 case MERGE_RECURSIVE_OURS
:
812 ll_opts
.variant
= XDL_MERGE_FAVOR_OURS
;
814 case MERGE_RECURSIVE_THEIRS
:
815 ll_opts
.variant
= XDL_MERGE_FAVOR_THEIRS
;
823 if (strcmp(a
->path
, b
->path
) ||
824 (o
->ancestor
!= NULL
&& strcmp(a
->path
, one
->path
) != 0)) {
825 base_name
= o
->ancestor
== NULL
? NULL
:
826 xstrdup(mkpath("%s:%s", o
->ancestor
, one
->path
));
827 name1
= xstrdup(mkpath("%s:%s", branch1
, a
->path
));
828 name2
= xstrdup(mkpath("%s:%s", branch2
, b
->path
));
830 base_name
= o
->ancestor
== NULL
? NULL
:
831 xstrdup(mkpath("%s", o
->ancestor
));
832 name1
= xstrdup(mkpath("%s", branch1
));
833 name2
= xstrdup(mkpath("%s", branch2
));
836 read_mmblob(&orig
, one
->sha1
);
837 read_mmblob(&src1
, a
->sha1
);
838 read_mmblob(&src2
, b
->sha1
);
840 merge_status
= ll_merge(result_buf
, a
->path
, &orig
, base_name
,
841 &src1
, name1
, &src2
, name2
, &ll_opts
);
851 static struct merge_file_info
merge_file(struct merge_options
*o
,
852 const struct diff_filespec
*one
,
853 const struct diff_filespec
*a
,
854 const struct diff_filespec
*b
,
858 struct merge_file_info result
;
862 if ((S_IFMT
& a
->mode
) != (S_IFMT
& b
->mode
)) {
864 if (S_ISREG(a
->mode
)) {
865 result
.mode
= a
->mode
;
866 hashcpy(result
.sha
, a
->sha1
);
868 result
.mode
= b
->mode
;
869 hashcpy(result
.sha
, b
->sha1
);
872 if (!sha_eq(a
->sha1
, one
->sha1
) && !sha_eq(b
->sha1
, one
->sha1
))
878 if (a
->mode
== b
->mode
|| a
->mode
== one
->mode
)
879 result
.mode
= b
->mode
;
881 result
.mode
= a
->mode
;
882 if (b
->mode
!= one
->mode
) {
888 if (sha_eq(a
->sha1
, b
->sha1
) || sha_eq(a
->sha1
, one
->sha1
))
889 hashcpy(result
.sha
, b
->sha1
);
890 else if (sha_eq(b
->sha1
, one
->sha1
))
891 hashcpy(result
.sha
, a
->sha1
);
892 else if (S_ISREG(a
->mode
)) {
893 mmbuffer_t result_buf
;
896 merge_status
= merge_3way(o
, &result_buf
, one
, a
, b
,
899 if ((merge_status
< 0) || !result_buf
.ptr
)
900 die("Failed to execute internal merge");
902 if (write_sha1_file(result_buf
.ptr
, result_buf
.size
,
903 blob_type
, result
.sha
))
904 die("Unable to add %s to database",
907 free(result_buf
.ptr
);
908 result
.clean
= (merge_status
== 0);
909 } else if (S_ISGITLINK(a
->mode
)) {
910 result
.clean
= merge_submodule(result
.sha
, one
->path
, one
->sha1
,
912 } else if (S_ISLNK(a
->mode
)) {
913 hashcpy(result
.sha
, a
->sha1
);
915 if (!sha_eq(a
->sha1
, b
->sha1
))
918 die("unsupported object type in the tree");
925 static void conflict_rename_delete(struct merge_options
*o
,
926 struct diff_filepair
*pair
,
927 const char *rename_branch
,
928 const char *other_branch
)
930 char *dest_name
= pair
->two
->path
;
933 output(o
, 1, "CONFLICT (rename/delete): Rename %s->%s in %s "
935 pair
->one
->path
, pair
->two
->path
, rename_branch
,
938 update_stages(dest_name
, NULL
,
939 rename_branch
== o
->branch1
? pair
->two
: NULL
,
940 rename_branch
== o
->branch1
? NULL
: pair
->two
);
941 if (dir_in_way(dest_name
, !o
->call_depth
)) {
942 dest_name
= unique_path(o
, dest_name
, rename_branch
);
945 update_file(o
, 0, pair
->two
->sha1
, pair
->two
->mode
, dest_name
);
950 static void conflict_rename_rename_1to2(struct merge_options
*o
,
951 struct diff_filepair
*pair1
,
953 struct diff_filepair
*pair2
,
956 /* One file was renamed in both branches, but to different names. */
959 const char *ren1_dst
= pair1
->two
->path
;
960 const char *ren2_dst
= pair2
->two
->path
;
961 const char *dst_name1
= ren1_dst
;
962 const char *dst_name2
= ren2_dst
;
963 if (dir_in_way(ren1_dst
, !o
->call_depth
)) {
964 dst_name1
= del
[delp
++] = unique_path(o
, ren1_dst
, branch1
);
965 output(o
, 1, "%s is a directory in %s adding as %s instead",
966 ren1_dst
, branch2
, dst_name1
);
968 if (dir_in_way(ren2_dst
, !o
->call_depth
)) {
969 dst_name2
= del
[delp
++] = unique_path(o
, ren2_dst
, branch2
);
970 output(o
, 1, "%s is a directory in %s adding as %s instead",
971 ren2_dst
, branch1
, dst_name2
);
974 remove_file_from_cache(dst_name1
);
975 remove_file_from_cache(dst_name2
);
977 * Uncomment to leave the conflicting names in the resulting tree
979 * update_file(o, 0, pair1->two->sha1, pair1->two->mode, dst_name1);
980 * update_file(o, 0, pair2->two->sha1, pair2->two->mode, dst_name2);
983 update_stages(ren1_dst
, NULL
, pair1
->two
, NULL
);
984 update_stages(ren2_dst
, NULL
, NULL
, pair2
->two
);
986 update_file(o
, 0, pair1
->two
->sha1
, pair1
->two
->mode
, dst_name1
);
987 update_file(o
, 0, pair2
->two
->sha1
, pair2
->two
->mode
, dst_name2
);
993 static void conflict_rename_rename_2to1(struct merge_options
*o
,
999 char *path
= ren1
->pair
->two
->path
; /* same as ren2->pair->two->path */
1000 /* Two files were renamed to the same thing. */
1001 if (o
->call_depth
) {
1002 struct merge_file_info mfi
;
1003 struct diff_filespec one
, a
, b
;
1005 one
.path
= a
.path
= b
.path
= path
;
1006 hashcpy(one
.sha1
, null_sha1
);
1008 hashcpy(a
.sha1
, ren1
->pair
->two
->sha1
);
1009 a
.mode
= ren1
->pair
->two
->mode
;
1010 hashcpy(b
.sha1
, ren2
->pair
->two
->sha1
);
1011 b
.mode
= ren2
->pair
->two
->mode
;
1012 mfi
= merge_file(o
, &one
, &a
, &b
, branch1
, branch2
);
1013 output(o
, 1, "Adding merged %s", path
);
1014 update_file(o
, 0, mfi
.sha
, mfi
.mode
, path
);
1016 char *new_path1
= unique_path(o
, path
, branch1
);
1017 char *new_path2
= unique_path(o
, path
, branch2
);
1018 output(o
, 1, "Renaming %s to %s and %s to %s instead",
1019 ren1
->pair
->one
->path
, new_path1
,
1020 ren2
->pair
->one
->path
, new_path2
);
1021 remove_file(o
, 0, path
, 0);
1022 update_file(o
, 0, ren1
->pair
->two
->sha1
, ren1
->pair
->two
->mode
,
1024 update_file(o
, 0, ren2
->pair
->two
->sha1
, ren2
->pair
->two
->mode
,
1031 static int process_renames(struct merge_options
*o
,
1032 struct string_list
*a_renames
,
1033 struct string_list
*b_renames
)
1035 int clean_merge
= 1, i
, j
;
1036 struct string_list a_by_dst
= STRING_LIST_INIT_NODUP
;
1037 struct string_list b_by_dst
= STRING_LIST_INIT_NODUP
;
1038 const struct rename
*sre
;
1040 for (i
= 0; i
< a_renames
->nr
; i
++) {
1041 sre
= a_renames
->items
[i
].util
;
1042 string_list_insert(&a_by_dst
, sre
->pair
->two
->path
)->util
1045 for (i
= 0; i
< b_renames
->nr
; i
++) {
1046 sre
= b_renames
->items
[i
].util
;
1047 string_list_insert(&b_by_dst
, sre
->pair
->two
->path
)->util
1051 for (i
= 0, j
= 0; i
< a_renames
->nr
|| j
< b_renames
->nr
;) {
1052 struct string_list
*renames1
, *renames2Dst
;
1053 struct rename
*ren1
= NULL
, *ren2
= NULL
;
1054 const char *branch1
, *branch2
;
1055 const char *ren1_src
, *ren1_dst
;
1057 if (i
>= a_renames
->nr
) {
1058 ren2
= b_renames
->items
[j
++].util
;
1059 } else if (j
>= b_renames
->nr
) {
1060 ren1
= a_renames
->items
[i
++].util
;
1062 int compare
= strcmp(a_renames
->items
[i
].string
,
1063 b_renames
->items
[j
].string
);
1065 ren1
= a_renames
->items
[i
++].util
;
1067 ren2
= b_renames
->items
[j
++].util
;
1070 /* TODO: refactor, so that 1/2 are not needed */
1072 renames1
= a_renames
;
1073 renames2Dst
= &b_by_dst
;
1074 branch1
= o
->branch1
;
1075 branch2
= o
->branch2
;
1078 renames1
= b_renames
;
1079 renames2Dst
= &a_by_dst
;
1080 branch1
= o
->branch2
;
1081 branch2
= o
->branch1
;
1087 ren1
->dst_entry
->processed
= 1;
1088 /* BUG: We should only mark src_entry as processed if we
1089 * are not dealing with a rename + add-source case.
1091 ren1
->src_entry
->processed
= 1;
1093 if (ren1
->processed
)
1095 ren1
->processed
= 1;
1097 ren1_src
= ren1
->pair
->one
->path
;
1098 ren1_dst
= ren1
->pair
->two
->path
;
1101 const char *ren2_src
= ren2
->pair
->one
->path
;
1102 const char *ren2_dst
= ren2
->pair
->two
->path
;
1103 /* Renamed in 1 and renamed in 2 */
1104 if (strcmp(ren1_src
, ren2_src
) != 0)
1105 die("ren1.src != ren2.src");
1106 ren2
->dst_entry
->processed
= 1;
1107 ren2
->processed
= 1;
1108 if (strcmp(ren1_dst
, ren2_dst
) != 0) {
1109 setup_rename_df_conflict_info(RENAME_ONE_FILE_TO_TWO
,
1117 /* BUG: We should only remove ren1_src in
1118 * the base stage (think of rename +
1119 * add-source cases).
1121 remove_file(o
, 1, ren1_src
, 1);
1122 update_entry(ren1
->dst_entry
,
1126 ren1
->dst_entry
->involved_in_rename
= 1;
1129 /* Renamed in 1, maybe changed in 2 */
1130 struct string_list_item
*item
;
1131 /* we only use sha1 and mode of these */
1132 struct diff_filespec src_other
, dst_other
;
1136 * unpack_trees loads entries from common-commit
1137 * into stage 1, from head-commit into stage 2, and
1138 * from merge-commit into stage 3. We keep track
1139 * of which side corresponds to the rename.
1141 int renamed_stage
= a_renames
== renames1
? 2 : 3;
1142 int other_stage
= a_renames
== renames1
? 3 : 2;
1144 /* BUG: We should only remove ren1_src in the base
1145 * stage and in other_stage (think of rename +
1148 remove_file(o
, 1, ren1_src
,
1149 renamed_stage
== 2 || !was_tracked(ren1_src
));
1151 hashcpy(src_other
.sha1
, ren1
->src_entry
->stages
[other_stage
].sha
);
1152 src_other
.mode
= ren1
->src_entry
->stages
[other_stage
].mode
;
1153 hashcpy(dst_other
.sha1
, ren1
->dst_entry
->stages
[other_stage
].sha
);
1154 dst_other
.mode
= ren1
->dst_entry
->stages
[other_stage
].mode
;
1157 if (sha_eq(src_other
.sha1
, null_sha1
)) {
1158 if (dir_in_way(ren1_dst
, 0 /*check_wc*/)) {
1159 ren1
->dst_entry
->processed
= 0;
1160 setup_rename_df_conflict_info(RENAME_DELETE
,
1169 conflict_rename_delete(o
, ren1
->pair
, branch1
, branch2
);
1171 } else if ((item
= string_list_lookup(renames2Dst
, ren1_dst
))) {
1172 char *ren2_src
, *ren2_dst
;
1174 ren2_src
= ren2
->pair
->one
->path
;
1175 ren2_dst
= ren2
->pair
->two
->path
;
1178 ren2
->processed
= 1;
1179 remove_file(o
, 1, ren2_src
,
1180 renamed_stage
== 3 || would_lose_untracked(ren1_src
));
1182 output(o
, 1, "CONFLICT (rename/rename): "
1183 "Rename %s->%s in %s. "
1184 "Rename %s->%s in %s",
1185 ren1_src
, ren1_dst
, branch1
,
1186 ren2_src
, ren2_dst
, branch2
);
1187 conflict_rename_rename_2to1(o
, ren1
, branch1
, ren2
, branch2
);
1188 } else if ((dst_other
.mode
== ren1
->pair
->two
->mode
) &&
1189 sha_eq(dst_other
.sha1
, ren1
->pair
->two
->sha1
)) {
1190 /* Added file on the other side
1191 identical to the file being
1192 renamed: clean merge */
1193 update_file(o
, 1, ren1
->pair
->two
->sha1
, ren1
->pair
->two
->mode
, ren1_dst
);
1194 } else if (!sha_eq(dst_other
.sha1
, null_sha1
)) {
1197 output(o
, 1, "CONFLICT (rename/add): Rename %s->%s in %s. "
1199 ren1_src
, ren1_dst
, branch1
,
1201 if (o
->call_depth
) {
1202 struct merge_file_info mfi
;
1203 struct diff_filespec one
, a
, b
;
1205 one
.path
= a
.path
= b
.path
=
1207 hashcpy(one
.sha1
, null_sha1
);
1209 hashcpy(a
.sha1
, ren1
->pair
->two
->sha1
);
1210 a
.mode
= ren1
->pair
->two
->mode
;
1211 hashcpy(b
.sha1
, dst_other
.sha1
);
1212 b
.mode
= dst_other
.mode
;
1213 mfi
= merge_file(o
, &one
, &a
, &b
,
1216 output(o
, 1, "Adding merged %s", ren1_dst
);
1223 char *new_path
= unique_path(o
, ren1_dst
, branch2
);
1224 output(o
, 1, "Adding as %s instead", new_path
);
1225 update_file(o
, 0, dst_other
.sha1
, dst_other
.mode
, new_path
);
1232 struct diff_filespec
*one
, *a
, *b
;
1233 src_other
.path
= (char *)ren1_src
;
1235 one
= ren1
->pair
->one
;
1236 if (a_renames
== renames1
) {
1237 a
= ren1
->pair
->two
;
1240 b
= ren1
->pair
->two
;
1243 update_entry(ren1
->dst_entry
, one
, a
, b
);
1244 ren1
->dst_entry
->involved_in_rename
= 1;
1245 if (dir_in_way(ren1_dst
, 0 /*check_wc*/)) {
1246 setup_rename_df_conflict_info(RENAME_NORMAL
,
1257 string_list_clear(&a_by_dst
, 0);
1258 string_list_clear(&b_by_dst
, 0);
1263 static unsigned char *stage_sha(const unsigned char *sha
, unsigned mode
)
1265 return (is_null_sha1(sha
) || mode
== 0) ? NULL
: (unsigned char *)sha
;
1268 static int read_sha1_strbuf(const unsigned char *sha1
, struct strbuf
*dst
)
1271 enum object_type type
;
1273 buf
= read_sha1_file(sha1
, &type
, &size
);
1275 return error("cannot read object %s", sha1_to_hex(sha1
));
1276 if (type
!= OBJ_BLOB
) {
1278 return error("object %s is not a blob", sha1_to_hex(sha1
));
1280 strbuf_attach(dst
, buf
, size
, size
+ 1);
1284 static int blob_unchanged(const unsigned char *o_sha
,
1285 const unsigned char *a_sha
,
1286 int renormalize
, const char *path
)
1288 struct strbuf o
= STRBUF_INIT
;
1289 struct strbuf a
= STRBUF_INIT
;
1290 int ret
= 0; /* assume changed for safety */
1292 if (sha_eq(o_sha
, a_sha
))
1297 assert(o_sha
&& a_sha
);
1298 if (read_sha1_strbuf(o_sha
, &o
) || read_sha1_strbuf(a_sha
, &a
))
1301 * Note: binary | is used so that both renormalizations are
1302 * performed. Comparison can be skipped if both files are
1303 * unchanged since their sha1s have already been compared.
1305 if (renormalize_buffer(path
, o
.buf
, o
.len
, &o
) |
1306 renormalize_buffer(path
, a
.buf
, o
.len
, &a
))
1307 ret
= (o
.len
== a
.len
&& !memcmp(o
.buf
, a
.buf
, o
.len
));
1315 static void handle_delete_modify(struct merge_options
*o
,
1317 const char *new_path
,
1318 unsigned char *a_sha
, int a_mode
,
1319 unsigned char *b_sha
, int b_mode
)
1322 output(o
, 1, "CONFLICT (delete/modify): %s deleted in %s "
1323 "and modified in %s. Version %s of %s left in tree%s%s.",
1325 o
->branch2
, o
->branch2
, path
,
1326 path
== new_path
? "" : " at ",
1327 path
== new_path
? "" : new_path
);
1328 update_file(o
, 0, b_sha
, b_mode
, new_path
);
1330 output(o
, 1, "CONFLICT (delete/modify): %s deleted in %s "
1331 "and modified in %s. Version %s of %s left in tree%s%s.",
1333 o
->branch1
, o
->branch1
, path
,
1334 path
== new_path
? "" : " at ",
1335 path
== new_path
? "" : new_path
);
1336 update_file(o
, 0, a_sha
, a_mode
, new_path
);
1340 static int merge_content(struct merge_options
*o
,
1341 unsigned involved_in_rename
,
1343 unsigned char *o_sha
, int o_mode
,
1344 unsigned char *a_sha
, int a_mode
,
1345 unsigned char *b_sha
, int b_mode
,
1346 const char *df_rename_conflict_branch
)
1348 const char *reason
= "content";
1349 struct merge_file_info mfi
;
1350 struct diff_filespec one
, a
, b
;
1351 unsigned df_conflict_remains
= 0;
1355 o_sha
= (unsigned char *)null_sha1
;
1357 one
.path
= a
.path
= b
.path
= (char *)path
;
1358 hashcpy(one
.sha1
, o_sha
);
1360 hashcpy(a
.sha1
, a_sha
);
1362 hashcpy(b
.sha1
, b_sha
);
1365 mfi
= merge_file(o
, &one
, &a
, &b
, o
->branch1
, o
->branch2
);
1366 if (df_rename_conflict_branch
&&
1367 dir_in_way(path
, !o
->call_depth
)) {
1368 df_conflict_remains
= 1;
1371 if (mfi
.clean
&& !df_conflict_remains
&&
1372 sha_eq(mfi
.sha
, a_sha
) && mfi
.mode
== a
.mode
)
1373 output(o
, 3, "Skipped %s (merged same as existing)", path
);
1375 output(o
, 2, "Auto-merging %s", path
);
1378 if (S_ISGITLINK(mfi
.mode
))
1379 reason
= "submodule";
1380 output(o
, 1, "CONFLICT (%s): Merge conflict in %s",
1382 if (involved_in_rename
&& !df_conflict_remains
)
1383 update_stages(path
, &one
, &a
, &b
);
1386 if (df_conflict_remains
) {
1388 if (o
->call_depth
) {
1389 remove_file_from_cache(path
);
1392 update_stages(path
, &one
, &a
, &b
);
1394 int file_from_stage2
= was_tracked(path
);
1395 struct diff_filespec merged
;
1396 hashcpy(merged
.sha1
, mfi
.sha
);
1397 merged
.mode
= mfi
.mode
;
1399 update_stages(path
, NULL
,
1400 file_from_stage2
? &merged
: NULL
,
1401 file_from_stage2
? NULL
: &merged
);
1405 new_path
= unique_path(o
, path
, df_rename_conflict_branch
);
1406 output(o
, 1, "Adding as %s instead", new_path
);
1407 update_file(o
, 0, mfi
.sha
, mfi
.mode
, new_path
);
1411 update_file(o
, mfi
.clean
, mfi
.sha
, mfi
.mode
, path
);
1417 /* Per entry merge function */
1418 static int process_entry(struct merge_options
*o
,
1419 const char *path
, struct stage_data
*entry
)
1422 printf("processing entry, clean cache: %s\n", index_only ? "yes": "no");
1423 print_index_entry("\tpath: ", entry);
1425 int clean_merge
= 1;
1426 int normalize
= o
->renormalize
;
1427 unsigned o_mode
= entry
->stages
[1].mode
;
1428 unsigned a_mode
= entry
->stages
[2].mode
;
1429 unsigned b_mode
= entry
->stages
[3].mode
;
1430 unsigned char *o_sha
= stage_sha(entry
->stages
[1].sha
, o_mode
);
1431 unsigned char *a_sha
= stage_sha(entry
->stages
[2].sha
, a_mode
);
1432 unsigned char *b_sha
= stage_sha(entry
->stages
[3].sha
, b_mode
);
1434 if (entry
->rename_df_conflict_info
)
1435 return 1; /* Such cases are handled elsewhere. */
1437 entry
->processed
= 1;
1438 if (o_sha
&& (!a_sha
|| !b_sha
)) {
1439 /* Case A: Deleted in one */
1440 if ((!a_sha
&& !b_sha
) ||
1441 (!b_sha
&& blob_unchanged(o_sha
, a_sha
, normalize
, path
)) ||
1442 (!a_sha
&& blob_unchanged(o_sha
, b_sha
, normalize
, path
))) {
1443 /* Deleted in both or deleted in one and
1444 * unchanged in the other */
1446 output(o
, 2, "Removing %s", path
);
1447 /* do not touch working file if it did not exist */
1448 remove_file(o
, 1, path
, !a_sha
);
1449 } else if (dir_in_way(path
, 0 /*check_wc*/)) {
1450 entry
->processed
= 0;
1451 return 1; /* Assume clean until processed */
1453 /* Deleted in one and changed in the other */
1455 handle_delete_modify(o
, path
, path
,
1456 a_sha
, a_mode
, b_sha
, b_mode
);
1459 } else if ((!o_sha
&& a_sha
&& !b_sha
) ||
1460 (!o_sha
&& !a_sha
&& b_sha
)) {
1461 /* Case B: Added in one. */
1463 const unsigned char *sha
;
1472 if (dir_in_way(path
, 0 /*check_wc*/)) {
1473 /* Handle D->F conflicts after all subfiles */
1474 entry
->processed
= 0;
1475 return 1; /* Assume clean until processed */
1477 output(o
, 2, "Adding %s", path
);
1478 update_file(o
, 1, sha
, mode
, path
);
1480 } else if (a_sha
&& b_sha
) {
1481 /* Case C: Added in both (check for same permissions) and */
1482 /* case D: Modified in both, but differently. */
1483 clean_merge
= merge_content(o
, entry
->involved_in_rename
, path
,
1484 o_sha
, o_mode
, a_sha
, a_mode
, b_sha
, b_mode
,
1486 } else if (!o_sha
&& !a_sha
&& !b_sha
) {
1488 * this entry was deleted altogether. a_mode == 0 means
1489 * we had that path and want to actively remove it.
1491 remove_file(o
, 1, path
, !a_mode
);
1493 die("Fatal merge failure, shouldn't happen.");
1499 * Per entry merge function for D/F (and/or rename) conflicts. In the
1500 * cases we can cleanly resolve D/F conflicts, process_entry() can
1501 * clean out all the files below the directory for us. All D/F
1502 * conflict cases must be handled here at the end to make sure any
1503 * directories that can be cleaned out, are.
1505 * Some rename conflicts may also be handled here that don't necessarily
1506 * involve D/F conflicts, since the code to handle them is generic enough
1507 * to handle those rename conflicts with or without D/F conflicts also
1510 static int process_df_entry(struct merge_options
*o
,
1511 const char *path
, struct stage_data
*entry
)
1513 int clean_merge
= 1;
1514 unsigned o_mode
= entry
->stages
[1].mode
;
1515 unsigned a_mode
= entry
->stages
[2].mode
;
1516 unsigned b_mode
= entry
->stages
[3].mode
;
1517 unsigned char *o_sha
= stage_sha(entry
->stages
[1].sha
, o_mode
);
1518 unsigned char *a_sha
= stage_sha(entry
->stages
[2].sha
, a_mode
);
1519 unsigned char *b_sha
= stage_sha(entry
->stages
[3].sha
, b_mode
);
1521 entry
->processed
= 1;
1522 if (entry
->rename_df_conflict_info
) {
1523 struct rename_df_conflict_info
*conflict_info
= entry
->rename_df_conflict_info
;
1525 switch (conflict_info
->rename_type
) {
1527 clean_merge
= merge_content(o
, entry
->involved_in_rename
, path
,
1528 o_sha
, o_mode
, a_sha
, a_mode
, b_sha
, b_mode
,
1529 conflict_info
->branch1
);
1533 conflict_rename_delete(o
, conflict_info
->pair1
,
1534 conflict_info
->branch1
,
1535 conflict_info
->branch2
);
1537 case RENAME_ONE_FILE_TO_TWO
:
1538 src
= conflict_info
->pair1
->one
->path
;
1540 output(o
, 1, "CONFLICT (rename/rename): "
1541 "Rename \"%s\"->\"%s\" in branch \"%s\" "
1542 "rename \"%s\"->\"%s\" in \"%s\"%s",
1543 src
, conflict_info
->pair1
->two
->path
, conflict_info
->branch1
,
1544 src
, conflict_info
->pair2
->two
->path
, conflict_info
->branch2
,
1545 o
->call_depth
? " (left unresolved)" : "");
1546 if (o
->call_depth
) {
1547 remove_file_from_cache(src
);
1548 update_file(o
, 0, conflict_info
->pair1
->one
->sha1
,
1549 conflict_info
->pair1
->one
->mode
, src
);
1551 conflict_rename_rename_1to2(o
, conflict_info
->pair1
,
1552 conflict_info
->branch1
,
1553 conflict_info
->pair2
,
1554 conflict_info
->branch2
);
1555 conflict_info
->dst_entry2
->processed
= 1;
1558 entry
->processed
= 0;
1561 } else if (o_sha
&& (!a_sha
|| !b_sha
)) {
1562 /* Modify/delete; deleted side may have put a directory in the way */
1563 char *renamed
= NULL
;
1564 if (dir_in_way(path
, !o
->call_depth
)) {
1565 renamed
= unique_path(o
, path
, a_sha
? o
->branch1
: o
->branch2
);
1568 handle_delete_modify(o
, path
, renamed
? renamed
: path
,
1569 a_sha
, a_mode
, b_sha
, b_mode
);
1571 } else if (!o_sha
&& !!a_sha
!= !!b_sha
) {
1572 /* directory -> (directory, file) or <nothing> -> (directory, file) */
1573 const char *add_branch
;
1574 const char *other_branch
;
1576 const unsigned char *sha
;
1580 add_branch
= o
->branch1
;
1581 other_branch
= o
->branch2
;
1584 conf
= "file/directory";
1586 add_branch
= o
->branch2
;
1587 other_branch
= o
->branch1
;
1590 conf
= "directory/file";
1592 if (dir_in_way(path
, !o
->call_depth
)) {
1593 char *new_path
= unique_path(o
, path
, add_branch
);
1595 output(o
, 1, "CONFLICT (%s): There is a directory with name %s in %s. "
1597 conf
, path
, other_branch
, path
, new_path
);
1599 remove_file_from_cache(path
);
1600 update_file(o
, 0, sha
, mode
, new_path
);
1602 remove_file_from_cache(path
);
1605 output(o
, 2, "Adding %s", path
);
1606 update_file(o
, 1, sha
, mode
, path
);
1609 entry
->processed
= 0;
1610 return 1; /* not handled; assume clean until processed */
1616 int merge_trees(struct merge_options
*o
,
1619 struct tree
*common
,
1620 struct tree
**result
)
1624 if (o
->subtree_shift
) {
1625 merge
= shift_tree_object(head
, merge
, o
->subtree_shift
);
1626 common
= shift_tree_object(head
, common
, o
->subtree_shift
);
1629 if (sha_eq(common
->object
.sha1
, merge
->object
.sha1
)) {
1630 output(o
, 0, "Already up-to-date!");
1635 code
= git_merge_trees(o
->call_depth
, common
, head
, merge
);
1638 if (show(o
, 4) || o
->call_depth
)
1639 die("merging of trees %s and %s failed",
1640 sha1_to_hex(head
->object
.sha1
),
1641 sha1_to_hex(merge
->object
.sha1
));
1646 if (unmerged_cache()) {
1647 struct string_list
*entries
, *re_head
, *re_merge
;
1649 string_list_clear(&o
->current_file_set
, 1);
1650 string_list_clear(&o
->current_directory_set
, 1);
1651 get_files_dirs(o
, head
);
1652 get_files_dirs(o
, merge
);
1654 entries
= get_unmerged();
1655 record_df_conflict_files(o
, entries
);
1656 re_head
= get_renames(o
, head
, common
, head
, merge
, entries
);
1657 re_merge
= get_renames(o
, merge
, common
, head
, merge
, entries
);
1658 clean
= process_renames(o
, re_head
, re_merge
);
1659 for (i
= 0; i
< entries
->nr
; i
++) {
1660 const char *path
= entries
->items
[i
].string
;
1661 struct stage_data
*e
= entries
->items
[i
].util
;
1663 && !process_entry(o
, path
, e
))
1666 for (i
= 0; i
< entries
->nr
; i
++) {
1667 const char *path
= entries
->items
[i
].string
;
1668 struct stage_data
*e
= entries
->items
[i
].util
;
1670 && !process_df_entry(o
, path
, e
))
1673 for (i
= 0; i
< entries
->nr
; i
++) {
1674 struct stage_data
*e
= entries
->items
[i
].util
;
1676 die("Unprocessed path??? %s",
1677 entries
->items
[i
].string
);
1680 string_list_clear(re_merge
, 0);
1681 string_list_clear(re_head
, 0);
1682 string_list_clear(entries
, 1);
1689 *result
= write_tree_from_memory(o
);
1694 static struct commit_list
*reverse_commit_list(struct commit_list
*list
)
1696 struct commit_list
*next
= NULL
, *current
, *backup
;
1697 for (current
= list
; current
; current
= backup
) {
1698 backup
= current
->next
;
1699 current
->next
= next
;
1706 * Merge the commits h1 and h2, return the resulting virtual
1707 * commit object and a flag indicating the cleanness of the merge.
1709 int merge_recursive(struct merge_options
*o
,
1712 struct commit_list
*ca
,
1713 struct commit
**result
)
1715 struct commit_list
*iter
;
1716 struct commit
*merged_common_ancestors
;
1717 struct tree
*mrtree
= mrtree
;
1721 output(o
, 4, "Merging:");
1722 output_commit_title(o
, h1
);
1723 output_commit_title(o
, h2
);
1727 ca
= get_merge_bases(h1
, h2
, 1);
1728 ca
= reverse_commit_list(ca
);
1732 output(o
, 5, "found %u common ancestor(s):", commit_list_count(ca
));
1733 for (iter
= ca
; iter
; iter
= iter
->next
)
1734 output_commit_title(o
, iter
->item
);
1737 merged_common_ancestors
= pop_commit(&ca
);
1738 if (merged_common_ancestors
== NULL
) {
1739 /* if there is no common ancestor, make an empty tree */
1740 struct tree
*tree
= xcalloc(1, sizeof(struct tree
));
1742 tree
->object
.parsed
= 1;
1743 tree
->object
.type
= OBJ_TREE
;
1744 pretend_sha1_file(NULL
, 0, OBJ_TREE
, tree
->object
.sha1
);
1745 merged_common_ancestors
= make_virtual_commit(tree
, "ancestor");
1748 for (iter
= ca
; iter
; iter
= iter
->next
) {
1749 const char *saved_b1
, *saved_b2
;
1752 * When the merge fails, the result contains files
1753 * with conflict markers. The cleanness flag is
1754 * ignored, it was never actually used, as result of
1755 * merge_trees has always overwritten it: the committed
1756 * "conflicts" were already resolved.
1759 saved_b1
= o
->branch1
;
1760 saved_b2
= o
->branch2
;
1761 o
->branch1
= "Temporary merge branch 1";
1762 o
->branch2
= "Temporary merge branch 2";
1763 merge_recursive(o
, merged_common_ancestors
, iter
->item
,
1764 NULL
, &merged_common_ancestors
);
1765 o
->branch1
= saved_b1
;
1766 o
->branch2
= saved_b2
;
1769 if (!merged_common_ancestors
)
1770 die("merge returned no commit");
1777 o
->ancestor
= "merged common ancestors";
1778 clean
= merge_trees(o
, h1
->tree
, h2
->tree
, merged_common_ancestors
->tree
,
1781 if (o
->call_depth
) {
1782 *result
= make_virtual_commit(mrtree
, "merged tree");
1783 commit_list_insert(h1
, &(*result
)->parents
);
1784 commit_list_insert(h2
, &(*result
)->parents
->next
);
1788 diff_warn_rename_limit("merge.renamelimit",
1789 o
->needed_rename_limit
, 0);
1793 static struct commit
*get_ref(const unsigned char *sha1
, const char *name
)
1795 struct object
*object
;
1797 object
= deref_tag(parse_object(sha1
), name
, strlen(name
));
1800 if (object
->type
== OBJ_TREE
)
1801 return make_virtual_commit((struct tree
*)object
, name
);
1802 if (object
->type
!= OBJ_COMMIT
)
1804 if (parse_commit((struct commit
*)object
))
1806 return (struct commit
*)object
;
1809 int merge_recursive_generic(struct merge_options
*o
,
1810 const unsigned char *head
,
1811 const unsigned char *merge
,
1813 const unsigned char **base_list
,
1814 struct commit
**result
)
1816 int clean
, index_fd
;
1817 struct lock_file
*lock
= xcalloc(1, sizeof(struct lock_file
));
1818 struct commit
*head_commit
= get_ref(head
, o
->branch1
);
1819 struct commit
*next_commit
= get_ref(merge
, o
->branch2
);
1820 struct commit_list
*ca
= NULL
;
1824 for (i
= 0; i
< num_base_list
; ++i
) {
1825 struct commit
*base
;
1826 if (!(base
= get_ref(base_list
[i
], sha1_to_hex(base_list
[i
]))))
1827 return error("Could not parse object '%s'",
1828 sha1_to_hex(base_list
[i
]));
1829 commit_list_insert(base
, &ca
);
1833 index_fd
= hold_locked_index(lock
, 1);
1834 clean
= merge_recursive(o
, head_commit
, next_commit
, ca
,
1836 if (active_cache_changed
&&
1837 (write_cache(index_fd
, active_cache
, active_nr
) ||
1838 commit_locked_index(lock
)))
1839 return error("Unable to write index.");
1841 return clean
? 0 : 1;
1844 static int merge_recursive_config(const char *var
, const char *value
, void *cb
)
1846 struct merge_options
*o
= cb
;
1847 if (!strcmp(var
, "merge.verbosity")) {
1848 o
->verbosity
= git_config_int(var
, value
);
1851 if (!strcmp(var
, "diff.renamelimit")) {
1852 o
->diff_rename_limit
= git_config_int(var
, value
);
1855 if (!strcmp(var
, "merge.renamelimit")) {
1856 o
->merge_rename_limit
= git_config_int(var
, value
);
1859 return git_xmerge_config(var
, value
, cb
);
1862 void init_merge_options(struct merge_options
*o
)
1864 memset(o
, 0, sizeof(struct merge_options
));
1866 o
->buffer_output
= 1;
1867 o
->diff_rename_limit
= -1;
1868 o
->merge_rename_limit
= -1;
1870 git_config(merge_recursive_config
, o
);
1871 if (getenv("GIT_MERGE_VERBOSITY"))
1873 strtol(getenv("GIT_MERGE_VERBOSITY"), NULL
, 10);
1874 if (o
->verbosity
>= 5)
1875 o
->buffer_output
= 0;
1876 strbuf_init(&o
->obuf
, 0);
1877 memset(&o
->current_file_set
, 0, sizeof(struct string_list
));
1878 o
->current_file_set
.strdup_strings
= 1;
1879 memset(&o
->current_directory_set
, 0, sizeof(struct string_list
));
1880 o
->current_directory_set
.strdup_strings
= 1;
1881 memset(&o
->df_conflict_file_set
, 0, sizeof(struct string_list
));
1882 o
->df_conflict_file_set
.strdup_strings
= 1;
1885 int parse_merge_opt(struct merge_options
*o
, const char *s
)
1889 if (!strcmp(s
, "ours"))
1890 o
->recursive_variant
= MERGE_RECURSIVE_OURS
;
1891 else if (!strcmp(s
, "theirs"))
1892 o
->recursive_variant
= MERGE_RECURSIVE_THEIRS
;
1893 else if (!strcmp(s
, "subtree"))
1894 o
->subtree_shift
= "";
1895 else if (!prefixcmp(s
, "subtree="))
1896 o
->subtree_shift
= s
+ strlen("subtree=");
1897 else if (!strcmp(s
, "patience"))
1898 o
->xdl_opts
|= XDF_PATIENCE_DIFF
;
1899 else if (!strcmp(s
, "ignore-space-change"))
1900 o
->xdl_opts
|= XDF_IGNORE_WHITESPACE_CHANGE
;
1901 else if (!strcmp(s
, "ignore-all-space"))
1902 o
->xdl_opts
|= XDF_IGNORE_WHITESPACE
;
1903 else if (!strcmp(s
, "ignore-space-at-eol"))
1904 o
->xdl_opts
|= XDF_IGNORE_WHITESPACE_AT_EOL
;
1905 else if (!strcmp(s
, "renormalize"))
1907 else if (!strcmp(s
, "no-renormalize"))
1909 else if (!prefixcmp(s
, "rename-threshold=")) {
1910 const char *score
= s
+ strlen("rename-threshold=");
1911 if ((o
->rename_score
= parse_rename_score(&score
)) == -1 || *score
!= 0)