2 * Recursive Merge algorithm stolen from git-merge-recursive.py by
4 * The thieves were Alex Riesen and Johannes Schindelin, in June/July 2006
9 #include "cache-tree.h"
13 #include "tree-walk.h"
17 #include "unpack-trees.h"
18 #include "string-list.h"
19 #include "xdiff-interface.h"
22 #include "merge-recursive.h"
24 #include "submodule.h"
26 static struct tree
*shift_tree_object(struct tree
*one
, struct tree
*two
,
27 const char *subtree_shift
)
29 struct object_id shifted
;
31 if (!*subtree_shift
) {
32 shift_tree(&one
->object
.oid
, &two
->object
.oid
, &shifted
, 0);
34 shift_tree_by(&one
->object
.oid
, &two
->object
.oid
, &shifted
,
37 if (!oidcmp(&two
->object
.oid
, &shifted
))
39 return lookup_tree(shifted
.hash
);
42 static struct commit
*make_virtual_commit(struct tree
*tree
, const char *comment
)
44 struct commit
*commit
= alloc_commit_node();
45 struct merge_remote_desc
*desc
= xmalloc(sizeof(*desc
));
48 desc
->obj
= (struct object
*)commit
;
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 oid_eq(const struct object_id
*a
, const struct object_id
*b
)
63 return a
&& b
&& oidcmp(a
, b
) == 0;
69 RENAME_ONE_FILE_TO_ONE
,
70 RENAME_ONE_FILE_TO_TWO
,
71 RENAME_TWO_FILES_TO_ONE
74 struct rename_conflict_info
{
75 enum rename_type rename_type
;
76 struct diff_filepair
*pair1
;
77 struct diff_filepair
*pair2
;
80 struct stage_data
*dst_entry1
;
81 struct stage_data
*dst_entry2
;
82 struct diff_filespec ren1_other
;
83 struct diff_filespec ren2_other
;
87 * Since we want to write the index eventually, we cannot reuse the index
88 * for these (temporary) data.
95 struct rename_conflict_info
*rename_conflict_info
;
99 static inline void setup_rename_conflict_info(enum rename_type rename_type
,
100 struct diff_filepair
*pair1
,
101 struct diff_filepair
*pair2
,
104 struct stage_data
*dst_entry1
,
105 struct stage_data
*dst_entry2
,
106 struct merge_options
*o
,
107 struct stage_data
*src_entry1
,
108 struct stage_data
*src_entry2
)
110 struct rename_conflict_info
*ci
= xcalloc(1, sizeof(struct rename_conflict_info
));
111 ci
->rename_type
= rename_type
;
113 ci
->branch1
= branch1
;
114 ci
->branch2
= branch2
;
116 ci
->dst_entry1
= dst_entry1
;
117 dst_entry1
->rename_conflict_info
= ci
;
118 dst_entry1
->processed
= 0;
120 assert(!pair2
== !dst_entry2
);
122 ci
->dst_entry2
= dst_entry2
;
124 dst_entry2
->rename_conflict_info
= ci
;
127 if (rename_type
== RENAME_TWO_FILES_TO_ONE
) {
129 * For each rename, there could have been
130 * modifications on the side of history where that
131 * file was not renamed.
133 int ostage1
= o
->branch1
== branch1
? 3 : 2;
134 int ostage2
= ostage1
^ 1;
136 ci
->ren1_other
.path
= pair1
->one
->path
;
137 oidcpy(&ci
->ren1_other
.oid
, &src_entry1
->stages
[ostage1
].oid
);
138 ci
->ren1_other
.mode
= src_entry1
->stages
[ostage1
].mode
;
140 ci
->ren2_other
.path
= pair2
->one
->path
;
141 oidcpy(&ci
->ren2_other
.oid
, &src_entry2
->stages
[ostage2
].oid
);
142 ci
->ren2_other
.mode
= src_entry2
->stages
[ostage2
].mode
;
146 static int show(struct merge_options
*o
, int v
)
148 return (!o
->call_depth
&& o
->verbosity
>= v
) || o
->verbosity
>= 5;
151 static void flush_output(struct merge_options
*o
)
154 fputs(o
->obuf
.buf
, stdout
);
155 strbuf_reset(&o
->obuf
);
159 __attribute__((format (printf
, 3, 4)))
160 static void output(struct merge_options
*o
, int v
, const char *fmt
, ...)
167 strbuf_addchars(&o
->obuf
, ' ', o
->call_depth
* 2);
170 strbuf_vaddf(&o
->obuf
, fmt
, ap
);
173 strbuf_addch(&o
->obuf
, '\n');
174 if (!o
->buffer_output
)
178 static void output_commit_title(struct merge_options
*o
, struct commit
*commit
)
182 for (i
= o
->call_depth
; i
--;)
185 printf("virtual %s\n", merge_remote_util(commit
)->name
);
187 printf("%s ", find_unique_abbrev(commit
->object
.oid
.hash
, DEFAULT_ABBREV
));
188 if (parse_commit(commit
) != 0)
189 printf(_("(bad commit)\n"));
192 const char *msg
= get_commit_buffer(commit
, NULL
);
193 int len
= find_commit_subject(msg
, &title
);
195 printf("%.*s\n", len
, title
);
196 unuse_commit_buffer(commit
, msg
);
201 static int add_cacheinfo(unsigned int mode
, const struct object_id
*oid
,
202 const char *path
, int stage
, int refresh
, int options
)
204 struct cache_entry
*ce
;
207 ce
= make_cache_entry(mode
, oid
? oid
->hash
: null_sha1
, path
, stage
, 0);
209 return error(_("addinfo_cache failed for path '%s'"), path
);
211 ret
= add_cache_entry(ce
, options
);
213 struct cache_entry
*nce
;
215 nce
= refresh_cache_entry(ce
, CE_MATCH_REFRESH
| CE_MATCH_IGNORE_MISSING
);
217 ret
= add_cache_entry(nce
, options
);
222 static void init_tree_desc_from_tree(struct tree_desc
*desc
, struct tree
*tree
)
225 init_tree_desc(desc
, tree
->buffer
, tree
->size
);
228 static int git_merge_trees(int index_only
,
234 struct tree_desc t
[3];
235 struct unpack_trees_options opts
;
237 memset(&opts
, 0, sizeof(opts
));
244 opts
.fn
= threeway_merge
;
245 opts
.src_index
= &the_index
;
246 opts
.dst_index
= &the_index
;
247 setup_unpack_trees_porcelain(&opts
, "merge");
249 init_tree_desc_from_tree(t
+0, common
);
250 init_tree_desc_from_tree(t
+1, head
);
251 init_tree_desc_from_tree(t
+2, merge
);
253 rc
= unpack_trees(3, t
, &opts
);
254 cache_tree_free(&active_cache_tree
);
258 struct tree
*write_tree_from_memory(struct merge_options
*o
)
260 struct tree
*result
= NULL
;
262 if (unmerged_cache()) {
264 fprintf(stderr
, "BUG: There are unmerged index entries:\n");
265 for (i
= 0; i
< active_nr
; i
++) {
266 const struct cache_entry
*ce
= active_cache
[i
];
268 fprintf(stderr
, "BUG: %d %.*s\n", ce_stage(ce
),
269 (int)ce_namelen(ce
), ce
->name
);
271 die("BUG: unmerged index entries in merge-recursive.c");
274 if (!active_cache_tree
)
275 active_cache_tree
= cache_tree();
277 if (!cache_tree_fully_valid(active_cache_tree
) &&
278 cache_tree_update(&the_index
, 0) < 0) {
279 error(_("error building trees"));
283 result
= lookup_tree(active_cache_tree
->sha1
);
288 static int save_files_dirs(const unsigned char *sha1
,
289 struct strbuf
*base
, const char *path
,
290 unsigned int mode
, int stage
, void *context
)
292 int baselen
= base
->len
;
293 struct merge_options
*o
= context
;
295 strbuf_addstr(base
, path
);
298 string_list_insert(&o
->current_directory_set
, base
->buf
);
300 string_list_insert(&o
->current_file_set
, base
->buf
);
302 strbuf_setlen(base
, baselen
);
303 return (S_ISDIR(mode
) ? READ_TREE_RECURSIVE
: 0);
306 static int get_files_dirs(struct merge_options
*o
, struct tree
*tree
)
309 struct pathspec match_all
;
310 memset(&match_all
, 0, sizeof(match_all
));
311 if (read_tree_recursive(tree
, "", 0, 0, &match_all
, save_files_dirs
, o
))
313 n
= o
->current_file_set
.nr
+ o
->current_directory_set
.nr
;
318 * Returns an index_entry instance which doesn't have to correspond to
319 * a real cache entry in Git's index.
321 static struct stage_data
*insert_stage_data(const char *path
,
322 struct tree
*o
, struct tree
*a
, struct tree
*b
,
323 struct string_list
*entries
)
325 struct string_list_item
*item
;
326 struct stage_data
*e
= xcalloc(1, sizeof(struct stage_data
));
327 get_tree_entry(o
->object
.oid
.hash
, path
,
328 e
->stages
[1].oid
.hash
, &e
->stages
[1].mode
);
329 get_tree_entry(a
->object
.oid
.hash
, path
,
330 e
->stages
[2].oid
.hash
, &e
->stages
[2].mode
);
331 get_tree_entry(b
->object
.oid
.hash
, path
,
332 e
->stages
[3].oid
.hash
, &e
->stages
[3].mode
);
333 item
= string_list_insert(entries
, path
);
339 * Create a dictionary mapping file names to stage_data objects. The
340 * dictionary contains one entry for every path with a non-zero stage entry.
342 static struct string_list
*get_unmerged(void)
344 struct string_list
*unmerged
= xcalloc(1, sizeof(struct string_list
));
347 unmerged
->strdup_strings
= 1;
349 for (i
= 0; i
< active_nr
; i
++) {
350 struct string_list_item
*item
;
351 struct stage_data
*e
;
352 const struct cache_entry
*ce
= active_cache
[i
];
356 item
= string_list_lookup(unmerged
, ce
->name
);
358 item
= string_list_insert(unmerged
, ce
->name
);
359 item
->util
= xcalloc(1, sizeof(struct stage_data
));
362 e
->stages
[ce_stage(ce
)].mode
= ce
->ce_mode
;
363 hashcpy(e
->stages
[ce_stage(ce
)].oid
.hash
, ce
->sha1
);
369 static int string_list_df_name_compare(const void *a
, const void *b
)
371 const struct string_list_item
*one
= a
;
372 const struct string_list_item
*two
= b
;
373 int onelen
= strlen(one
->string
);
374 int twolen
= strlen(two
->string
);
376 * Here we only care that entries for D/F conflicts are
377 * adjacent, in particular with the file of the D/F conflict
378 * appearing before files below the corresponding directory.
379 * The order of the rest of the list is irrelevant for us.
381 * To achieve this, we sort with df_name_compare and provide
382 * the mode S_IFDIR so that D/F conflicts will sort correctly.
383 * We use the mode S_IFDIR for everything else for simplicity,
384 * since in other cases any changes in their order due to
385 * sorting cause no problems for us.
387 int cmp
= df_name_compare(one
->string
, onelen
, S_IFDIR
,
388 two
->string
, twolen
, S_IFDIR
);
390 * Now that 'foo' and 'foo/bar' compare equal, we have to make sure
391 * that 'foo' comes before 'foo/bar'.
395 return onelen
- twolen
;
398 static void record_df_conflict_files(struct merge_options
*o
,
399 struct string_list
*entries
)
401 /* If there is a D/F conflict and the file for such a conflict
402 * currently exist in the working tree, we want to allow it to be
403 * removed to make room for the corresponding directory if needed.
404 * The files underneath the directories of such D/F conflicts will
405 * be processed before the corresponding file involved in the D/F
406 * conflict. If the D/F directory ends up being removed by the
407 * merge, then we won't have to touch the D/F file. If the D/F
408 * directory needs to be written to the working copy, then the D/F
409 * file will simply be removed (in make_room_for_path()) to make
410 * room for the necessary paths. Note that if both the directory
411 * and the file need to be present, then the D/F file will be
412 * reinstated with a new unique name at the time it is processed.
414 struct string_list df_sorted_entries
;
415 const char *last_file
= NULL
;
420 * If we're merging merge-bases, we don't want to bother with
421 * any working directory changes.
426 /* Ensure D/F conflicts are adjacent in the entries list. */
427 memset(&df_sorted_entries
, 0, sizeof(struct string_list
));
428 for (i
= 0; i
< entries
->nr
; i
++) {
429 struct string_list_item
*next
= &entries
->items
[i
];
430 string_list_append(&df_sorted_entries
, next
->string
)->util
=
433 qsort(df_sorted_entries
.items
, entries
->nr
, sizeof(*entries
->items
),
434 string_list_df_name_compare
);
436 string_list_clear(&o
->df_conflict_file_set
, 1);
437 for (i
= 0; i
< df_sorted_entries
.nr
; i
++) {
438 const char *path
= df_sorted_entries
.items
[i
].string
;
439 int len
= strlen(path
);
440 struct stage_data
*e
= df_sorted_entries
.items
[i
].util
;
443 * Check if last_file & path correspond to a D/F conflict;
444 * i.e. whether path is last_file+'/'+<something>.
445 * If so, record that it's okay to remove last_file to make
446 * room for path and friends if needed.
450 memcmp(path
, last_file
, last_len
) == 0 &&
451 path
[last_len
] == '/') {
452 string_list_insert(&o
->df_conflict_file_set
, last_file
);
456 * Determine whether path could exist as a file in the
457 * working directory as a possible D/F conflict. This
458 * will only occur when it exists in stage 2 as a
461 if (S_ISREG(e
->stages
[2].mode
) || S_ISLNK(e
->stages
[2].mode
)) {
468 string_list_clear(&df_sorted_entries
, 0);
472 struct diff_filepair
*pair
;
473 struct stage_data
*src_entry
;
474 struct stage_data
*dst_entry
;
475 unsigned processed
:1;
479 * Get information of all renames which occurred between 'o_tree' and
480 * 'tree'. We need the three trees in the merge ('o_tree', 'a_tree' and
481 * 'b_tree') to be able to associate the correct cache entries with
482 * the rename information. 'tree' is always equal to either a_tree or b_tree.
484 static struct string_list
*get_renames(struct merge_options
*o
,
489 struct string_list
*entries
)
492 struct string_list
*renames
;
493 struct diff_options opts
;
495 renames
= xcalloc(1, sizeof(struct string_list
));
496 if (!o
->detect_rename
)
500 DIFF_OPT_SET(&opts
, RECURSIVE
);
501 DIFF_OPT_CLR(&opts
, RENAME_EMPTY
);
502 opts
.detect_rename
= DIFF_DETECT_RENAME
;
503 opts
.rename_limit
= o
->merge_rename_limit
>= 0 ? o
->merge_rename_limit
:
504 o
->diff_rename_limit
>= 0 ? o
->diff_rename_limit
:
506 opts
.rename_score
= o
->rename_score
;
507 opts
.show_rename_progress
= o
->show_rename_progress
;
508 opts
.output_format
= DIFF_FORMAT_NO_OUTPUT
;
509 diff_setup_done(&opts
);
510 diff_tree_sha1(o_tree
->object
.oid
.hash
, tree
->object
.oid
.hash
, "", &opts
);
512 if (opts
.needed_rename_limit
> o
->needed_rename_limit
)
513 o
->needed_rename_limit
= opts
.needed_rename_limit
;
514 for (i
= 0; i
< diff_queued_diff
.nr
; ++i
) {
515 struct string_list_item
*item
;
517 struct diff_filepair
*pair
= diff_queued_diff
.queue
[i
];
518 if (pair
->status
!= 'R') {
519 diff_free_filepair(pair
);
522 re
= xmalloc(sizeof(*re
));
525 item
= string_list_lookup(entries
, re
->pair
->one
->path
);
527 re
->src_entry
= insert_stage_data(re
->pair
->one
->path
,
528 o_tree
, a_tree
, b_tree
, entries
);
530 re
->src_entry
= item
->util
;
532 item
= string_list_lookup(entries
, re
->pair
->two
->path
);
534 re
->dst_entry
= insert_stage_data(re
->pair
->two
->path
,
535 o_tree
, a_tree
, b_tree
, entries
);
537 re
->dst_entry
= item
->util
;
538 item
= string_list_insert(renames
, pair
->one
->path
);
541 opts
.output_format
= DIFF_FORMAT_NO_OUTPUT
;
542 diff_queued_diff
.nr
= 0;
547 static int update_stages(const char *path
, const struct diff_filespec
*o
,
548 const struct diff_filespec
*a
,
549 const struct diff_filespec
*b
)
553 * NOTE: It is usually a bad idea to call update_stages on a path
554 * before calling update_file on that same path, since it can
555 * sometimes lead to spurious "refusing to lose untracked file..."
556 * messages from update_file (via make_room_for path via
557 * would_lose_untracked). Instead, reverse the order of the calls
558 * (executing update_file first and then update_stages).
561 int options
= ADD_CACHE_OK_TO_ADD
| ADD_CACHE_SKIP_DFCHECK
;
563 if (remove_file_from_cache(path
))
566 if (add_cacheinfo(o
->mode
, &o
->oid
, path
, 1, 0, options
))
569 if (add_cacheinfo(a
->mode
, &a
->oid
, path
, 2, 0, options
))
572 if (add_cacheinfo(b
->mode
, &b
->oid
, path
, 3, 0, options
))
577 static void update_entry(struct stage_data
*entry
,
578 struct diff_filespec
*o
,
579 struct diff_filespec
*a
,
580 struct diff_filespec
*b
)
582 entry
->processed
= 0;
583 entry
->stages
[1].mode
= o
->mode
;
584 entry
->stages
[2].mode
= a
->mode
;
585 entry
->stages
[3].mode
= b
->mode
;
586 oidcpy(&entry
->stages
[1].oid
, &o
->oid
);
587 oidcpy(&entry
->stages
[2].oid
, &a
->oid
);
588 oidcpy(&entry
->stages
[3].oid
, &b
->oid
);
591 static int remove_file(struct merge_options
*o
, int clean
,
592 const char *path
, int no_wd
)
594 int update_cache
= o
->call_depth
|| clean
;
595 int update_working_directory
= !o
->call_depth
&& !no_wd
;
598 if (remove_file_from_cache(path
))
601 if (update_working_directory
) {
603 struct cache_entry
*ce
;
604 ce
= cache_file_exists(path
, strlen(path
), ignore_case
);
605 if (ce
&& ce_stage(ce
) == 0)
608 if (remove_path(path
))
614 /* add a string to a strbuf, but converting "/" to "_" */
615 static void add_flattened_path(struct strbuf
*out
, const char *s
)
618 strbuf_addstr(out
, s
);
619 for (; i
< out
->len
; i
++)
620 if (out
->buf
[i
] == '/')
624 static char *unique_path(struct merge_options
*o
, const char *path
, const char *branch
)
626 struct strbuf newpath
= STRBUF_INIT
;
630 strbuf_addf(&newpath
, "%s~", path
);
631 add_flattened_path(&newpath
, branch
);
633 base_len
= newpath
.len
;
634 while (string_list_has_string(&o
->current_file_set
, newpath
.buf
) ||
635 string_list_has_string(&o
->current_directory_set
, newpath
.buf
) ||
636 (!o
->call_depth
&& file_exists(newpath
.buf
))) {
637 strbuf_setlen(&newpath
, base_len
);
638 strbuf_addf(&newpath
, "_%d", suffix
++);
641 string_list_insert(&o
->current_file_set
, newpath
.buf
);
642 return strbuf_detach(&newpath
, NULL
);
645 static int dir_in_way(const char *path
, int check_working_copy
)
648 struct strbuf dirpath
= STRBUF_INIT
;
651 strbuf_addstr(&dirpath
, path
);
652 strbuf_addch(&dirpath
, '/');
654 pos
= cache_name_pos(dirpath
.buf
, dirpath
.len
);
658 if (pos
< active_nr
&&
659 !strncmp(dirpath
.buf
, active_cache
[pos
]->name
, dirpath
.len
)) {
660 strbuf_release(&dirpath
);
664 strbuf_release(&dirpath
);
665 return check_working_copy
&& !lstat(path
, &st
) && S_ISDIR(st
.st_mode
);
668 static int was_tracked(const char *path
)
670 int pos
= cache_name_pos(path
, strlen(path
));
673 /* we have been tracking this path */
677 * Look for an unmerged entry for the path,
678 * specifically stage #2, which would indicate
679 * that "our" side before the merge started
680 * had the path tracked (and resulted in a conflict).
683 pos
< active_nr
&& !strcmp(path
, active_cache
[pos
]->name
);
685 if (ce_stage(active_cache
[pos
]) == 2)
690 static int would_lose_untracked(const char *path
)
692 return !was_tracked(path
) && file_exists(path
);
695 static int make_room_for_path(struct merge_options
*o
, const char *path
)
698 const char *msg
= _("failed to create path '%s'%s");
700 /* Unlink any D/F conflict files that are in the way */
701 for (i
= 0; i
< o
->df_conflict_file_set
.nr
; i
++) {
702 const char *df_path
= o
->df_conflict_file_set
.items
[i
].string
;
703 size_t pathlen
= strlen(path
);
704 size_t df_pathlen
= strlen(df_path
);
705 if (df_pathlen
< pathlen
&&
706 path
[df_pathlen
] == '/' &&
707 strncmp(path
, df_path
, df_pathlen
) == 0) {
709 _("Removing %s to make room for subdirectory\n"),
712 unsorted_string_list_delete_item(&o
->df_conflict_file_set
,
718 /* Make sure leading directories are created */
719 status
= safe_create_leading_directories_const(path
);
721 if (status
== SCLD_EXISTS
)
722 /* something else exists */
723 return error(msg
, path
, _(": perhaps a D/F conflict?"));
724 return error(msg
, path
, "");
728 * Do not unlink a file in the work tree if we are not
731 if (would_lose_untracked(path
))
732 return error(_("refusing to lose untracked file at '%s'"),
735 /* Successful unlink is good.. */
738 /* .. and so is no existing file */
741 /* .. but not some other error (who really cares what?) */
742 return error(msg
, path
, _(": perhaps a D/F conflict?"));
745 static int update_file_flags(struct merge_options
*o
,
746 const struct object_id
*oid
,
758 enum object_type type
;
762 if (S_ISGITLINK(mode
)) {
764 * We may later decide to recursively descend into
765 * the submodule directory and update its index
766 * and/or work tree, but we do not do that now.
772 buf
= read_sha1_file(oid
->hash
, &type
, &size
);
774 return error(_("cannot read object %s '%s'"), oid_to_hex(oid
), path
);
775 if (type
!= OBJ_BLOB
) {
776 ret
= error(_("blob expected for %s '%s'"), oid_to_hex(oid
), path
);
780 struct strbuf strbuf
= STRBUF_INIT
;
781 if (convert_to_working_tree(path
, buf
, size
, &strbuf
)) {
784 buf
= strbuf_detach(&strbuf
, NULL
);
788 if (make_room_for_path(o
, path
) < 0) {
792 if (S_ISREG(mode
) || (!has_symlinks
&& S_ISLNK(mode
))) {
798 fd
= open(path
, O_WRONLY
| O_TRUNC
| O_CREAT
, mode
);
800 ret
= error_errno(_("failed to open '%s'"),
804 write_in_full(fd
, buf
, size
);
806 } else if (S_ISLNK(mode
)) {
807 char *lnk
= xmemdupz(buf
, size
);
808 safe_create_leading_directories_const(path
);
810 if (symlink(lnk
, path
))
811 ret
= error_errno(_("failed to symlink '%s'"), path
);
814 ret
= error(_("do not know what to do with %06o %s '%s'"),
815 mode
, oid_to_hex(oid
), path
);
820 if (!ret
&& update_cache
)
821 add_cacheinfo(mode
, oid
, path
, 0, update_wd
, ADD_CACHE_OK_TO_ADD
);
825 static int update_file(struct merge_options
*o
,
827 const struct object_id
*oid
,
831 return update_file_flags(o
, oid
, mode
, path
, o
->call_depth
|| clean
, !o
->call_depth
);
834 /* Low level file merging, update and removal */
836 struct merge_file_info
{
837 struct object_id oid
;
843 static int merge_3way(struct merge_options
*o
,
844 mmbuffer_t
*result_buf
,
845 const struct diff_filespec
*one
,
846 const struct diff_filespec
*a
,
847 const struct diff_filespec
*b
,
851 mmfile_t orig
, src1
, src2
;
852 struct ll_merge_options ll_opts
= {0};
853 char *base_name
, *name1
, *name2
;
856 ll_opts
.renormalize
= o
->renormalize
;
857 ll_opts
.xdl_opts
= o
->xdl_opts
;
860 ll_opts
.virtual_ancestor
= 1;
863 switch (o
->recursive_variant
) {
864 case MERGE_RECURSIVE_OURS
:
865 ll_opts
.variant
= XDL_MERGE_FAVOR_OURS
;
867 case MERGE_RECURSIVE_THEIRS
:
868 ll_opts
.variant
= XDL_MERGE_FAVOR_THEIRS
;
876 if (strcmp(a
->path
, b
->path
) ||
877 (o
->ancestor
!= NULL
&& strcmp(a
->path
, one
->path
) != 0)) {
878 base_name
= o
->ancestor
== NULL
? NULL
:
879 mkpathdup("%s:%s", o
->ancestor
, one
->path
);
880 name1
= mkpathdup("%s:%s", branch1
, a
->path
);
881 name2
= mkpathdup("%s:%s", branch2
, b
->path
);
883 base_name
= o
->ancestor
== NULL
? NULL
:
884 mkpathdup("%s", o
->ancestor
);
885 name1
= mkpathdup("%s", branch1
);
886 name2
= mkpathdup("%s", branch2
);
889 read_mmblob(&orig
, one
->oid
.hash
);
890 read_mmblob(&src1
, a
->oid
.hash
);
891 read_mmblob(&src2
, b
->oid
.hash
);
893 merge_status
= ll_merge(result_buf
, a
->path
, &orig
, base_name
,
894 &src1
, name1
, &src2
, name2
, &ll_opts
);
905 static int merge_file_1(struct merge_options
*o
,
906 const struct diff_filespec
*one
,
907 const struct diff_filespec
*a
,
908 const struct diff_filespec
*b
,
911 struct merge_file_info
*result
)
916 if ((S_IFMT
& a
->mode
) != (S_IFMT
& b
->mode
)) {
918 if (S_ISREG(a
->mode
)) {
919 result
->mode
= a
->mode
;
920 oidcpy(&result
->oid
, &a
->oid
);
922 result
->mode
= b
->mode
;
923 oidcpy(&result
->oid
, &b
->oid
);
926 if (!oid_eq(&a
->oid
, &one
->oid
) && !oid_eq(&b
->oid
, &one
->oid
))
932 if (a
->mode
== b
->mode
|| a
->mode
== one
->mode
)
933 result
->mode
= b
->mode
;
935 result
->mode
= a
->mode
;
936 if (b
->mode
!= one
->mode
) {
942 if (oid_eq(&a
->oid
, &b
->oid
) || oid_eq(&a
->oid
, &one
->oid
))
943 oidcpy(&result
->oid
, &b
->oid
);
944 else if (oid_eq(&b
->oid
, &one
->oid
))
945 oidcpy(&result
->oid
, &a
->oid
);
946 else if (S_ISREG(a
->mode
)) {
947 mmbuffer_t result_buf
;
948 int ret
= 0, merge_status
;
950 merge_status
= merge_3way(o
, &result_buf
, one
, a
, b
,
953 if ((merge_status
< 0) || !result_buf
.ptr
)
954 ret
= error(_("Failed to execute internal merge"));
956 if (!ret
&& write_sha1_file(result_buf
.ptr
, result_buf
.size
,
957 blob_type
, result
->oid
.hash
))
958 ret
= error(_("Unable to add %s to database"),
961 free(result_buf
.ptr
);
964 result
->clean
= (merge_status
== 0);
965 } else if (S_ISGITLINK(a
->mode
)) {
966 result
->clean
= merge_submodule(result
->oid
.hash
,
972 } else if (S_ISLNK(a
->mode
)) {
973 oidcpy(&result
->oid
, &a
->oid
);
975 if (!oid_eq(&a
->oid
, &b
->oid
))
978 die("BUG: unsupported object type in the tree");
984 static int merge_file_special_markers(struct merge_options
*o
,
985 const struct diff_filespec
*one
,
986 const struct diff_filespec
*a
,
987 const struct diff_filespec
*b
,
989 const char *filename1
,
991 const char *filename2
,
992 struct merge_file_info
*mfi
)
999 side1
= xstrfmt("%s:%s", branch1
, filename1
);
1001 side2
= xstrfmt("%s:%s", branch2
, filename2
);
1003 ret
= merge_file_1(o
, one
, a
, b
,
1004 side1
? side1
: branch1
,
1005 side2
? side2
: branch2
, mfi
);
1011 static int merge_file_one(struct merge_options
*o
,
1013 const struct object_id
*o_oid
, int o_mode
,
1014 const struct object_id
*a_oid
, int a_mode
,
1015 const struct object_id
*b_oid
, int b_mode
,
1016 const char *branch1
,
1017 const char *branch2
,
1018 struct merge_file_info
*mfi
)
1020 struct diff_filespec one
, a
, b
;
1022 one
.path
= a
.path
= b
.path
= (char *)path
;
1023 oidcpy(&one
.oid
, o_oid
);
1025 oidcpy(&a
.oid
, a_oid
);
1027 oidcpy(&b
.oid
, b_oid
);
1029 return merge_file_1(o
, &one
, &a
, &b
, branch1
, branch2
, mfi
);
1032 static int handle_change_delete(struct merge_options
*o
,
1034 const struct object_id
*o_oid
, int o_mode
,
1035 const struct object_id
*a_oid
, int a_mode
,
1036 const struct object_id
*b_oid
, int b_mode
,
1037 const char *change
, const char *change_past
)
1039 char *renamed
= NULL
;
1041 if (dir_in_way(path
, !o
->call_depth
)) {
1042 renamed
= unique_path(o
, path
, a_oid
? o
->branch1
: o
->branch2
);
1045 if (o
->call_depth
) {
1047 * We cannot arbitrarily accept either a_sha or b_sha as
1048 * correct; since there is no true "middle point" between
1049 * them, simply reuse the base version for virtual merge base.
1051 ret
= remove_file_from_cache(path
);
1053 ret
= update_file(o
, 0, o_oid
, o_mode
,
1054 renamed
? renamed
: path
);
1055 } else if (!a_oid
) {
1057 output(o
, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1058 "and %s in %s. Version %s of %s left in tree."),
1059 change
, path
, o
->branch1
, change_past
,
1060 o
->branch2
, o
->branch2
, path
);
1061 ret
= update_file(o
, 0, b_oid
, b_mode
, path
);
1063 output(o
, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1064 "and %s in %s. Version %s of %s left in tree at %s."),
1065 change
, path
, o
->branch1
, change_past
,
1066 o
->branch2
, o
->branch2
, path
, renamed
);
1067 ret
= update_file(o
, 0, b_oid
, b_mode
, renamed
);
1071 output(o
, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1072 "and %s in %s. Version %s of %s left in tree."),
1073 change
, path
, o
->branch2
, change_past
,
1074 o
->branch1
, o
->branch1
, path
);
1076 output(o
, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1077 "and %s in %s. Version %s of %s left in tree at %s."),
1078 change
, path
, o
->branch2
, change_past
,
1079 o
->branch1
, o
->branch1
, path
, renamed
);
1080 ret
= update_file(o
, 0, a_oid
, a_mode
, renamed
);
1083 * No need to call update_file() on path when !renamed, since
1084 * that would needlessly touch path. We could call
1085 * update_file_flags() with update_cache=0 and update_wd=0,
1086 * but that's a no-op.
1094 static int conflict_rename_delete(struct merge_options
*o
,
1095 struct diff_filepair
*pair
,
1096 const char *rename_branch
,
1097 const char *other_branch
)
1099 const struct diff_filespec
*orig
= pair
->one
;
1100 const struct diff_filespec
*dest
= pair
->two
;
1101 const struct object_id
*a_oid
= NULL
;
1102 const struct object_id
*b_oid
= NULL
;
1106 if (rename_branch
== o
->branch1
) {
1108 a_mode
= dest
->mode
;
1111 b_mode
= dest
->mode
;
1114 if (handle_change_delete(o
,
1115 o
->call_depth
? orig
->path
: dest
->path
,
1116 &orig
->oid
, orig
->mode
,
1119 _("rename"), _("renamed")))
1123 return remove_file_from_cache(dest
->path
);
1125 return update_stages(dest
->path
, NULL
,
1126 rename_branch
== o
->branch1
? dest
: NULL
,
1127 rename_branch
== o
->branch1
? NULL
: dest
);
1130 static struct diff_filespec
*filespec_from_entry(struct diff_filespec
*target
,
1131 struct stage_data
*entry
,
1134 struct object_id
*oid
= &entry
->stages
[stage
].oid
;
1135 unsigned mode
= entry
->stages
[stage
].mode
;
1136 if (mode
== 0 || is_null_oid(oid
))
1138 oidcpy(&target
->oid
, oid
);
1139 target
->mode
= mode
;
1143 static int handle_file(struct merge_options
*o
,
1144 struct diff_filespec
*rename
,
1146 struct rename_conflict_info
*ci
)
1148 char *dst_name
= rename
->path
;
1149 struct stage_data
*dst_entry
;
1150 const char *cur_branch
, *other_branch
;
1151 struct diff_filespec other
;
1152 struct diff_filespec
*add
;
1156 dst_entry
= ci
->dst_entry1
;
1157 cur_branch
= ci
->branch1
;
1158 other_branch
= ci
->branch2
;
1160 dst_entry
= ci
->dst_entry2
;
1161 cur_branch
= ci
->branch2
;
1162 other_branch
= ci
->branch1
;
1165 add
= filespec_from_entry(&other
, dst_entry
, stage
^ 1);
1167 char *add_name
= unique_path(o
, rename
->path
, other_branch
);
1168 if (update_file(o
, 0, &add
->oid
, add
->mode
, add_name
))
1171 remove_file(o
, 0, rename
->path
, 0);
1172 dst_name
= unique_path(o
, rename
->path
, cur_branch
);
1174 if (dir_in_way(rename
->path
, !o
->call_depth
)) {
1175 dst_name
= unique_path(o
, rename
->path
, cur_branch
);
1176 output(o
, 1, _("%s is a directory in %s adding as %s instead"),
1177 rename
->path
, other_branch
, dst_name
);
1180 if ((ret
= update_file(o
, 0, &rename
->oid
, rename
->mode
, dst_name
)))
1181 ; /* fall through, do allow dst_name to be released */
1182 else if (stage
== 2)
1183 ret
= update_stages(rename
->path
, NULL
, rename
, add
);
1185 ret
= update_stages(rename
->path
, NULL
, add
, rename
);
1187 if (dst_name
!= rename
->path
)
1193 static int conflict_rename_rename_1to2(struct merge_options
*o
,
1194 struct rename_conflict_info
*ci
)
1196 /* One file was renamed in both branches, but to different names. */
1197 struct diff_filespec
*one
= ci
->pair1
->one
;
1198 struct diff_filespec
*a
= ci
->pair1
->two
;
1199 struct diff_filespec
*b
= ci
->pair2
->two
;
1201 output(o
, 1, _("CONFLICT (rename/rename): "
1202 "Rename \"%s\"->\"%s\" in branch \"%s\" "
1203 "rename \"%s\"->\"%s\" in \"%s\"%s"),
1204 one
->path
, a
->path
, ci
->branch1
,
1205 one
->path
, b
->path
, ci
->branch2
,
1206 o
->call_depth
? _(" (left unresolved)") : "");
1207 if (o
->call_depth
) {
1208 struct merge_file_info mfi
;
1209 struct diff_filespec other
;
1210 struct diff_filespec
*add
;
1211 if (merge_file_one(o
, one
->path
,
1212 &one
->oid
, one
->mode
,
1215 ci
->branch1
, ci
->branch2
, &mfi
))
1219 * FIXME: For rename/add-source conflicts (if we could detect
1220 * such), this is wrong. We should instead find a unique
1221 * pathname and then either rename the add-source file to that
1222 * unique path, or use that unique path instead of src here.
1224 if (update_file(o
, 0, &mfi
.oid
, mfi
.mode
, one
->path
))
1228 * Above, we put the merged content at the merge-base's
1229 * path. Now we usually need to delete both a->path and
1230 * b->path. However, the rename on each side of the merge
1231 * could also be involved in a rename/add conflict. In
1232 * such cases, we should keep the added file around,
1233 * resolving the conflict at that path in its favor.
1235 add
= filespec_from_entry(&other
, ci
->dst_entry1
, 2 ^ 1);
1237 if (update_file(o
, 0, &add
->oid
, add
->mode
, a
->path
))
1241 remove_file_from_cache(a
->path
);
1242 add
= filespec_from_entry(&other
, ci
->dst_entry2
, 3 ^ 1);
1244 if (update_file(o
, 0, &add
->oid
, add
->mode
, b
->path
))
1248 remove_file_from_cache(b
->path
);
1249 } else if (handle_file(o
, a
, 2, ci
) || handle_file(o
, b
, 3, ci
))
1255 static int conflict_rename_rename_2to1(struct merge_options
*o
,
1256 struct rename_conflict_info
*ci
)
1258 /* Two files, a & b, were renamed to the same thing, c. */
1259 struct diff_filespec
*a
= ci
->pair1
->one
;
1260 struct diff_filespec
*b
= ci
->pair2
->one
;
1261 struct diff_filespec
*c1
= ci
->pair1
->two
;
1262 struct diff_filespec
*c2
= ci
->pair2
->two
;
1263 char *path
= c1
->path
; /* == c2->path */
1264 struct merge_file_info mfi_c1
;
1265 struct merge_file_info mfi_c2
;
1268 output(o
, 1, _("CONFLICT (rename/rename): "
1269 "Rename %s->%s in %s. "
1270 "Rename %s->%s in %s"),
1271 a
->path
, c1
->path
, ci
->branch1
,
1272 b
->path
, c2
->path
, ci
->branch2
);
1274 remove_file(o
, 1, a
->path
, o
->call_depth
|| would_lose_untracked(a
->path
));
1275 remove_file(o
, 1, b
->path
, o
->call_depth
|| would_lose_untracked(b
->path
));
1277 if (merge_file_special_markers(o
, a
, c1
, &ci
->ren1_other
,
1278 o
->branch1
, c1
->path
,
1279 o
->branch2
, ci
->ren1_other
.path
, &mfi_c1
) ||
1280 merge_file_special_markers(o
, b
, &ci
->ren2_other
, c2
,
1281 o
->branch1
, ci
->ren2_other
.path
,
1282 o
->branch2
, c2
->path
, &mfi_c2
))
1285 if (o
->call_depth
) {
1287 * If mfi_c1.clean && mfi_c2.clean, then it might make
1288 * sense to do a two-way merge of those results. But, I
1289 * think in all cases, it makes sense to have the virtual
1290 * merge base just undo the renames; they can be detected
1291 * again later for the non-recursive merge.
1293 remove_file(o
, 0, path
, 0);
1294 ret
= update_file(o
, 0, &mfi_c1
.oid
, mfi_c1
.mode
, a
->path
);
1296 ret
= update_file(o
, 0, &mfi_c2
.oid
, mfi_c2
.mode
,
1299 char *new_path1
= unique_path(o
, path
, ci
->branch1
);
1300 char *new_path2
= unique_path(o
, path
, ci
->branch2
);
1301 output(o
, 1, _("Renaming %s to %s and %s to %s instead"),
1302 a
->path
, new_path1
, b
->path
, new_path2
);
1303 remove_file(o
, 0, path
, 0);
1304 ret
= update_file(o
, 0, &mfi_c1
.oid
, mfi_c1
.mode
, new_path1
);
1306 ret
= update_file(o
, 0, &mfi_c2
.oid
, mfi_c2
.mode
,
1315 static int process_renames(struct merge_options
*o
,
1316 struct string_list
*a_renames
,
1317 struct string_list
*b_renames
)
1319 int clean_merge
= 1, i
, j
;
1320 struct string_list a_by_dst
= STRING_LIST_INIT_NODUP
;
1321 struct string_list b_by_dst
= STRING_LIST_INIT_NODUP
;
1322 const struct rename
*sre
;
1324 for (i
= 0; i
< a_renames
->nr
; i
++) {
1325 sre
= a_renames
->items
[i
].util
;
1326 string_list_insert(&a_by_dst
, sre
->pair
->two
->path
)->util
1329 for (i
= 0; i
< b_renames
->nr
; i
++) {
1330 sre
= b_renames
->items
[i
].util
;
1331 string_list_insert(&b_by_dst
, sre
->pair
->two
->path
)->util
1335 for (i
= 0, j
= 0; i
< a_renames
->nr
|| j
< b_renames
->nr
;) {
1336 struct string_list
*renames1
, *renames2Dst
;
1337 struct rename
*ren1
= NULL
, *ren2
= NULL
;
1338 const char *branch1
, *branch2
;
1339 const char *ren1_src
, *ren1_dst
;
1340 struct string_list_item
*lookup
;
1342 if (i
>= a_renames
->nr
) {
1343 ren2
= b_renames
->items
[j
++].util
;
1344 } else if (j
>= b_renames
->nr
) {
1345 ren1
= a_renames
->items
[i
++].util
;
1347 int compare
= strcmp(a_renames
->items
[i
].string
,
1348 b_renames
->items
[j
].string
);
1350 ren1
= a_renames
->items
[i
++].util
;
1352 ren2
= b_renames
->items
[j
++].util
;
1355 /* TODO: refactor, so that 1/2 are not needed */
1357 renames1
= a_renames
;
1358 renames2Dst
= &b_by_dst
;
1359 branch1
= o
->branch1
;
1360 branch2
= o
->branch2
;
1363 renames1
= b_renames
;
1364 renames2Dst
= &a_by_dst
;
1365 branch1
= o
->branch2
;
1366 branch2
= o
->branch1
;
1372 if (ren1
->processed
)
1374 ren1
->processed
= 1;
1375 ren1
->dst_entry
->processed
= 1;
1376 /* BUG: We should only mark src_entry as processed if we
1377 * are not dealing with a rename + add-source case.
1379 ren1
->src_entry
->processed
= 1;
1381 ren1_src
= ren1
->pair
->one
->path
;
1382 ren1_dst
= ren1
->pair
->two
->path
;
1385 /* One file renamed on both sides */
1386 const char *ren2_src
= ren2
->pair
->one
->path
;
1387 const char *ren2_dst
= ren2
->pair
->two
->path
;
1388 enum rename_type rename_type
;
1389 if (strcmp(ren1_src
, ren2_src
) != 0)
1390 die("BUG: ren1_src != ren2_src");
1391 ren2
->dst_entry
->processed
= 1;
1392 ren2
->processed
= 1;
1393 if (strcmp(ren1_dst
, ren2_dst
) != 0) {
1394 rename_type
= RENAME_ONE_FILE_TO_TWO
;
1397 rename_type
= RENAME_ONE_FILE_TO_ONE
;
1398 /* BUG: We should only remove ren1_src in
1399 * the base stage (think of rename +
1400 * add-source cases).
1402 remove_file(o
, 1, ren1_src
, 1);
1403 update_entry(ren1
->dst_entry
,
1408 setup_rename_conflict_info(rename_type
,
1418 } else if ((lookup
= string_list_lookup(renames2Dst
, ren1_dst
))) {
1419 /* Two different files renamed to the same thing */
1421 ren2
= lookup
->util
;
1422 ren2_dst
= ren2
->pair
->two
->path
;
1423 if (strcmp(ren1_dst
, ren2_dst
) != 0)
1424 die("BUG: ren1_dst != ren2_dst");
1427 ren2
->processed
= 1;
1429 * BUG: We should only mark src_entry as processed
1430 * if we are not dealing with a rename + add-source
1433 ren2
->src_entry
->processed
= 1;
1435 setup_rename_conflict_info(RENAME_TWO_FILES_TO_ONE
,
1447 /* Renamed in 1, maybe changed in 2 */
1448 /* we only use sha1 and mode of these */
1449 struct diff_filespec src_other
, dst_other
;
1453 * unpack_trees loads entries from common-commit
1454 * into stage 1, from head-commit into stage 2, and
1455 * from merge-commit into stage 3. We keep track
1456 * of which side corresponds to the rename.
1458 int renamed_stage
= a_renames
== renames1
? 2 : 3;
1459 int other_stage
= a_renames
== renames1
? 3 : 2;
1461 /* BUG: We should only remove ren1_src in the base
1462 * stage and in other_stage (think of rename +
1465 remove_file(o
, 1, ren1_src
,
1466 renamed_stage
== 2 || !was_tracked(ren1_src
));
1468 oidcpy(&src_other
.oid
,
1469 &ren1
->src_entry
->stages
[other_stage
].oid
);
1470 src_other
.mode
= ren1
->src_entry
->stages
[other_stage
].mode
;
1471 oidcpy(&dst_other
.oid
,
1472 &ren1
->dst_entry
->stages
[other_stage
].oid
);
1473 dst_other
.mode
= ren1
->dst_entry
->stages
[other_stage
].mode
;
1476 if (oid_eq(&src_other
.oid
, &null_oid
)) {
1477 setup_rename_conflict_info(RENAME_DELETE
,
1487 } else if ((dst_other
.mode
== ren1
->pair
->two
->mode
) &&
1488 oid_eq(&dst_other
.oid
, &ren1
->pair
->two
->oid
)) {
1490 * Added file on the other side identical to
1491 * the file being renamed: clean merge.
1492 * Also, there is no need to overwrite the
1493 * file already in the working copy, so call
1494 * update_file_flags() instead of
1497 if (update_file_flags(o
,
1498 &ren1
->pair
->two
->oid
,
1499 ren1
->pair
->two
->mode
,
1501 1, /* update_cache */
1504 } else if (!oid_eq(&dst_other
.oid
, &null_oid
)) {
1507 output(o
, 1, _("CONFLICT (rename/add): Rename %s->%s in %s. "
1509 ren1_src
, ren1_dst
, branch1
,
1511 if (o
->call_depth
) {
1512 struct merge_file_info mfi
;
1513 if (merge_file_one(o
, ren1_dst
, &null_oid
, 0,
1514 &ren1
->pair
->two
->oid
,
1515 ren1
->pair
->two
->mode
,
1518 branch1
, branch2
, &mfi
)) {
1520 goto cleanup_and_return
;
1522 output(o
, 1, _("Adding merged %s"), ren1_dst
);
1523 if (update_file(o
, 0, &mfi
.oid
,
1524 mfi
.mode
, ren1_dst
))
1528 char *new_path
= unique_path(o
, ren1_dst
, branch2
);
1529 output(o
, 1, _("Adding as %s instead"), new_path
);
1530 if (update_file(o
, 0, &dst_other
.oid
,
1531 dst_other
.mode
, new_path
))
1538 if (clean_merge
< 0)
1539 goto cleanup_and_return
;
1541 struct diff_filespec
*one
, *a
, *b
;
1542 src_other
.path
= (char *)ren1_src
;
1544 one
= ren1
->pair
->one
;
1545 if (a_renames
== renames1
) {
1546 a
= ren1
->pair
->two
;
1549 b
= ren1
->pair
->two
;
1552 update_entry(ren1
->dst_entry
, one
, a
, b
);
1553 setup_rename_conflict_info(RENAME_NORMAL
,
1567 string_list_clear(&a_by_dst
, 0);
1568 string_list_clear(&b_by_dst
, 0);
1573 static struct object_id
*stage_oid(const struct object_id
*oid
, unsigned mode
)
1575 return (is_null_oid(oid
) || mode
== 0) ? NULL
: (struct object_id
*)oid
;
1578 static int read_oid_strbuf(const struct object_id
*oid
, struct strbuf
*dst
)
1581 enum object_type type
;
1583 buf
= read_sha1_file(oid
->hash
, &type
, &size
);
1585 return error(_("cannot read object %s"), oid_to_hex(oid
));
1586 if (type
!= OBJ_BLOB
) {
1588 return error(_("object %s is not a blob"), oid_to_hex(oid
));
1590 strbuf_attach(dst
, buf
, size
, size
+ 1);
1594 static int blob_unchanged(const struct object_id
*o_oid
,
1596 const struct object_id
*a_oid
,
1598 int renormalize
, const char *path
)
1600 struct strbuf o
= STRBUF_INIT
;
1601 struct strbuf a
= STRBUF_INIT
;
1602 int ret
= 0; /* assume changed for safety */
1604 if (a_mode
!= o_mode
)
1606 if (oid_eq(o_oid
, a_oid
))
1611 assert(o_oid
&& a_oid
);
1612 if (read_oid_strbuf(o_oid
, &o
) || read_oid_strbuf(a_oid
, &a
))
1615 * Note: binary | is used so that both renormalizations are
1616 * performed. Comparison can be skipped if both files are
1617 * unchanged since their sha1s have already been compared.
1619 if (renormalize_buffer(path
, o
.buf
, o
.len
, &o
) |
1620 renormalize_buffer(path
, a
.buf
, a
.len
, &a
))
1621 ret
= (o
.len
== a
.len
&& !memcmp(o
.buf
, a
.buf
, o
.len
));
1629 static int handle_modify_delete(struct merge_options
*o
,
1631 struct object_id
*o_oid
, int o_mode
,
1632 struct object_id
*a_oid
, int a_mode
,
1633 struct object_id
*b_oid
, int b_mode
)
1635 return handle_change_delete(o
,
1640 _("modify"), _("modified"));
1643 static int merge_content(struct merge_options
*o
,
1645 struct object_id
*o_oid
, int o_mode
,
1646 struct object_id
*a_oid
, int a_mode
,
1647 struct object_id
*b_oid
, int b_mode
,
1648 struct rename_conflict_info
*rename_conflict_info
)
1650 const char *reason
= _("content");
1651 const char *path1
= NULL
, *path2
= NULL
;
1652 struct merge_file_info mfi
;
1653 struct diff_filespec one
, a
, b
;
1654 unsigned df_conflict_remains
= 0;
1657 reason
= _("add/add");
1658 o_oid
= (struct object_id
*)&null_oid
;
1660 one
.path
= a
.path
= b
.path
= (char *)path
;
1661 oidcpy(&one
.oid
, o_oid
);
1663 oidcpy(&a
.oid
, a_oid
);
1665 oidcpy(&b
.oid
, b_oid
);
1668 if (rename_conflict_info
) {
1669 struct diff_filepair
*pair1
= rename_conflict_info
->pair1
;
1671 path1
= (o
->branch1
== rename_conflict_info
->branch1
) ?
1672 pair1
->two
->path
: pair1
->one
->path
;
1673 /* If rename_conflict_info->pair2 != NULL, we are in
1674 * RENAME_ONE_FILE_TO_ONE case. Otherwise, we have a
1677 path2
= (rename_conflict_info
->pair2
||
1678 o
->branch2
== rename_conflict_info
->branch1
) ?
1679 pair1
->two
->path
: pair1
->one
->path
;
1681 if (dir_in_way(path
, !o
->call_depth
))
1682 df_conflict_remains
= 1;
1684 if (merge_file_special_markers(o
, &one
, &a
, &b
,
1686 o
->branch2
, path2
, &mfi
))
1689 if (mfi
.clean
&& !df_conflict_remains
&&
1690 oid_eq(&mfi
.oid
, a_oid
) && mfi
.mode
== a_mode
) {
1691 int path_renamed_outside_HEAD
;
1692 output(o
, 3, _("Skipped %s (merged same as existing)"), path
);
1694 * The content merge resulted in the same file contents we
1695 * already had. We can return early if those file contents
1696 * are recorded at the correct path (which may not be true
1697 * if the merge involves a rename).
1699 path_renamed_outside_HEAD
= !path2
|| !strcmp(path
, path2
);
1700 if (!path_renamed_outside_HEAD
) {
1701 add_cacheinfo(mfi
.mode
, &mfi
.oid
, path
,
1702 0, (!o
->call_depth
), 0);
1706 output(o
, 2, _("Auto-merging %s"), path
);
1709 if (S_ISGITLINK(mfi
.mode
))
1710 reason
= _("submodule");
1711 output(o
, 1, _("CONFLICT (%s): Merge conflict in %s"),
1713 if (rename_conflict_info
&& !df_conflict_remains
)
1714 if (update_stages(path
, &one
, &a
, &b
))
1718 if (df_conflict_remains
) {
1720 if (o
->call_depth
) {
1721 remove_file_from_cache(path
);
1724 if (update_stages(path
, &one
, &a
, &b
))
1727 int file_from_stage2
= was_tracked(path
);
1728 struct diff_filespec merged
;
1729 oidcpy(&merged
.oid
, &mfi
.oid
);
1730 merged
.mode
= mfi
.mode
;
1732 if (update_stages(path
, NULL
,
1733 file_from_stage2
? &merged
: NULL
,
1734 file_from_stage2
? NULL
: &merged
))
1739 new_path
= unique_path(o
, path
, rename_conflict_info
->branch1
);
1740 output(o
, 1, _("Adding as %s instead"), new_path
);
1741 if (update_file(o
, 0, &mfi
.oid
, mfi
.mode
, new_path
)) {
1747 } else if (update_file(o
, mfi
.clean
, &mfi
.oid
, mfi
.mode
, path
))
1752 /* Per entry merge function */
1753 static int process_entry(struct merge_options
*o
,
1754 const char *path
, struct stage_data
*entry
)
1756 int clean_merge
= 1;
1757 int normalize
= o
->renormalize
;
1758 unsigned o_mode
= entry
->stages
[1].mode
;
1759 unsigned a_mode
= entry
->stages
[2].mode
;
1760 unsigned b_mode
= entry
->stages
[3].mode
;
1761 struct object_id
*o_oid
= stage_oid(&entry
->stages
[1].oid
, o_mode
);
1762 struct object_id
*a_oid
= stage_oid(&entry
->stages
[2].oid
, a_mode
);
1763 struct object_id
*b_oid
= stage_oid(&entry
->stages
[3].oid
, b_mode
);
1765 entry
->processed
= 1;
1766 if (entry
->rename_conflict_info
) {
1767 struct rename_conflict_info
*conflict_info
= entry
->rename_conflict_info
;
1768 switch (conflict_info
->rename_type
) {
1770 case RENAME_ONE_FILE_TO_ONE
:
1771 clean_merge
= merge_content(o
, path
,
1772 o_oid
, o_mode
, a_oid
, a_mode
, b_oid
, b_mode
,
1777 if (conflict_rename_delete(o
,
1778 conflict_info
->pair1
,
1779 conflict_info
->branch1
,
1780 conflict_info
->branch2
))
1783 case RENAME_ONE_FILE_TO_TWO
:
1785 if (conflict_rename_rename_1to2(o
, conflict_info
))
1788 case RENAME_TWO_FILES_TO_ONE
:
1790 if (conflict_rename_rename_2to1(o
, conflict_info
))
1794 entry
->processed
= 0;
1797 } else if (o_oid
&& (!a_oid
|| !b_oid
)) {
1798 /* Case A: Deleted in one */
1799 if ((!a_oid
&& !b_oid
) ||
1800 (!b_oid
&& blob_unchanged(o_oid
, o_mode
, a_oid
, a_mode
, normalize
, path
)) ||
1801 (!a_oid
&& blob_unchanged(o_oid
, o_mode
, b_oid
, b_mode
, normalize
, path
))) {
1802 /* Deleted in both or deleted in one and
1803 * unchanged in the other */
1805 output(o
, 2, _("Removing %s"), path
);
1806 /* do not touch working file if it did not exist */
1807 remove_file(o
, 1, path
, !a_oid
);
1809 /* Modify/delete; deleted side may have put a directory in the way */
1811 if (handle_modify_delete(o
, path
, o_oid
, o_mode
,
1812 a_oid
, a_mode
, b_oid
, b_mode
))
1815 } else if ((!o_oid
&& a_oid
&& !b_oid
) ||
1816 (!o_oid
&& !a_oid
&& b_oid
)) {
1817 /* Case B: Added in one. */
1818 /* [nothing|directory] -> ([nothing|directory], file) */
1820 const char *add_branch
;
1821 const char *other_branch
;
1823 const struct object_id
*oid
;
1827 add_branch
= o
->branch1
;
1828 other_branch
= o
->branch2
;
1831 conf
= _("file/directory");
1833 add_branch
= o
->branch2
;
1834 other_branch
= o
->branch1
;
1837 conf
= _("directory/file");
1839 if (dir_in_way(path
, !o
->call_depth
)) {
1840 char *new_path
= unique_path(o
, path
, add_branch
);
1842 output(o
, 1, _("CONFLICT (%s): There is a directory with name %s in %s. "
1844 conf
, path
, other_branch
, path
, new_path
);
1845 if (update_file(o
, 0, oid
, mode
, new_path
))
1847 else if (o
->call_depth
)
1848 remove_file_from_cache(path
);
1851 output(o
, 2, _("Adding %s"), path
);
1852 /* do not overwrite file if already present */
1853 if (update_file_flags(o
, oid
, mode
, path
, 1, !a_oid
))
1856 } else if (a_oid
&& b_oid
) {
1857 /* Case C: Added in both (check for same permissions) and */
1858 /* case D: Modified in both, but differently. */
1859 clean_merge
= merge_content(o
, path
,
1860 o_oid
, o_mode
, a_oid
, a_mode
, b_oid
, b_mode
,
1862 } else if (!o_oid
&& !a_oid
&& !b_oid
) {
1864 * this entry was deleted altogether. a_mode == 0 means
1865 * we had that path and want to actively remove it.
1867 remove_file(o
, 1, path
, !a_mode
);
1869 die("BUG: fatal merge failure, shouldn't happen.");
1874 int merge_trees(struct merge_options
*o
,
1877 struct tree
*common
,
1878 struct tree
**result
)
1882 if (o
->subtree_shift
) {
1883 merge
= shift_tree_object(head
, merge
, o
->subtree_shift
);
1884 common
= shift_tree_object(head
, common
, o
->subtree_shift
);
1887 if (oid_eq(&common
->object
.oid
, &merge
->object
.oid
)) {
1888 output(o
, 0, _("Already up-to-date!"));
1893 code
= git_merge_trees(o
->call_depth
, common
, head
, merge
);
1896 if (show(o
, 4) || o
->call_depth
)
1897 error(_("merging of trees %s and %s failed"),
1898 oid_to_hex(&head
->object
.oid
),
1899 oid_to_hex(&merge
->object
.oid
));
1903 if (unmerged_cache()) {
1904 struct string_list
*entries
, *re_head
, *re_merge
;
1906 string_list_clear(&o
->current_file_set
, 1);
1907 string_list_clear(&o
->current_directory_set
, 1);
1908 get_files_dirs(o
, head
);
1909 get_files_dirs(o
, merge
);
1911 entries
= get_unmerged();
1912 record_df_conflict_files(o
, entries
);
1913 re_head
= get_renames(o
, head
, common
, head
, merge
, entries
);
1914 re_merge
= get_renames(o
, merge
, common
, head
, merge
, entries
);
1915 clean
= process_renames(o
, re_head
, re_merge
);
1918 for (i
= entries
->nr
-1; 0 <= i
; i
--) {
1919 const char *path
= entries
->items
[i
].string
;
1920 struct stage_data
*e
= entries
->items
[i
].util
;
1921 if (!e
->processed
) {
1922 int ret
= process_entry(o
, path
, e
);
1929 for (i
= 0; i
< entries
->nr
; i
++) {
1930 struct stage_data
*e
= entries
->items
[i
].util
;
1932 die("BUG: unprocessed path??? %s",
1933 entries
->items
[i
].string
);
1936 string_list_clear(re_merge
, 0);
1937 string_list_clear(re_head
, 0);
1938 string_list_clear(entries
, 1);
1947 if (o
->call_depth
&& !(*result
= write_tree_from_memory(o
)))
1953 static struct commit_list
*reverse_commit_list(struct commit_list
*list
)
1955 struct commit_list
*next
= NULL
, *current
, *backup
;
1956 for (current
= list
; current
; current
= backup
) {
1957 backup
= current
->next
;
1958 current
->next
= next
;
1965 * Merge the commits h1 and h2, return the resulting virtual
1966 * commit object and a flag indicating the cleanness of the merge.
1968 int merge_recursive(struct merge_options
*o
,
1971 struct commit_list
*ca
,
1972 struct commit
**result
)
1974 struct commit_list
*iter
;
1975 struct commit
*merged_common_ancestors
;
1976 struct tree
*mrtree
= mrtree
;
1980 output(o
, 4, _("Merging:"));
1981 output_commit_title(o
, h1
);
1982 output_commit_title(o
, h2
);
1986 ca
= get_merge_bases(h1
, h2
);
1987 ca
= reverse_commit_list(ca
);
1991 unsigned cnt
= commit_list_count(ca
);
1993 output(o
, 5, Q_("found %u common ancestor:",
1994 "found %u common ancestors:", cnt
), cnt
);
1995 for (iter
= ca
; iter
; iter
= iter
->next
)
1996 output_commit_title(o
, iter
->item
);
1999 merged_common_ancestors
= pop_commit(&ca
);
2000 if (merged_common_ancestors
== NULL
) {
2001 /* if there is no common ancestor, use an empty tree */
2004 tree
= lookup_tree(EMPTY_TREE_SHA1_BIN
);
2005 merged_common_ancestors
= make_virtual_commit(tree
, "ancestor");
2008 for (iter
= ca
; iter
; iter
= iter
->next
) {
2009 const char *saved_b1
, *saved_b2
;
2012 * When the merge fails, the result contains files
2013 * with conflict markers. The cleanness flag is
2014 * ignored (unless indicating an error), it was never
2015 * actually used, as result of merge_trees has always
2016 * overwritten it: the committed "conflicts" were
2020 saved_b1
= o
->branch1
;
2021 saved_b2
= o
->branch2
;
2022 o
->branch1
= "Temporary merge branch 1";
2023 o
->branch2
= "Temporary merge branch 2";
2024 if (merge_recursive(o
, merged_common_ancestors
, iter
->item
,
2025 NULL
, &merged_common_ancestors
) < 0)
2027 o
->branch1
= saved_b1
;
2028 o
->branch2
= saved_b2
;
2031 if (!merged_common_ancestors
)
2032 return error(_("merge returned no commit"));
2039 o
->ancestor
= "merged common ancestors";
2040 clean
= merge_trees(o
, h1
->tree
, h2
->tree
, merged_common_ancestors
->tree
,
2045 if (o
->call_depth
) {
2046 *result
= make_virtual_commit(mrtree
, "merged tree");
2047 commit_list_insert(h1
, &(*result
)->parents
);
2048 commit_list_insert(h2
, &(*result
)->parents
->next
);
2052 diff_warn_rename_limit("merge.renamelimit",
2053 o
->needed_rename_limit
, 0);
2057 static struct commit
*get_ref(const struct object_id
*oid
, const char *name
)
2059 struct object
*object
;
2061 object
= deref_tag(parse_object(oid
->hash
), name
, strlen(name
));
2064 if (object
->type
== OBJ_TREE
)
2065 return make_virtual_commit((struct tree
*)object
, name
);
2066 if (object
->type
!= OBJ_COMMIT
)
2068 if (parse_commit((struct commit
*)object
))
2070 return (struct commit
*)object
;
2073 int merge_recursive_generic(struct merge_options
*o
,
2074 const struct object_id
*head
,
2075 const struct object_id
*merge
,
2077 const struct object_id
**base_list
,
2078 struct commit
**result
)
2081 struct lock_file
*lock
= xcalloc(1, sizeof(struct lock_file
));
2082 struct commit
*head_commit
= get_ref(head
, o
->branch1
);
2083 struct commit
*next_commit
= get_ref(merge
, o
->branch2
);
2084 struct commit_list
*ca
= NULL
;
2088 for (i
= 0; i
< num_base_list
; ++i
) {
2089 struct commit
*base
;
2090 if (!(base
= get_ref(base_list
[i
], oid_to_hex(base_list
[i
]))))
2091 return error(_("Could not parse object '%s'"),
2092 oid_to_hex(base_list
[i
]));
2093 commit_list_insert(base
, &ca
);
2097 hold_locked_index(lock
, 1);
2098 clean
= merge_recursive(o
, head_commit
, next_commit
, ca
,
2103 if (active_cache_changed
&&
2104 write_locked_index(&the_index
, lock
, COMMIT_LOCK
))
2105 return error(_("Unable to write index."));
2107 return clean
? 0 : 1;
2110 static void merge_recursive_config(struct merge_options
*o
)
2112 git_config_get_int("merge.verbosity", &o
->verbosity
);
2113 git_config_get_int("diff.renamelimit", &o
->diff_rename_limit
);
2114 git_config_get_int("merge.renamelimit", &o
->merge_rename_limit
);
2115 git_config(git_xmerge_config
, NULL
);
2118 void init_merge_options(struct merge_options
*o
)
2120 memset(o
, 0, sizeof(struct merge_options
));
2122 o
->buffer_output
= 1;
2123 o
->diff_rename_limit
= -1;
2124 o
->merge_rename_limit
= -1;
2126 o
->detect_rename
= 1;
2127 merge_recursive_config(o
);
2128 if (getenv("GIT_MERGE_VERBOSITY"))
2130 strtol(getenv("GIT_MERGE_VERBOSITY"), NULL
, 10);
2131 if (o
->verbosity
>= 5)
2132 o
->buffer_output
= 0;
2133 strbuf_init(&o
->obuf
, 0);
2134 string_list_init(&o
->current_file_set
, 1);
2135 string_list_init(&o
->current_directory_set
, 1);
2136 string_list_init(&o
->df_conflict_file_set
, 1);
2139 int parse_merge_opt(struct merge_options
*o
, const char *s
)
2145 if (!strcmp(s
, "ours"))
2146 o
->recursive_variant
= MERGE_RECURSIVE_OURS
;
2147 else if (!strcmp(s
, "theirs"))
2148 o
->recursive_variant
= MERGE_RECURSIVE_THEIRS
;
2149 else if (!strcmp(s
, "subtree"))
2150 o
->subtree_shift
= "";
2151 else if (skip_prefix(s
, "subtree=", &arg
))
2152 o
->subtree_shift
= arg
;
2153 else if (!strcmp(s
, "patience"))
2154 o
->xdl_opts
= DIFF_WITH_ALG(o
, PATIENCE_DIFF
);
2155 else if (!strcmp(s
, "histogram"))
2156 o
->xdl_opts
= DIFF_WITH_ALG(o
, HISTOGRAM_DIFF
);
2157 else if (skip_prefix(s
, "diff-algorithm=", &arg
)) {
2158 long value
= parse_algorithm_value(arg
);
2161 /* clear out previous settings */
2162 DIFF_XDL_CLR(o
, NEED_MINIMAL
);
2163 o
->xdl_opts
&= ~XDF_DIFF_ALGORITHM_MASK
;
2164 o
->xdl_opts
|= value
;
2166 else if (!strcmp(s
, "ignore-space-change"))
2167 o
->xdl_opts
|= XDF_IGNORE_WHITESPACE_CHANGE
;
2168 else if (!strcmp(s
, "ignore-all-space"))
2169 o
->xdl_opts
|= XDF_IGNORE_WHITESPACE
;
2170 else if (!strcmp(s
, "ignore-space-at-eol"))
2171 o
->xdl_opts
|= XDF_IGNORE_WHITESPACE_AT_EOL
;
2172 else if (!strcmp(s
, "renormalize"))
2174 else if (!strcmp(s
, "no-renormalize"))
2176 else if (!strcmp(s
, "no-renames"))
2177 o
->detect_rename
= 0;
2178 else if (!strcmp(s
, "find-renames")) {
2179 o
->detect_rename
= 1;
2180 o
->rename_score
= 0;
2182 else if (skip_prefix(s
, "find-renames=", &arg
) ||
2183 skip_prefix(s
, "rename-threshold=", &arg
)) {
2184 if ((o
->rename_score
= parse_rename_score(&arg
)) == -1 || *arg
!= 0)
2186 o
->detect_rename
= 1;