2 * Recursive Merge algorithm stolen from git-merge-recursive.py by
4 * The thieves were Alex Riesen and Johannes Schindelin, in June/July 2006
10 #include "cache-tree.h"
14 #include "tree-walk.h"
18 #include "unpack-trees.h"
19 #include "string-list.h"
20 #include "xdiff-interface.h"
23 #include "merge-recursive.h"
25 #include "submodule.h"
27 struct path_hashmap_entry
{
28 struct hashmap_entry e
;
29 char path
[FLEX_ARRAY
];
32 static int path_hashmap_cmp(const void *cmp_data
,
34 const void *entry_or_key
,
37 const struct path_hashmap_entry
*a
= entry
;
38 const struct path_hashmap_entry
*b
= entry_or_key
;
39 const char *key
= keydata
;
42 return strcasecmp(a
->path
, key
? key
: b
->path
);
44 return strcmp(a
->path
, key
? key
: b
->path
);
47 static unsigned int path_hash(const char *path
)
49 return ignore_case
? strihash(path
) : strhash(path
);
52 static void flush_output(struct merge_options
*o
)
54 if (o
->buffer_output
< 2 && o
->obuf
.len
) {
55 fputs(o
->obuf
.buf
, stdout
);
56 strbuf_reset(&o
->obuf
);
60 static int err(struct merge_options
*o
, const char *err
, ...)
64 if (o
->buffer_output
< 2)
67 strbuf_complete(&o
->obuf
, '\n');
68 strbuf_addstr(&o
->obuf
, "error: ");
70 va_start(params
, err
);
71 strbuf_vaddf(&o
->obuf
, err
, params
);
73 if (o
->buffer_output
> 1)
74 strbuf_addch(&o
->obuf
, '\n');
76 error("%s", o
->obuf
.buf
);
77 strbuf_reset(&o
->obuf
);
83 static struct tree
*shift_tree_object(struct tree
*one
, struct tree
*two
,
84 const char *subtree_shift
)
86 struct object_id shifted
;
88 if (!*subtree_shift
) {
89 shift_tree(&one
->object
.oid
, &two
->object
.oid
, &shifted
, 0);
91 shift_tree_by(&one
->object
.oid
, &two
->object
.oid
, &shifted
,
94 if (!oidcmp(&two
->object
.oid
, &shifted
))
96 return lookup_tree(&shifted
);
99 static struct commit
*make_virtual_commit(struct tree
*tree
, const char *comment
)
101 struct commit
*commit
= alloc_commit_node();
103 set_merge_remote_desc(commit
, comment
, (struct object
*)commit
);
105 commit
->object
.parsed
= 1;
110 * Since we use get_tree_entry(), which does not put the read object into
111 * the object pool, we cannot rely on a == b.
113 static int oid_eq(const struct object_id
*a
, const struct object_id
*b
)
117 return a
&& b
&& oidcmp(a
, b
) == 0;
123 RENAME_ONE_FILE_TO_ONE
,
124 RENAME_ONE_FILE_TO_TWO
,
125 RENAME_TWO_FILES_TO_ONE
128 struct rename_conflict_info
{
129 enum rename_type rename_type
;
130 struct diff_filepair
*pair1
;
131 struct diff_filepair
*pair2
;
134 struct stage_data
*dst_entry1
;
135 struct stage_data
*dst_entry2
;
136 struct diff_filespec ren1_other
;
137 struct diff_filespec ren2_other
;
141 * Since we want to write the index eventually, we cannot reuse the index
142 * for these (temporary) data.
147 struct object_id oid
;
149 struct rename_conflict_info
*rename_conflict_info
;
150 unsigned processed
:1;
153 static inline void setup_rename_conflict_info(enum rename_type rename_type
,
154 struct diff_filepair
*pair1
,
155 struct diff_filepair
*pair2
,
158 struct stage_data
*dst_entry1
,
159 struct stage_data
*dst_entry2
,
160 struct merge_options
*o
,
161 struct stage_data
*src_entry1
,
162 struct stage_data
*src_entry2
)
164 struct rename_conflict_info
*ci
= xcalloc(1, sizeof(struct rename_conflict_info
));
165 ci
->rename_type
= rename_type
;
167 ci
->branch1
= branch1
;
168 ci
->branch2
= branch2
;
170 ci
->dst_entry1
= dst_entry1
;
171 dst_entry1
->rename_conflict_info
= ci
;
172 dst_entry1
->processed
= 0;
174 assert(!pair2
== !dst_entry2
);
176 ci
->dst_entry2
= dst_entry2
;
178 dst_entry2
->rename_conflict_info
= ci
;
181 if (rename_type
== RENAME_TWO_FILES_TO_ONE
) {
183 * For each rename, there could have been
184 * modifications on the side of history where that
185 * file was not renamed.
187 int ostage1
= o
->branch1
== branch1
? 3 : 2;
188 int ostage2
= ostage1
^ 1;
190 ci
->ren1_other
.path
= pair1
->one
->path
;
191 oidcpy(&ci
->ren1_other
.oid
, &src_entry1
->stages
[ostage1
].oid
);
192 ci
->ren1_other
.mode
= src_entry1
->stages
[ostage1
].mode
;
194 ci
->ren2_other
.path
= pair2
->one
->path
;
195 oidcpy(&ci
->ren2_other
.oid
, &src_entry2
->stages
[ostage2
].oid
);
196 ci
->ren2_other
.mode
= src_entry2
->stages
[ostage2
].mode
;
200 static int show(struct merge_options
*o
, int v
)
202 return (!o
->call_depth
&& o
->verbosity
>= v
) || o
->verbosity
>= 5;
205 __attribute__((format (printf
, 3, 4)))
206 static void output(struct merge_options
*o
, int v
, const char *fmt
, ...)
213 strbuf_addchars(&o
->obuf
, ' ', o
->call_depth
* 2);
216 strbuf_vaddf(&o
->obuf
, fmt
, ap
);
219 strbuf_addch(&o
->obuf
, '\n');
220 if (!o
->buffer_output
)
224 static void output_commit_title(struct merge_options
*o
, struct commit
*commit
)
226 strbuf_addchars(&o
->obuf
, ' ', o
->call_depth
* 2);
228 strbuf_addf(&o
->obuf
, "virtual %s\n",
229 merge_remote_util(commit
)->name
);
231 strbuf_add_unique_abbrev(&o
->obuf
, commit
->object
.oid
.hash
,
233 strbuf_addch(&o
->obuf
, ' ');
234 if (parse_commit(commit
) != 0)
235 strbuf_addstr(&o
->obuf
, _("(bad commit)\n"));
238 const char *msg
= get_commit_buffer(commit
, NULL
);
239 int len
= find_commit_subject(msg
, &title
);
241 strbuf_addf(&o
->obuf
, "%.*s\n", len
, title
);
242 unuse_commit_buffer(commit
, msg
);
248 static int add_cacheinfo(struct merge_options
*o
,
249 unsigned int mode
, const struct object_id
*oid
,
250 const char *path
, int stage
, int refresh
, int options
)
252 struct cache_entry
*ce
;
255 ce
= make_cache_entry(mode
, oid
? oid
->hash
: null_sha1
, path
, stage
, 0);
257 return err(o
, _("addinfo_cache failed for path '%s'"), path
);
259 ret
= add_cache_entry(ce
, options
);
261 struct cache_entry
*nce
;
263 nce
= refresh_cache_entry(ce
, CE_MATCH_REFRESH
| CE_MATCH_IGNORE_MISSING
);
265 return err(o
, _("addinfo_cache failed for path '%s'"), path
);
267 ret
= add_cache_entry(nce
, options
);
272 static void init_tree_desc_from_tree(struct tree_desc
*desc
, struct tree
*tree
)
275 init_tree_desc(desc
, tree
->buffer
, tree
->size
);
278 static int git_merge_trees(int index_only
,
284 struct tree_desc t
[3];
285 struct unpack_trees_options opts
;
287 memset(&opts
, 0, sizeof(opts
));
294 opts
.fn
= threeway_merge
;
295 opts
.src_index
= &the_index
;
296 opts
.dst_index
= &the_index
;
297 setup_unpack_trees_porcelain(&opts
, "merge");
299 init_tree_desc_from_tree(t
+0, common
);
300 init_tree_desc_from_tree(t
+1, head
);
301 init_tree_desc_from_tree(t
+2, merge
);
303 rc
= unpack_trees(3, t
, &opts
);
304 cache_tree_free(&active_cache_tree
);
308 struct tree
*write_tree_from_memory(struct merge_options
*o
)
310 struct tree
*result
= NULL
;
312 if (unmerged_cache()) {
314 fprintf(stderr
, "BUG: There are unmerged index entries:\n");
315 for (i
= 0; i
< active_nr
; i
++) {
316 const struct cache_entry
*ce
= active_cache
[i
];
318 fprintf(stderr
, "BUG: %d %.*s\n", ce_stage(ce
),
319 (int)ce_namelen(ce
), ce
->name
);
321 die("BUG: unmerged index entries in merge-recursive.c");
324 if (!active_cache_tree
)
325 active_cache_tree
= cache_tree();
327 if (!cache_tree_fully_valid(active_cache_tree
) &&
328 cache_tree_update(&the_index
, 0) < 0) {
329 err(o
, _("error building trees"));
333 result
= lookup_tree(&active_cache_tree
->oid
);
338 static int save_files_dirs(const unsigned char *sha1
,
339 struct strbuf
*base
, const char *path
,
340 unsigned int mode
, int stage
, void *context
)
342 struct path_hashmap_entry
*entry
;
343 int baselen
= base
->len
;
344 struct merge_options
*o
= context
;
346 strbuf_addstr(base
, path
);
348 FLEX_ALLOC_MEM(entry
, path
, base
->buf
, base
->len
);
349 hashmap_entry_init(entry
, path_hash(entry
->path
));
350 hashmap_add(&o
->current_file_dir_set
, entry
);
352 strbuf_setlen(base
, baselen
);
353 return (S_ISDIR(mode
) ? READ_TREE_RECURSIVE
: 0);
356 static void get_files_dirs(struct merge_options
*o
, struct tree
*tree
)
358 struct pathspec match_all
;
359 memset(&match_all
, 0, sizeof(match_all
));
360 read_tree_recursive(tree
, "", 0, 0, &match_all
, save_files_dirs
, o
);
364 * Returns an index_entry instance which doesn't have to correspond to
365 * a real cache entry in Git's index.
367 static struct stage_data
*insert_stage_data(const char *path
,
368 struct tree
*o
, struct tree
*a
, struct tree
*b
,
369 struct string_list
*entries
)
371 struct string_list_item
*item
;
372 struct stage_data
*e
= xcalloc(1, sizeof(struct stage_data
));
373 get_tree_entry(o
->object
.oid
.hash
, path
,
374 e
->stages
[1].oid
.hash
, &e
->stages
[1].mode
);
375 get_tree_entry(a
->object
.oid
.hash
, path
,
376 e
->stages
[2].oid
.hash
, &e
->stages
[2].mode
);
377 get_tree_entry(b
->object
.oid
.hash
, path
,
378 e
->stages
[3].oid
.hash
, &e
->stages
[3].mode
);
379 item
= string_list_insert(entries
, path
);
385 * Create a dictionary mapping file names to stage_data objects. The
386 * dictionary contains one entry for every path with a non-zero stage entry.
388 static struct string_list
*get_unmerged(void)
390 struct string_list
*unmerged
= xcalloc(1, sizeof(struct string_list
));
393 unmerged
->strdup_strings
= 1;
395 for (i
= 0; i
< active_nr
; i
++) {
396 struct string_list_item
*item
;
397 struct stage_data
*e
;
398 const struct cache_entry
*ce
= active_cache
[i
];
402 item
= string_list_lookup(unmerged
, ce
->name
);
404 item
= string_list_insert(unmerged
, ce
->name
);
405 item
->util
= xcalloc(1, sizeof(struct stage_data
));
408 e
->stages
[ce_stage(ce
)].mode
= ce
->ce_mode
;
409 oidcpy(&e
->stages
[ce_stage(ce
)].oid
, &ce
->oid
);
415 static int string_list_df_name_compare(const char *one
, const char *two
)
417 int onelen
= strlen(one
);
418 int twolen
= strlen(two
);
420 * Here we only care that entries for D/F conflicts are
421 * adjacent, in particular with the file of the D/F conflict
422 * appearing before files below the corresponding directory.
423 * The order of the rest of the list is irrelevant for us.
425 * To achieve this, we sort with df_name_compare and provide
426 * the mode S_IFDIR so that D/F conflicts will sort correctly.
427 * We use the mode S_IFDIR for everything else for simplicity,
428 * since in other cases any changes in their order due to
429 * sorting cause no problems for us.
431 int cmp
= df_name_compare(one
, onelen
, S_IFDIR
,
432 two
, twolen
, S_IFDIR
);
434 * Now that 'foo' and 'foo/bar' compare equal, we have to make sure
435 * that 'foo' comes before 'foo/bar'.
439 return onelen
- twolen
;
442 static void record_df_conflict_files(struct merge_options
*o
,
443 struct string_list
*entries
)
445 /* If there is a D/F conflict and the file for such a conflict
446 * currently exist in the working tree, we want to allow it to be
447 * removed to make room for the corresponding directory if needed.
448 * The files underneath the directories of such D/F conflicts will
449 * be processed before the corresponding file involved in the D/F
450 * conflict. If the D/F directory ends up being removed by the
451 * merge, then we won't have to touch the D/F file. If the D/F
452 * directory needs to be written to the working copy, then the D/F
453 * file will simply be removed (in make_room_for_path()) to make
454 * room for the necessary paths. Note that if both the directory
455 * and the file need to be present, then the D/F file will be
456 * reinstated with a new unique name at the time it is processed.
458 struct string_list df_sorted_entries
= STRING_LIST_INIT_NODUP
;
459 const char *last_file
= NULL
;
464 * If we're merging merge-bases, we don't want to bother with
465 * any working directory changes.
470 /* Ensure D/F conflicts are adjacent in the entries list. */
471 for (i
= 0; i
< entries
->nr
; i
++) {
472 struct string_list_item
*next
= &entries
->items
[i
];
473 string_list_append(&df_sorted_entries
, next
->string
)->util
=
476 df_sorted_entries
.cmp
= string_list_df_name_compare
;
477 string_list_sort(&df_sorted_entries
);
479 string_list_clear(&o
->df_conflict_file_set
, 1);
480 for (i
= 0; i
< df_sorted_entries
.nr
; i
++) {
481 const char *path
= df_sorted_entries
.items
[i
].string
;
482 int len
= strlen(path
);
483 struct stage_data
*e
= df_sorted_entries
.items
[i
].util
;
486 * Check if last_file & path correspond to a D/F conflict;
487 * i.e. whether path is last_file+'/'+<something>.
488 * If so, record that it's okay to remove last_file to make
489 * room for path and friends if needed.
493 memcmp(path
, last_file
, last_len
) == 0 &&
494 path
[last_len
] == '/') {
495 string_list_insert(&o
->df_conflict_file_set
, last_file
);
499 * Determine whether path could exist as a file in the
500 * working directory as a possible D/F conflict. This
501 * will only occur when it exists in stage 2 as a
504 if (S_ISREG(e
->stages
[2].mode
) || S_ISLNK(e
->stages
[2].mode
)) {
511 string_list_clear(&df_sorted_entries
, 0);
515 struct diff_filepair
*pair
;
517 * Purpose of src_entry and dst_entry:
519 * If 'before' is renamed to 'after' then src_entry will contain
520 * the versions of 'before' from the merge_base, HEAD, and MERGE in
521 * stages 1, 2, and 3; dst_entry will contain the respective
522 * versions of 'after' in corresponding locations. Thus, we have a
523 * total of six modes and oids, though some will be null. (Stage 0
524 * is ignored; we're interested in handling conflicts.)
526 * Since we don't turn on break-rewrites by default, neither
527 * src_entry nor dst_entry can have all three of their stages have
528 * non-null oids, meaning at most four of the six will be non-null.
529 * Also, since this is a rename, both src_entry and dst_entry will
530 * have at least one non-null oid, meaning at least two will be
531 * non-null. Of the six oids, a typical rename will have three be
532 * non-null. Only two implies a rename/delete, and four implies a
535 struct stage_data
*src_entry
;
536 struct stage_data
*dst_entry
;
537 unsigned processed
:1;
541 * Get information of all renames which occurred between 'o_tree' and
542 * 'tree'. We need the three trees in the merge ('o_tree', 'a_tree' and
543 * 'b_tree') to be able to associate the correct cache entries with
544 * the rename information. 'tree' is always equal to either a_tree or b_tree.
546 static struct string_list
*get_renames(struct merge_options
*o
,
551 struct string_list
*entries
)
554 struct string_list
*renames
;
555 struct diff_options opts
;
557 renames
= xcalloc(1, sizeof(struct string_list
));
558 if (!o
->detect_rename
)
562 opts
.flags
.recursive
= 1;
563 opts
.flags
.rename_empty
= 0;
564 opts
.detect_rename
= DIFF_DETECT_RENAME
;
565 opts
.rename_limit
= o
->merge_rename_limit
>= 0 ? o
->merge_rename_limit
:
566 o
->diff_rename_limit
>= 0 ? o
->diff_rename_limit
:
568 opts
.rename_score
= o
->rename_score
;
569 opts
.show_rename_progress
= o
->show_rename_progress
;
570 opts
.output_format
= DIFF_FORMAT_NO_OUTPUT
;
571 diff_setup_done(&opts
);
572 diff_tree_oid(&o_tree
->object
.oid
, &tree
->object
.oid
, "", &opts
);
574 if (opts
.needed_rename_limit
> o
->needed_rename_limit
)
575 o
->needed_rename_limit
= opts
.needed_rename_limit
;
576 for (i
= 0; i
< diff_queued_diff
.nr
; ++i
) {
577 struct string_list_item
*item
;
579 struct diff_filepair
*pair
= diff_queued_diff
.queue
[i
];
580 if (pair
->status
!= 'R') {
581 diff_free_filepair(pair
);
584 re
= xmalloc(sizeof(*re
));
587 item
= string_list_lookup(entries
, re
->pair
->one
->path
);
589 re
->src_entry
= insert_stage_data(re
->pair
->one
->path
,
590 o_tree
, a_tree
, b_tree
, entries
);
592 re
->src_entry
= item
->util
;
594 item
= string_list_lookup(entries
, re
->pair
->two
->path
);
596 re
->dst_entry
= insert_stage_data(re
->pair
->two
->path
,
597 o_tree
, a_tree
, b_tree
, entries
);
599 re
->dst_entry
= item
->util
;
600 item
= string_list_insert(renames
, pair
->one
->path
);
603 opts
.output_format
= DIFF_FORMAT_NO_OUTPUT
;
604 diff_queued_diff
.nr
= 0;
609 static int update_stages(struct merge_options
*opt
, const char *path
,
610 const struct diff_filespec
*o
,
611 const struct diff_filespec
*a
,
612 const struct diff_filespec
*b
)
616 * NOTE: It is usually a bad idea to call update_stages on a path
617 * before calling update_file on that same path, since it can
618 * sometimes lead to spurious "refusing to lose untracked file..."
619 * messages from update_file (via make_room_for path via
620 * would_lose_untracked). Instead, reverse the order of the calls
621 * (executing update_file first and then update_stages).
624 int options
= ADD_CACHE_OK_TO_ADD
| ADD_CACHE_SKIP_DFCHECK
;
626 if (remove_file_from_cache(path
))
629 if (add_cacheinfo(opt
, o
->mode
, &o
->oid
, path
, 1, 0, options
))
632 if (add_cacheinfo(opt
, a
->mode
, &a
->oid
, path
, 2, 0, options
))
635 if (add_cacheinfo(opt
, b
->mode
, &b
->oid
, path
, 3, 0, options
))
640 static void update_entry(struct stage_data
*entry
,
641 struct diff_filespec
*o
,
642 struct diff_filespec
*a
,
643 struct diff_filespec
*b
)
645 entry
->processed
= 0;
646 entry
->stages
[1].mode
= o
->mode
;
647 entry
->stages
[2].mode
= a
->mode
;
648 entry
->stages
[3].mode
= b
->mode
;
649 oidcpy(&entry
->stages
[1].oid
, &o
->oid
);
650 oidcpy(&entry
->stages
[2].oid
, &a
->oid
);
651 oidcpy(&entry
->stages
[3].oid
, &b
->oid
);
654 static int remove_file(struct merge_options
*o
, int clean
,
655 const char *path
, int no_wd
)
657 int update_cache
= o
->call_depth
|| clean
;
658 int update_working_directory
= !o
->call_depth
&& !no_wd
;
661 if (remove_file_from_cache(path
))
664 if (update_working_directory
) {
666 struct cache_entry
*ce
;
667 ce
= cache_file_exists(path
, strlen(path
), ignore_case
);
668 if (ce
&& ce_stage(ce
) == 0 && strcmp(path
, ce
->name
))
671 if (remove_path(path
))
677 /* add a string to a strbuf, but converting "/" to "_" */
678 static void add_flattened_path(struct strbuf
*out
, const char *s
)
681 strbuf_addstr(out
, s
);
682 for (; i
< out
->len
; i
++)
683 if (out
->buf
[i
] == '/')
687 static char *unique_path(struct merge_options
*o
, const char *path
, const char *branch
)
689 struct path_hashmap_entry
*entry
;
690 struct strbuf newpath
= STRBUF_INIT
;
694 strbuf_addf(&newpath
, "%s~", path
);
695 add_flattened_path(&newpath
, branch
);
697 base_len
= newpath
.len
;
698 while (hashmap_get_from_hash(&o
->current_file_dir_set
,
699 path_hash(newpath
.buf
), newpath
.buf
) ||
700 (!o
->call_depth
&& file_exists(newpath
.buf
))) {
701 strbuf_setlen(&newpath
, base_len
);
702 strbuf_addf(&newpath
, "_%d", suffix
++);
705 FLEX_ALLOC_MEM(entry
, path
, newpath
.buf
, newpath
.len
);
706 hashmap_entry_init(entry
, path_hash(entry
->path
));
707 hashmap_add(&o
->current_file_dir_set
, entry
);
708 return strbuf_detach(&newpath
, NULL
);
712 * Check whether a directory in the index is in the way of an incoming
713 * file. Return 1 if so. If check_working_copy is non-zero, also
714 * check the working directory. If empty_ok is non-zero, also return
715 * 0 in the case where the working-tree dir exists but is empty.
717 static int dir_in_way(const char *path
, int check_working_copy
, int empty_ok
)
720 struct strbuf dirpath
= STRBUF_INIT
;
723 strbuf_addstr(&dirpath
, path
);
724 strbuf_addch(&dirpath
, '/');
726 pos
= cache_name_pos(dirpath
.buf
, dirpath
.len
);
730 if (pos
< active_nr
&&
731 !strncmp(dirpath
.buf
, active_cache
[pos
]->name
, dirpath
.len
)) {
732 strbuf_release(&dirpath
);
736 strbuf_release(&dirpath
);
737 return check_working_copy
&& !lstat(path
, &st
) && S_ISDIR(st
.st_mode
) &&
738 !(empty_ok
&& is_empty_dir(path
));
741 static int was_tracked(const char *path
)
743 int pos
= cache_name_pos(path
, strlen(path
));
746 /* we have been tracking this path */
750 * Look for an unmerged entry for the path,
751 * specifically stage #2, which would indicate
752 * that "our" side before the merge started
753 * had the path tracked (and resulted in a conflict).
756 pos
< active_nr
&& !strcmp(path
, active_cache
[pos
]->name
);
758 if (ce_stage(active_cache
[pos
]) == 2)
763 static int would_lose_untracked(const char *path
)
765 return !was_tracked(path
) && file_exists(path
);
768 static int make_room_for_path(struct merge_options
*o
, const char *path
)
771 const char *msg
= _("failed to create path '%s'%s");
773 /* Unlink any D/F conflict files that are in the way */
774 for (i
= 0; i
< o
->df_conflict_file_set
.nr
; i
++) {
775 const char *df_path
= o
->df_conflict_file_set
.items
[i
].string
;
776 size_t pathlen
= strlen(path
);
777 size_t df_pathlen
= strlen(df_path
);
778 if (df_pathlen
< pathlen
&&
779 path
[df_pathlen
] == '/' &&
780 strncmp(path
, df_path
, df_pathlen
) == 0) {
782 _("Removing %s to make room for subdirectory\n"),
785 unsorted_string_list_delete_item(&o
->df_conflict_file_set
,
791 /* Make sure leading directories are created */
792 status
= safe_create_leading_directories_const(path
);
794 if (status
== SCLD_EXISTS
)
795 /* something else exists */
796 return err(o
, msg
, path
, _(": perhaps a D/F conflict?"));
797 return err(o
, msg
, path
, "");
801 * Do not unlink a file in the work tree if we are not
804 if (would_lose_untracked(path
))
805 return err(o
, _("refusing to lose untracked file at '%s'"),
808 /* Successful unlink is good.. */
811 /* .. and so is no existing file */
814 /* .. but not some other error (who really cares what?) */
815 return err(o
, msg
, path
, _(": perhaps a D/F conflict?"));
818 static int update_file_flags(struct merge_options
*o
,
819 const struct object_id
*oid
,
831 enum object_type type
;
835 if (S_ISGITLINK(mode
)) {
837 * We may later decide to recursively descend into
838 * the submodule directory and update its index
839 * and/or work tree, but we do not do that now.
845 buf
= read_sha1_file(oid
->hash
, &type
, &size
);
847 return err(o
, _("cannot read object %s '%s'"), oid_to_hex(oid
), path
);
848 if (type
!= OBJ_BLOB
) {
849 ret
= err(o
, _("blob expected for %s '%s'"), oid_to_hex(oid
), path
);
853 struct strbuf strbuf
= STRBUF_INIT
;
854 if (convert_to_working_tree(path
, buf
, size
, &strbuf
)) {
857 buf
= strbuf_detach(&strbuf
, NULL
);
861 if (make_room_for_path(o
, path
) < 0) {
865 if (S_ISREG(mode
) || (!has_symlinks
&& S_ISLNK(mode
))) {
871 fd
= open(path
, O_WRONLY
| O_TRUNC
| O_CREAT
, mode
);
873 ret
= err(o
, _("failed to open '%s': %s"),
874 path
, strerror(errno
));
877 write_in_full(fd
, buf
, size
);
879 } else if (S_ISLNK(mode
)) {
880 char *lnk
= xmemdupz(buf
, size
);
881 safe_create_leading_directories_const(path
);
883 if (symlink(lnk
, path
))
884 ret
= err(o
, _("failed to symlink '%s': %s"),
885 path
, strerror(errno
));
889 _("do not know what to do with %06o %s '%s'"),
890 mode
, oid_to_hex(oid
), path
);
895 if (!ret
&& update_cache
)
896 add_cacheinfo(o
, mode
, oid
, path
, 0, update_wd
, ADD_CACHE_OK_TO_ADD
);
900 static int update_file(struct merge_options
*o
,
902 const struct object_id
*oid
,
906 return update_file_flags(o
, oid
, mode
, path
, o
->call_depth
|| clean
, !o
->call_depth
);
909 /* Low level file merging, update and removal */
911 struct merge_file_info
{
912 struct object_id oid
;
918 static int merge_3way(struct merge_options
*o
,
919 mmbuffer_t
*result_buf
,
920 const struct diff_filespec
*one
,
921 const struct diff_filespec
*a
,
922 const struct diff_filespec
*b
,
926 mmfile_t orig
, src1
, src2
;
927 struct ll_merge_options ll_opts
= {0};
928 char *base_name
, *name1
, *name2
;
931 ll_opts
.renormalize
= o
->renormalize
;
932 ll_opts
.xdl_opts
= o
->xdl_opts
;
935 ll_opts
.virtual_ancestor
= 1;
938 switch (o
->recursive_variant
) {
939 case MERGE_RECURSIVE_OURS
:
940 ll_opts
.variant
= XDL_MERGE_FAVOR_OURS
;
942 case MERGE_RECURSIVE_THEIRS
:
943 ll_opts
.variant
= XDL_MERGE_FAVOR_THEIRS
;
951 if (strcmp(a
->path
, b
->path
) ||
952 (o
->ancestor
!= NULL
&& strcmp(a
->path
, one
->path
) != 0)) {
953 base_name
= o
->ancestor
== NULL
? NULL
:
954 mkpathdup("%s:%s", o
->ancestor
, one
->path
);
955 name1
= mkpathdup("%s:%s", branch1
, a
->path
);
956 name2
= mkpathdup("%s:%s", branch2
, b
->path
);
958 base_name
= o
->ancestor
== NULL
? NULL
:
959 mkpathdup("%s", o
->ancestor
);
960 name1
= mkpathdup("%s", branch1
);
961 name2
= mkpathdup("%s", branch2
);
964 read_mmblob(&orig
, &one
->oid
);
965 read_mmblob(&src1
, &a
->oid
);
966 read_mmblob(&src2
, &b
->oid
);
968 merge_status
= ll_merge(result_buf
, a
->path
, &orig
, base_name
,
969 &src1
, name1
, &src2
, name2
, &ll_opts
);
980 static int merge_file_1(struct merge_options
*o
,
981 const struct diff_filespec
*one
,
982 const struct diff_filespec
*a
,
983 const struct diff_filespec
*b
,
986 struct merge_file_info
*result
)
991 if ((S_IFMT
& a
->mode
) != (S_IFMT
& b
->mode
)) {
993 if (S_ISREG(a
->mode
)) {
994 result
->mode
= a
->mode
;
995 oidcpy(&result
->oid
, &a
->oid
);
997 result
->mode
= b
->mode
;
998 oidcpy(&result
->oid
, &b
->oid
);
1001 if (!oid_eq(&a
->oid
, &one
->oid
) && !oid_eq(&b
->oid
, &one
->oid
))
1007 if (a
->mode
== b
->mode
|| a
->mode
== one
->mode
)
1008 result
->mode
= b
->mode
;
1010 result
->mode
= a
->mode
;
1011 if (b
->mode
!= one
->mode
) {
1017 if (oid_eq(&a
->oid
, &b
->oid
) || oid_eq(&a
->oid
, &one
->oid
))
1018 oidcpy(&result
->oid
, &b
->oid
);
1019 else if (oid_eq(&b
->oid
, &one
->oid
))
1020 oidcpy(&result
->oid
, &a
->oid
);
1021 else if (S_ISREG(a
->mode
)) {
1022 mmbuffer_t result_buf
;
1023 int ret
= 0, merge_status
;
1025 merge_status
= merge_3way(o
, &result_buf
, one
, a
, b
,
1028 if ((merge_status
< 0) || !result_buf
.ptr
)
1029 ret
= err(o
, _("Failed to execute internal merge"));
1031 if (!ret
&& write_sha1_file(result_buf
.ptr
, result_buf
.size
,
1032 blob_type
, result
->oid
.hash
))
1033 ret
= err(o
, _("Unable to add %s to database"),
1036 free(result_buf
.ptr
);
1039 result
->clean
= (merge_status
== 0);
1040 } else if (S_ISGITLINK(a
->mode
)) {
1041 result
->clean
= merge_submodule(&result
->oid
,
1047 } else if (S_ISLNK(a
->mode
)) {
1048 oidcpy(&result
->oid
, &a
->oid
);
1050 if (!oid_eq(&a
->oid
, &b
->oid
))
1053 die("BUG: unsupported object type in the tree");
1059 static int merge_file_special_markers(struct merge_options
*o
,
1060 const struct diff_filespec
*one
,
1061 const struct diff_filespec
*a
,
1062 const struct diff_filespec
*b
,
1063 const char *branch1
,
1064 const char *filename1
,
1065 const char *branch2
,
1066 const char *filename2
,
1067 struct merge_file_info
*mfi
)
1074 side1
= xstrfmt("%s:%s", branch1
, filename1
);
1076 side2
= xstrfmt("%s:%s", branch2
, filename2
);
1078 ret
= merge_file_1(o
, one
, a
, b
,
1079 side1
? side1
: branch1
,
1080 side2
? side2
: branch2
, mfi
);
1086 static int merge_file_one(struct merge_options
*o
,
1088 const struct object_id
*o_oid
, int o_mode
,
1089 const struct object_id
*a_oid
, int a_mode
,
1090 const struct object_id
*b_oid
, int b_mode
,
1091 const char *branch1
,
1092 const char *branch2
,
1093 struct merge_file_info
*mfi
)
1095 struct diff_filespec one
, a
, b
;
1097 one
.path
= a
.path
= b
.path
= (char *)path
;
1098 oidcpy(&one
.oid
, o_oid
);
1100 oidcpy(&a
.oid
, a_oid
);
1102 oidcpy(&b
.oid
, b_oid
);
1104 return merge_file_1(o
, &one
, &a
, &b
, branch1
, branch2
, mfi
);
1107 static int handle_change_delete(struct merge_options
*o
,
1108 const char *path
, const char *old_path
,
1109 const struct object_id
*o_oid
, int o_mode
,
1110 const struct object_id
*changed_oid
,
1112 const char *change_branch
,
1113 const char *delete_branch
,
1114 const char *change
, const char *change_past
)
1116 char *alt_path
= NULL
;
1117 const char *update_path
= path
;
1120 if (dir_in_way(path
, !o
->call_depth
, 0)) {
1121 update_path
= alt_path
= unique_path(o
, path
, change_branch
);
1124 if (o
->call_depth
) {
1126 * We cannot arbitrarily accept either a_sha or b_sha as
1127 * correct; since there is no true "middle point" between
1128 * them, simply reuse the base version for virtual merge base.
1130 ret
= remove_file_from_cache(path
);
1132 ret
= update_file(o
, 0, o_oid
, o_mode
, update_path
);
1136 output(o
, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1137 "and %s in %s. Version %s of %s left in tree."),
1138 change
, path
, delete_branch
, change_past
,
1139 change_branch
, change_branch
, path
);
1141 output(o
, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1142 "and %s to %s in %s. Version %s of %s left in tree."),
1143 change
, old_path
, delete_branch
, change_past
, path
,
1144 change_branch
, change_branch
, path
);
1148 output(o
, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1149 "and %s in %s. Version %s of %s left in tree at %s."),
1150 change
, path
, delete_branch
, change_past
,
1151 change_branch
, change_branch
, path
, alt_path
);
1153 output(o
, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1154 "and %s to %s in %s. Version %s of %s left in tree at %s."),
1155 change
, old_path
, delete_branch
, change_past
, path
,
1156 change_branch
, change_branch
, path
, alt_path
);
1160 * No need to call update_file() on path when change_branch ==
1161 * o->branch1 && !alt_path, since that would needlessly touch
1162 * path. We could call update_file_flags() with update_cache=0
1163 * and update_wd=0, but that's a no-op.
1165 if (change_branch
!= o
->branch1
|| alt_path
)
1166 ret
= update_file(o
, 0, changed_oid
, changed_mode
, update_path
);
1173 static int conflict_rename_delete(struct merge_options
*o
,
1174 struct diff_filepair
*pair
,
1175 const char *rename_branch
,
1176 const char *delete_branch
)
1178 const struct diff_filespec
*orig
= pair
->one
;
1179 const struct diff_filespec
*dest
= pair
->two
;
1181 if (handle_change_delete(o
,
1182 o
->call_depth
? orig
->path
: dest
->path
,
1183 o
->call_depth
? NULL
: orig
->path
,
1184 &orig
->oid
, orig
->mode
,
1185 &dest
->oid
, dest
->mode
,
1186 rename_branch
, delete_branch
,
1187 _("rename"), _("renamed")))
1191 return remove_file_from_cache(dest
->path
);
1193 return update_stages(o
, dest
->path
, NULL
,
1194 rename_branch
== o
->branch1
? dest
: NULL
,
1195 rename_branch
== o
->branch1
? NULL
: dest
);
1198 static struct diff_filespec
*filespec_from_entry(struct diff_filespec
*target
,
1199 struct stage_data
*entry
,
1202 struct object_id
*oid
= &entry
->stages
[stage
].oid
;
1203 unsigned mode
= entry
->stages
[stage
].mode
;
1204 if (mode
== 0 || is_null_oid(oid
))
1206 oidcpy(&target
->oid
, oid
);
1207 target
->mode
= mode
;
1211 static int handle_file(struct merge_options
*o
,
1212 struct diff_filespec
*rename
,
1214 struct rename_conflict_info
*ci
)
1216 char *dst_name
= rename
->path
;
1217 struct stage_data
*dst_entry
;
1218 const char *cur_branch
, *other_branch
;
1219 struct diff_filespec other
;
1220 struct diff_filespec
*add
;
1224 dst_entry
= ci
->dst_entry1
;
1225 cur_branch
= ci
->branch1
;
1226 other_branch
= ci
->branch2
;
1228 dst_entry
= ci
->dst_entry2
;
1229 cur_branch
= ci
->branch2
;
1230 other_branch
= ci
->branch1
;
1233 add
= filespec_from_entry(&other
, dst_entry
, stage
^ 1);
1235 char *add_name
= unique_path(o
, rename
->path
, other_branch
);
1236 if (update_file(o
, 0, &add
->oid
, add
->mode
, add_name
))
1239 remove_file(o
, 0, rename
->path
, 0);
1240 dst_name
= unique_path(o
, rename
->path
, cur_branch
);
1242 if (dir_in_way(rename
->path
, !o
->call_depth
, 0)) {
1243 dst_name
= unique_path(o
, rename
->path
, cur_branch
);
1244 output(o
, 1, _("%s is a directory in %s adding as %s instead"),
1245 rename
->path
, other_branch
, dst_name
);
1248 if ((ret
= update_file(o
, 0, &rename
->oid
, rename
->mode
, dst_name
)))
1249 ; /* fall through, do allow dst_name to be released */
1250 else if (stage
== 2)
1251 ret
= update_stages(o
, rename
->path
, NULL
, rename
, add
);
1253 ret
= update_stages(o
, rename
->path
, NULL
, add
, rename
);
1255 if (dst_name
!= rename
->path
)
1261 static int conflict_rename_rename_1to2(struct merge_options
*o
,
1262 struct rename_conflict_info
*ci
)
1264 /* One file was renamed in both branches, but to different names. */
1265 struct diff_filespec
*one
= ci
->pair1
->one
;
1266 struct diff_filespec
*a
= ci
->pair1
->two
;
1267 struct diff_filespec
*b
= ci
->pair2
->two
;
1269 output(o
, 1, _("CONFLICT (rename/rename): "
1270 "Rename \"%s\"->\"%s\" in branch \"%s\" "
1271 "rename \"%s\"->\"%s\" in \"%s\"%s"),
1272 one
->path
, a
->path
, ci
->branch1
,
1273 one
->path
, b
->path
, ci
->branch2
,
1274 o
->call_depth
? _(" (left unresolved)") : "");
1275 if (o
->call_depth
) {
1276 struct merge_file_info mfi
;
1277 struct diff_filespec other
;
1278 struct diff_filespec
*add
;
1279 if (merge_file_one(o
, one
->path
,
1280 &one
->oid
, one
->mode
,
1283 ci
->branch1
, ci
->branch2
, &mfi
))
1287 * FIXME: For rename/add-source conflicts (if we could detect
1288 * such), this is wrong. We should instead find a unique
1289 * pathname and then either rename the add-source file to that
1290 * unique path, or use that unique path instead of src here.
1292 if (update_file(o
, 0, &mfi
.oid
, mfi
.mode
, one
->path
))
1296 * Above, we put the merged content at the merge-base's
1297 * path. Now we usually need to delete both a->path and
1298 * b->path. However, the rename on each side of the merge
1299 * could also be involved in a rename/add conflict. In
1300 * such cases, we should keep the added file around,
1301 * resolving the conflict at that path in its favor.
1303 add
= filespec_from_entry(&other
, ci
->dst_entry1
, 2 ^ 1);
1305 if (update_file(o
, 0, &add
->oid
, add
->mode
, a
->path
))
1309 remove_file_from_cache(a
->path
);
1310 add
= filespec_from_entry(&other
, ci
->dst_entry2
, 3 ^ 1);
1312 if (update_file(o
, 0, &add
->oid
, add
->mode
, b
->path
))
1316 remove_file_from_cache(b
->path
);
1317 } else if (handle_file(o
, a
, 2, ci
) || handle_file(o
, b
, 3, ci
))
1323 static int conflict_rename_rename_2to1(struct merge_options
*o
,
1324 struct rename_conflict_info
*ci
)
1326 /* Two files, a & b, were renamed to the same thing, c. */
1327 struct diff_filespec
*a
= ci
->pair1
->one
;
1328 struct diff_filespec
*b
= ci
->pair2
->one
;
1329 struct diff_filespec
*c1
= ci
->pair1
->two
;
1330 struct diff_filespec
*c2
= ci
->pair2
->two
;
1331 char *path
= c1
->path
; /* == c2->path */
1332 struct merge_file_info mfi_c1
;
1333 struct merge_file_info mfi_c2
;
1336 output(o
, 1, _("CONFLICT (rename/rename): "
1337 "Rename %s->%s in %s. "
1338 "Rename %s->%s in %s"),
1339 a
->path
, c1
->path
, ci
->branch1
,
1340 b
->path
, c2
->path
, ci
->branch2
);
1342 remove_file(o
, 1, a
->path
, o
->call_depth
|| would_lose_untracked(a
->path
));
1343 remove_file(o
, 1, b
->path
, o
->call_depth
|| would_lose_untracked(b
->path
));
1345 if (merge_file_special_markers(o
, a
, c1
, &ci
->ren1_other
,
1346 o
->branch1
, c1
->path
,
1347 o
->branch2
, ci
->ren1_other
.path
, &mfi_c1
) ||
1348 merge_file_special_markers(o
, b
, &ci
->ren2_other
, c2
,
1349 o
->branch1
, ci
->ren2_other
.path
,
1350 o
->branch2
, c2
->path
, &mfi_c2
))
1353 if (o
->call_depth
) {
1355 * If mfi_c1.clean && mfi_c2.clean, then it might make
1356 * sense to do a two-way merge of those results. But, I
1357 * think in all cases, it makes sense to have the virtual
1358 * merge base just undo the renames; they can be detected
1359 * again later for the non-recursive merge.
1361 remove_file(o
, 0, path
, 0);
1362 ret
= update_file(o
, 0, &mfi_c1
.oid
, mfi_c1
.mode
, a
->path
);
1364 ret
= update_file(o
, 0, &mfi_c2
.oid
, mfi_c2
.mode
,
1367 char *new_path1
= unique_path(o
, path
, ci
->branch1
);
1368 char *new_path2
= unique_path(o
, path
, ci
->branch2
);
1369 output(o
, 1, _("Renaming %s to %s and %s to %s instead"),
1370 a
->path
, new_path1
, b
->path
, new_path2
);
1371 remove_file(o
, 0, path
, 0);
1372 ret
= update_file(o
, 0, &mfi_c1
.oid
, mfi_c1
.mode
, new_path1
);
1374 ret
= update_file(o
, 0, &mfi_c2
.oid
, mfi_c2
.mode
,
1383 static int process_renames(struct merge_options
*o
,
1384 struct string_list
*a_renames
,
1385 struct string_list
*b_renames
)
1387 int clean_merge
= 1, i
, j
;
1388 struct string_list a_by_dst
= STRING_LIST_INIT_NODUP
;
1389 struct string_list b_by_dst
= STRING_LIST_INIT_NODUP
;
1390 const struct rename
*sre
;
1392 for (i
= 0; i
< a_renames
->nr
; i
++) {
1393 sre
= a_renames
->items
[i
].util
;
1394 string_list_insert(&a_by_dst
, sre
->pair
->two
->path
)->util
1397 for (i
= 0; i
< b_renames
->nr
; i
++) {
1398 sre
= b_renames
->items
[i
].util
;
1399 string_list_insert(&b_by_dst
, sre
->pair
->two
->path
)->util
1403 for (i
= 0, j
= 0; i
< a_renames
->nr
|| j
< b_renames
->nr
;) {
1404 struct string_list
*renames1
, *renames2Dst
;
1405 struct rename
*ren1
= NULL
, *ren2
= NULL
;
1406 const char *branch1
, *branch2
;
1407 const char *ren1_src
, *ren1_dst
;
1408 struct string_list_item
*lookup
;
1410 if (i
>= a_renames
->nr
) {
1411 ren2
= b_renames
->items
[j
++].util
;
1412 } else if (j
>= b_renames
->nr
) {
1413 ren1
= a_renames
->items
[i
++].util
;
1415 int compare
= strcmp(a_renames
->items
[i
].string
,
1416 b_renames
->items
[j
].string
);
1418 ren1
= a_renames
->items
[i
++].util
;
1420 ren2
= b_renames
->items
[j
++].util
;
1423 /* TODO: refactor, so that 1/2 are not needed */
1425 renames1
= a_renames
;
1426 renames2Dst
= &b_by_dst
;
1427 branch1
= o
->branch1
;
1428 branch2
= o
->branch2
;
1430 renames1
= b_renames
;
1431 renames2Dst
= &a_by_dst
;
1432 branch1
= o
->branch2
;
1433 branch2
= o
->branch1
;
1437 if (ren1
->processed
)
1439 ren1
->processed
= 1;
1440 ren1
->dst_entry
->processed
= 1;
1441 /* BUG: We should only mark src_entry as processed if we
1442 * are not dealing with a rename + add-source case.
1444 ren1
->src_entry
->processed
= 1;
1446 ren1_src
= ren1
->pair
->one
->path
;
1447 ren1_dst
= ren1
->pair
->two
->path
;
1450 /* One file renamed on both sides */
1451 const char *ren2_src
= ren2
->pair
->one
->path
;
1452 const char *ren2_dst
= ren2
->pair
->two
->path
;
1453 enum rename_type rename_type
;
1454 if (strcmp(ren1_src
, ren2_src
) != 0)
1455 die("BUG: ren1_src != ren2_src");
1456 ren2
->dst_entry
->processed
= 1;
1457 ren2
->processed
= 1;
1458 if (strcmp(ren1_dst
, ren2_dst
) != 0) {
1459 rename_type
= RENAME_ONE_FILE_TO_TWO
;
1462 rename_type
= RENAME_ONE_FILE_TO_ONE
;
1463 /* BUG: We should only remove ren1_src in
1464 * the base stage (think of rename +
1465 * add-source cases).
1467 remove_file(o
, 1, ren1_src
, 1);
1468 update_entry(ren1
->dst_entry
,
1473 setup_rename_conflict_info(rename_type
,
1483 } else if ((lookup
= string_list_lookup(renames2Dst
, ren1_dst
))) {
1484 /* Two different files renamed to the same thing */
1486 ren2
= lookup
->util
;
1487 ren2_dst
= ren2
->pair
->two
->path
;
1488 if (strcmp(ren1_dst
, ren2_dst
) != 0)
1489 die("BUG: ren1_dst != ren2_dst");
1492 ren2
->processed
= 1;
1494 * BUG: We should only mark src_entry as processed
1495 * if we are not dealing with a rename + add-source
1498 ren2
->src_entry
->processed
= 1;
1500 setup_rename_conflict_info(RENAME_TWO_FILES_TO_ONE
,
1512 /* Renamed in 1, maybe changed in 2 */
1513 /* we only use sha1 and mode of these */
1514 struct diff_filespec src_other
, dst_other
;
1518 * unpack_trees loads entries from common-commit
1519 * into stage 1, from head-commit into stage 2, and
1520 * from merge-commit into stage 3. We keep track
1521 * of which side corresponds to the rename.
1523 int renamed_stage
= a_renames
== renames1
? 2 : 3;
1524 int other_stage
= a_renames
== renames1
? 3 : 2;
1526 /* BUG: We should only remove ren1_src in the base
1527 * stage and in other_stage (think of rename +
1530 remove_file(o
, 1, ren1_src
,
1531 renamed_stage
== 2 || !was_tracked(ren1_src
));
1533 oidcpy(&src_other
.oid
,
1534 &ren1
->src_entry
->stages
[other_stage
].oid
);
1535 src_other
.mode
= ren1
->src_entry
->stages
[other_stage
].mode
;
1536 oidcpy(&dst_other
.oid
,
1537 &ren1
->dst_entry
->stages
[other_stage
].oid
);
1538 dst_other
.mode
= ren1
->dst_entry
->stages
[other_stage
].mode
;
1541 if (oid_eq(&src_other
.oid
, &null_oid
)) {
1542 setup_rename_conflict_info(RENAME_DELETE
,
1552 } else if ((dst_other
.mode
== ren1
->pair
->two
->mode
) &&
1553 oid_eq(&dst_other
.oid
, &ren1
->pair
->two
->oid
)) {
1555 * Added file on the other side identical to
1556 * the file being renamed: clean merge.
1557 * Also, there is no need to overwrite the
1558 * file already in the working copy, so call
1559 * update_file_flags() instead of
1562 if (update_file_flags(o
,
1563 &ren1
->pair
->two
->oid
,
1564 ren1
->pair
->two
->mode
,
1566 1, /* update_cache */
1569 } else if (!oid_eq(&dst_other
.oid
, &null_oid
)) {
1572 output(o
, 1, _("CONFLICT (rename/add): Rename %s->%s in %s. "
1574 ren1_src
, ren1_dst
, branch1
,
1576 if (o
->call_depth
) {
1577 struct merge_file_info mfi
;
1578 if (merge_file_one(o
, ren1_dst
, &null_oid
, 0,
1579 &ren1
->pair
->two
->oid
,
1580 ren1
->pair
->two
->mode
,
1583 branch1
, branch2
, &mfi
)) {
1585 goto cleanup_and_return
;
1587 output(o
, 1, _("Adding merged %s"), ren1_dst
);
1588 if (update_file(o
, 0, &mfi
.oid
,
1589 mfi
.mode
, ren1_dst
))
1593 char *new_path
= unique_path(o
, ren1_dst
, branch2
);
1594 output(o
, 1, _("Adding as %s instead"), new_path
);
1595 if (update_file(o
, 0, &dst_other
.oid
,
1596 dst_other
.mode
, new_path
))
1603 if (clean_merge
< 0)
1604 goto cleanup_and_return
;
1606 struct diff_filespec
*one
, *a
, *b
;
1607 src_other
.path
= (char *)ren1_src
;
1609 one
= ren1
->pair
->one
;
1610 if (a_renames
== renames1
) {
1611 a
= ren1
->pair
->two
;
1614 b
= ren1
->pair
->two
;
1617 update_entry(ren1
->dst_entry
, one
, a
, b
);
1618 setup_rename_conflict_info(RENAME_NORMAL
,
1632 string_list_clear(&a_by_dst
, 0);
1633 string_list_clear(&b_by_dst
, 0);
1638 static struct object_id
*stage_oid(const struct object_id
*oid
, unsigned mode
)
1640 return (is_null_oid(oid
) || mode
== 0) ? NULL
: (struct object_id
*)oid
;
1643 static int read_oid_strbuf(struct merge_options
*o
,
1644 const struct object_id
*oid
, struct strbuf
*dst
)
1647 enum object_type type
;
1649 buf
= read_sha1_file(oid
->hash
, &type
, &size
);
1651 return err(o
, _("cannot read object %s"), oid_to_hex(oid
));
1652 if (type
!= OBJ_BLOB
) {
1654 return err(o
, _("object %s is not a blob"), oid_to_hex(oid
));
1656 strbuf_attach(dst
, buf
, size
, size
+ 1);
1660 static int blob_unchanged(struct merge_options
*opt
,
1661 const struct object_id
*o_oid
,
1663 const struct object_id
*a_oid
,
1665 int renormalize
, const char *path
)
1667 struct strbuf o
= STRBUF_INIT
;
1668 struct strbuf a
= STRBUF_INIT
;
1669 int ret
= 0; /* assume changed for safety */
1671 if (a_mode
!= o_mode
)
1673 if (oid_eq(o_oid
, a_oid
))
1678 assert(o_oid
&& a_oid
);
1679 if (read_oid_strbuf(opt
, o_oid
, &o
) || read_oid_strbuf(opt
, a_oid
, &a
))
1682 * Note: binary | is used so that both renormalizations are
1683 * performed. Comparison can be skipped if both files are
1684 * unchanged since their sha1s have already been compared.
1686 if (renormalize_buffer(&the_index
, path
, o
.buf
, o
.len
, &o
) |
1687 renormalize_buffer(&the_index
, path
, a
.buf
, a
.len
, &a
))
1688 ret
= (o
.len
== a
.len
&& !memcmp(o
.buf
, a
.buf
, o
.len
));
1696 static int handle_modify_delete(struct merge_options
*o
,
1698 struct object_id
*o_oid
, int o_mode
,
1699 struct object_id
*a_oid
, int a_mode
,
1700 struct object_id
*b_oid
, int b_mode
)
1702 const char *modify_branch
, *delete_branch
;
1703 struct object_id
*changed_oid
;
1707 modify_branch
= o
->branch1
;
1708 delete_branch
= o
->branch2
;
1709 changed_oid
= a_oid
;
1710 changed_mode
= a_mode
;
1712 modify_branch
= o
->branch2
;
1713 delete_branch
= o
->branch1
;
1714 changed_oid
= b_oid
;
1715 changed_mode
= b_mode
;
1718 return handle_change_delete(o
,
1721 changed_oid
, changed_mode
,
1722 modify_branch
, delete_branch
,
1723 _("modify"), _("modified"));
1726 static int merge_content(struct merge_options
*o
,
1728 struct object_id
*o_oid
, int o_mode
,
1729 struct object_id
*a_oid
, int a_mode
,
1730 struct object_id
*b_oid
, int b_mode
,
1731 struct rename_conflict_info
*rename_conflict_info
)
1733 const char *reason
= _("content");
1734 const char *path1
= NULL
, *path2
= NULL
;
1735 struct merge_file_info mfi
;
1736 struct diff_filespec one
, a
, b
;
1737 unsigned df_conflict_remains
= 0;
1740 reason
= _("add/add");
1741 o_oid
= (struct object_id
*)&null_oid
;
1743 one
.path
= a
.path
= b
.path
= (char *)path
;
1744 oidcpy(&one
.oid
, o_oid
);
1746 oidcpy(&a
.oid
, a_oid
);
1748 oidcpy(&b
.oid
, b_oid
);
1751 if (rename_conflict_info
) {
1752 struct diff_filepair
*pair1
= rename_conflict_info
->pair1
;
1754 path1
= (o
->branch1
== rename_conflict_info
->branch1
) ?
1755 pair1
->two
->path
: pair1
->one
->path
;
1756 /* If rename_conflict_info->pair2 != NULL, we are in
1757 * RENAME_ONE_FILE_TO_ONE case. Otherwise, we have a
1760 path2
= (rename_conflict_info
->pair2
||
1761 o
->branch2
== rename_conflict_info
->branch1
) ?
1762 pair1
->two
->path
: pair1
->one
->path
;
1764 if (dir_in_way(path
, !o
->call_depth
,
1765 S_ISGITLINK(pair1
->two
->mode
)))
1766 df_conflict_remains
= 1;
1768 if (merge_file_special_markers(o
, &one
, &a
, &b
,
1770 o
->branch2
, path2
, &mfi
))
1773 if (mfi
.clean
&& !df_conflict_remains
&&
1774 oid_eq(&mfi
.oid
, a_oid
) && mfi
.mode
== a_mode
) {
1775 int path_renamed_outside_HEAD
;
1776 output(o
, 3, _("Skipped %s (merged same as existing)"), path
);
1778 * The content merge resulted in the same file contents we
1779 * already had. We can return early if those file contents
1780 * are recorded at the correct path (which may not be true
1781 * if the merge involves a rename).
1783 path_renamed_outside_HEAD
= !path2
|| !strcmp(path
, path2
);
1784 if (!path_renamed_outside_HEAD
) {
1785 add_cacheinfo(o
, mfi
.mode
, &mfi
.oid
, path
,
1786 0, (!o
->call_depth
), 0);
1790 output(o
, 2, _("Auto-merging %s"), path
);
1793 if (S_ISGITLINK(mfi
.mode
))
1794 reason
= _("submodule");
1795 output(o
, 1, _("CONFLICT (%s): Merge conflict in %s"),
1797 if (rename_conflict_info
&& !df_conflict_remains
)
1798 if (update_stages(o
, path
, &one
, &a
, &b
))
1802 if (df_conflict_remains
) {
1804 if (o
->call_depth
) {
1805 remove_file_from_cache(path
);
1808 if (update_stages(o
, path
, &one
, &a
, &b
))
1811 int file_from_stage2
= was_tracked(path
);
1812 struct diff_filespec merged
;
1813 oidcpy(&merged
.oid
, &mfi
.oid
);
1814 merged
.mode
= mfi
.mode
;
1816 if (update_stages(o
, path
, NULL
,
1817 file_from_stage2
? &merged
: NULL
,
1818 file_from_stage2
? NULL
: &merged
))
1823 new_path
= unique_path(o
, path
, rename_conflict_info
->branch1
);
1824 output(o
, 1, _("Adding as %s instead"), new_path
);
1825 if (update_file(o
, 0, &mfi
.oid
, mfi
.mode
, new_path
)) {
1831 } else if (update_file(o
, mfi
.clean
, &mfi
.oid
, mfi
.mode
, path
))
1836 /* Per entry merge function */
1837 static int process_entry(struct merge_options
*o
,
1838 const char *path
, struct stage_data
*entry
)
1840 int clean_merge
= 1;
1841 int normalize
= o
->renormalize
;
1842 unsigned o_mode
= entry
->stages
[1].mode
;
1843 unsigned a_mode
= entry
->stages
[2].mode
;
1844 unsigned b_mode
= entry
->stages
[3].mode
;
1845 struct object_id
*o_oid
= stage_oid(&entry
->stages
[1].oid
, o_mode
);
1846 struct object_id
*a_oid
= stage_oid(&entry
->stages
[2].oid
, a_mode
);
1847 struct object_id
*b_oid
= stage_oid(&entry
->stages
[3].oid
, b_mode
);
1849 entry
->processed
= 1;
1850 if (entry
->rename_conflict_info
) {
1851 struct rename_conflict_info
*conflict_info
= entry
->rename_conflict_info
;
1852 switch (conflict_info
->rename_type
) {
1854 case RENAME_ONE_FILE_TO_ONE
:
1855 clean_merge
= merge_content(o
, path
,
1856 o_oid
, o_mode
, a_oid
, a_mode
, b_oid
, b_mode
,
1861 if (conflict_rename_delete(o
,
1862 conflict_info
->pair1
,
1863 conflict_info
->branch1
,
1864 conflict_info
->branch2
))
1867 case RENAME_ONE_FILE_TO_TWO
:
1869 if (conflict_rename_rename_1to2(o
, conflict_info
))
1872 case RENAME_TWO_FILES_TO_ONE
:
1874 if (conflict_rename_rename_2to1(o
, conflict_info
))
1878 entry
->processed
= 0;
1881 } else if (o_oid
&& (!a_oid
|| !b_oid
)) {
1882 /* Case A: Deleted in one */
1883 if ((!a_oid
&& !b_oid
) ||
1884 (!b_oid
&& blob_unchanged(o
, o_oid
, o_mode
, a_oid
, a_mode
, normalize
, path
)) ||
1885 (!a_oid
&& blob_unchanged(o
, o_oid
, o_mode
, b_oid
, b_mode
, normalize
, path
))) {
1886 /* Deleted in both or deleted in one and
1887 * unchanged in the other */
1889 output(o
, 2, _("Removing %s"), path
);
1890 /* do not touch working file if it did not exist */
1891 remove_file(o
, 1, path
, !a_oid
);
1893 /* Modify/delete; deleted side may have put a directory in the way */
1895 if (handle_modify_delete(o
, path
, o_oid
, o_mode
,
1896 a_oid
, a_mode
, b_oid
, b_mode
))
1899 } else if ((!o_oid
&& a_oid
&& !b_oid
) ||
1900 (!o_oid
&& !a_oid
&& b_oid
)) {
1901 /* Case B: Added in one. */
1902 /* [nothing|directory] -> ([nothing|directory], file) */
1904 const char *add_branch
;
1905 const char *other_branch
;
1907 const struct object_id
*oid
;
1911 add_branch
= o
->branch1
;
1912 other_branch
= o
->branch2
;
1915 conf
= _("file/directory");
1917 add_branch
= o
->branch2
;
1918 other_branch
= o
->branch1
;
1921 conf
= _("directory/file");
1923 if (dir_in_way(path
,
1924 !o
->call_depth
&& !S_ISGITLINK(a_mode
),
1926 char *new_path
= unique_path(o
, path
, add_branch
);
1928 output(o
, 1, _("CONFLICT (%s): There is a directory with name %s in %s. "
1930 conf
, path
, other_branch
, path
, new_path
);
1931 if (update_file(o
, 0, oid
, mode
, new_path
))
1933 else if (o
->call_depth
)
1934 remove_file_from_cache(path
);
1937 output(o
, 2, _("Adding %s"), path
);
1938 /* do not overwrite file if already present */
1939 if (update_file_flags(o
, oid
, mode
, path
, 1, !a_oid
))
1942 } else if (a_oid
&& b_oid
) {
1943 /* Case C: Added in both (check for same permissions) and */
1944 /* case D: Modified in both, but differently. */
1945 clean_merge
= merge_content(o
, path
,
1946 o_oid
, o_mode
, a_oid
, a_mode
, b_oid
, b_mode
,
1948 } else if (!o_oid
&& !a_oid
&& !b_oid
) {
1950 * this entry was deleted altogether. a_mode == 0 means
1951 * we had that path and want to actively remove it.
1953 remove_file(o
, 1, path
, !a_mode
);
1955 die("BUG: fatal merge failure, shouldn't happen.");
1960 int merge_trees(struct merge_options
*o
,
1963 struct tree
*common
,
1964 struct tree
**result
)
1968 if (o
->subtree_shift
) {
1969 merge
= shift_tree_object(head
, merge
, o
->subtree_shift
);
1970 common
= shift_tree_object(head
, common
, o
->subtree_shift
);
1973 if (oid_eq(&common
->object
.oid
, &merge
->object
.oid
)) {
1974 struct strbuf sb
= STRBUF_INIT
;
1976 if (!o
->call_depth
&& index_has_changes(&sb
)) {
1977 err(o
, _("Dirty index: cannot merge (dirty: %s)"),
1981 output(o
, 0, _("Already up to date!"));
1986 code
= git_merge_trees(o
->call_depth
, common
, head
, merge
);
1989 if (show(o
, 4) || o
->call_depth
)
1990 err(o
, _("merging of trees %s and %s failed"),
1991 oid_to_hex(&head
->object
.oid
),
1992 oid_to_hex(&merge
->object
.oid
));
1996 if (unmerged_cache()) {
1997 struct string_list
*entries
, *re_head
, *re_merge
;
2000 * Only need the hashmap while processing entries, so
2001 * initialize it here and free it when we are done running
2002 * through the entries. Keeping it in the merge_options as
2003 * opposed to decaring a local hashmap is for convenience
2004 * so that we don't have to pass it to around.
2006 hashmap_init(&o
->current_file_dir_set
, path_hashmap_cmp
, NULL
, 512);
2007 get_files_dirs(o
, head
);
2008 get_files_dirs(o
, merge
);
2010 entries
= get_unmerged();
2011 re_head
= get_renames(o
, head
, common
, head
, merge
, entries
);
2012 re_merge
= get_renames(o
, merge
, common
, head
, merge
, entries
);
2013 clean
= process_renames(o
, re_head
, re_merge
);
2014 record_df_conflict_files(o
, entries
);
2017 for (i
= entries
->nr
-1; 0 <= i
; i
--) {
2018 const char *path
= entries
->items
[i
].string
;
2019 struct stage_data
*e
= entries
->items
[i
].util
;
2020 if (!e
->processed
) {
2021 int ret
= process_entry(o
, path
, e
);
2030 for (i
= 0; i
< entries
->nr
; i
++) {
2031 struct stage_data
*e
= entries
->items
[i
].util
;
2033 die("BUG: unprocessed path??? %s",
2034 entries
->items
[i
].string
);
2038 string_list_clear(re_merge
, 0);
2039 string_list_clear(re_head
, 0);
2040 string_list_clear(entries
, 1);
2042 hashmap_free(&o
->current_file_dir_set
, 1);
2054 if (o
->call_depth
&& !(*result
= write_tree_from_memory(o
)))
2060 static struct commit_list
*reverse_commit_list(struct commit_list
*list
)
2062 struct commit_list
*next
= NULL
, *current
, *backup
;
2063 for (current
= list
; current
; current
= backup
) {
2064 backup
= current
->next
;
2065 current
->next
= next
;
2072 * Merge the commits h1 and h2, return the resulting virtual
2073 * commit object and a flag indicating the cleanness of the merge.
2075 int merge_recursive(struct merge_options
*o
,
2078 struct commit_list
*ca
,
2079 struct commit
**result
)
2081 struct commit_list
*iter
;
2082 struct commit
*merged_common_ancestors
;
2083 struct tree
*mrtree
= mrtree
;
2087 output(o
, 4, _("Merging:"));
2088 output_commit_title(o
, h1
);
2089 output_commit_title(o
, h2
);
2093 ca
= get_merge_bases(h1
, h2
);
2094 ca
= reverse_commit_list(ca
);
2098 unsigned cnt
= commit_list_count(ca
);
2100 output(o
, 5, Q_("found %u common ancestor:",
2101 "found %u common ancestors:", cnt
), cnt
);
2102 for (iter
= ca
; iter
; iter
= iter
->next
)
2103 output_commit_title(o
, iter
->item
);
2106 merged_common_ancestors
= pop_commit(&ca
);
2107 if (merged_common_ancestors
== NULL
) {
2108 /* if there is no common ancestor, use an empty tree */
2111 tree
= lookup_tree(the_hash_algo
->empty_tree
);
2112 merged_common_ancestors
= make_virtual_commit(tree
, "ancestor");
2115 for (iter
= ca
; iter
; iter
= iter
->next
) {
2116 const char *saved_b1
, *saved_b2
;
2119 * When the merge fails, the result contains files
2120 * with conflict markers. The cleanness flag is
2121 * ignored (unless indicating an error), it was never
2122 * actually used, as result of merge_trees has always
2123 * overwritten it: the committed "conflicts" were
2127 saved_b1
= o
->branch1
;
2128 saved_b2
= o
->branch2
;
2129 o
->branch1
= "Temporary merge branch 1";
2130 o
->branch2
= "Temporary merge branch 2";
2131 if (merge_recursive(o
, merged_common_ancestors
, iter
->item
,
2132 NULL
, &merged_common_ancestors
) < 0)
2134 o
->branch1
= saved_b1
;
2135 o
->branch2
= saved_b2
;
2138 if (!merged_common_ancestors
)
2139 return err(o
, _("merge returned no commit"));
2146 o
->ancestor
= "merged common ancestors";
2147 clean
= merge_trees(o
, h1
->tree
, h2
->tree
, merged_common_ancestors
->tree
,
2154 if (o
->call_depth
) {
2155 *result
= make_virtual_commit(mrtree
, "merged tree");
2156 commit_list_insert(h1
, &(*result
)->parents
);
2157 commit_list_insert(h2
, &(*result
)->parents
->next
);
2160 if (!o
->call_depth
&& o
->buffer_output
< 2)
2161 strbuf_release(&o
->obuf
);
2163 diff_warn_rename_limit("merge.renamelimit",
2164 o
->needed_rename_limit
, 0);
2168 static struct commit
*get_ref(const struct object_id
*oid
, const char *name
)
2170 struct object
*object
;
2172 object
= deref_tag(parse_object(oid
), name
, strlen(name
));
2175 if (object
->type
== OBJ_TREE
)
2176 return make_virtual_commit((struct tree
*)object
, name
);
2177 if (object
->type
!= OBJ_COMMIT
)
2179 if (parse_commit((struct commit
*)object
))
2181 return (struct commit
*)object
;
2184 int merge_recursive_generic(struct merge_options
*o
,
2185 const struct object_id
*head
,
2186 const struct object_id
*merge
,
2188 const struct object_id
**base_list
,
2189 struct commit
**result
)
2192 struct lock_file lock
= LOCK_INIT
;
2193 struct commit
*head_commit
= get_ref(head
, o
->branch1
);
2194 struct commit
*next_commit
= get_ref(merge
, o
->branch2
);
2195 struct commit_list
*ca
= NULL
;
2199 for (i
= 0; i
< num_base_list
; ++i
) {
2200 struct commit
*base
;
2201 if (!(base
= get_ref(base_list
[i
], oid_to_hex(base_list
[i
]))))
2202 return err(o
, _("Could not parse object '%s'"),
2203 oid_to_hex(base_list
[i
]));
2204 commit_list_insert(base
, &ca
);
2208 hold_locked_index(&lock
, LOCK_DIE_ON_ERROR
);
2209 clean
= merge_recursive(o
, head_commit
, next_commit
, ca
,
2214 if (active_cache_changed
&&
2215 write_locked_index(&the_index
, &lock
, COMMIT_LOCK
))
2216 return err(o
, _("Unable to write index."));
2218 return clean
? 0 : 1;
2221 static void merge_recursive_config(struct merge_options
*o
)
2223 git_config_get_int("merge.verbosity", &o
->verbosity
);
2224 git_config_get_int("diff.renamelimit", &o
->diff_rename_limit
);
2225 git_config_get_int("merge.renamelimit", &o
->merge_rename_limit
);
2226 git_config(git_xmerge_config
, NULL
);
2229 void init_merge_options(struct merge_options
*o
)
2231 const char *merge_verbosity
;
2232 memset(o
, 0, sizeof(struct merge_options
));
2234 o
->buffer_output
= 1;
2235 o
->diff_rename_limit
= -1;
2236 o
->merge_rename_limit
= -1;
2238 o
->detect_rename
= 1;
2239 merge_recursive_config(o
);
2240 merge_verbosity
= getenv("GIT_MERGE_VERBOSITY");
2241 if (merge_verbosity
)
2242 o
->verbosity
= strtol(merge_verbosity
, NULL
, 10);
2243 if (o
->verbosity
>= 5)
2244 o
->buffer_output
= 0;
2245 strbuf_init(&o
->obuf
, 0);
2246 string_list_init(&o
->df_conflict_file_set
, 1);
2249 int parse_merge_opt(struct merge_options
*o
, const char *s
)
2255 if (!strcmp(s
, "ours"))
2256 o
->recursive_variant
= MERGE_RECURSIVE_OURS
;
2257 else if (!strcmp(s
, "theirs"))
2258 o
->recursive_variant
= MERGE_RECURSIVE_THEIRS
;
2259 else if (!strcmp(s
, "subtree"))
2260 o
->subtree_shift
= "";
2261 else if (skip_prefix(s
, "subtree=", &arg
))
2262 o
->subtree_shift
= arg
;
2263 else if (!strcmp(s
, "patience"))
2264 o
->xdl_opts
= DIFF_WITH_ALG(o
, PATIENCE_DIFF
);
2265 else if (!strcmp(s
, "histogram"))
2266 o
->xdl_opts
= DIFF_WITH_ALG(o
, HISTOGRAM_DIFF
);
2267 else if (skip_prefix(s
, "diff-algorithm=", &arg
)) {
2268 long value
= parse_algorithm_value(arg
);
2271 /* clear out previous settings */
2272 DIFF_XDL_CLR(o
, NEED_MINIMAL
);
2273 o
->xdl_opts
&= ~XDF_DIFF_ALGORITHM_MASK
;
2274 o
->xdl_opts
|= value
;
2276 else if (!strcmp(s
, "ignore-space-change"))
2277 DIFF_XDL_SET(o
, IGNORE_WHITESPACE_CHANGE
);
2278 else if (!strcmp(s
, "ignore-all-space"))
2279 DIFF_XDL_SET(o
, IGNORE_WHITESPACE
);
2280 else if (!strcmp(s
, "ignore-space-at-eol"))
2281 DIFF_XDL_SET(o
, IGNORE_WHITESPACE_AT_EOL
);
2282 else if (!strcmp(s
, "ignore-cr-at-eol"))
2283 DIFF_XDL_SET(o
, IGNORE_CR_AT_EOL
);
2284 else if (!strcmp(s
, "renormalize"))
2286 else if (!strcmp(s
, "no-renormalize"))
2288 else if (!strcmp(s
, "no-renames"))
2289 o
->detect_rename
= 0;
2290 else if (!strcmp(s
, "find-renames")) {
2291 o
->detect_rename
= 1;
2292 o
->rename_score
= 0;
2294 else if (skip_prefix(s
, "find-renames=", &arg
) ||
2295 skip_prefix(s
, "rename-threshold=", &arg
)) {
2296 if ((o
->rename_score
= parse_rename_score(&arg
)) == -1 || *arg
!= 0)
2298 o
->detect_rename
= 1;