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 struct dir_rename_entry
*dir_rename_find_entry(struct hashmap
*hashmap
,
55 struct dir_rename_entry key
;
59 hashmap_entry_init(&key
, strhash(dir
));
61 return hashmap_get(hashmap
, &key
, NULL
);
64 static int dir_rename_cmp(const void *unused_cmp_data
,
66 const void *entry_or_key
,
67 const void *unused_keydata
)
69 const struct dir_rename_entry
*e1
= entry
;
70 const struct dir_rename_entry
*e2
= entry_or_key
;
72 return strcmp(e1
->dir
, e2
->dir
);
75 static void dir_rename_init(struct hashmap
*map
)
77 hashmap_init(map
, dir_rename_cmp
, NULL
, 0);
80 static void dir_rename_entry_init(struct dir_rename_entry
*entry
,
83 hashmap_entry_init(entry
, strhash(directory
));
84 entry
->dir
= directory
;
85 entry
->non_unique_new_dir
= 0;
86 strbuf_init(&entry
->new_dir
, 0);
87 string_list_init(&entry
->possible_new_dirs
, 0);
90 static struct collision_entry
*collision_find_entry(struct hashmap
*hashmap
,
93 struct collision_entry key
;
95 hashmap_entry_init(&key
, strhash(target_file
));
96 key
.target_file
= target_file
;
97 return hashmap_get(hashmap
, &key
, NULL
);
100 static int collision_cmp(void *unused_cmp_data
,
101 const struct collision_entry
*e1
,
102 const struct collision_entry
*e2
,
103 const void *unused_keydata
)
105 return strcmp(e1
->target_file
, e2
->target_file
);
108 static void collision_init(struct hashmap
*map
)
110 hashmap_init(map
, (hashmap_cmp_fn
) collision_cmp
, NULL
, 0);
113 static void flush_output(struct merge_options
*o
)
115 if (o
->buffer_output
< 2 && o
->obuf
.len
) {
116 fputs(o
->obuf
.buf
, stdout
);
117 strbuf_reset(&o
->obuf
);
121 static int err(struct merge_options
*o
, const char *err
, ...)
125 if (o
->buffer_output
< 2)
128 strbuf_complete(&o
->obuf
, '\n');
129 strbuf_addstr(&o
->obuf
, "error: ");
131 va_start(params
, err
);
132 strbuf_vaddf(&o
->obuf
, err
, params
);
134 if (o
->buffer_output
> 1)
135 strbuf_addch(&o
->obuf
, '\n');
137 error("%s", o
->obuf
.buf
);
138 strbuf_reset(&o
->obuf
);
144 static struct tree
*shift_tree_object(struct tree
*one
, struct tree
*two
,
145 const char *subtree_shift
)
147 struct object_id shifted
;
149 if (!*subtree_shift
) {
150 shift_tree(&one
->object
.oid
, &two
->object
.oid
, &shifted
, 0);
152 shift_tree_by(&one
->object
.oid
, &two
->object
.oid
, &shifted
,
155 if (!oidcmp(&two
->object
.oid
, &shifted
))
157 return lookup_tree(&shifted
);
160 static struct commit
*make_virtual_commit(struct tree
*tree
, const char *comment
)
162 struct commit
*commit
= alloc_commit_node();
164 set_merge_remote_desc(commit
, comment
, (struct object
*)commit
);
166 commit
->object
.parsed
= 1;
171 * Since we use get_tree_entry(), which does not put the read object into
172 * the object pool, we cannot rely on a == b.
174 static int oid_eq(const struct object_id
*a
, const struct object_id
*b
)
178 return a
&& b
&& oidcmp(a
, b
) == 0;
185 RENAME_ONE_FILE_TO_ONE
,
186 RENAME_ONE_FILE_TO_TWO
,
187 RENAME_TWO_FILES_TO_ONE
190 struct rename_conflict_info
{
191 enum rename_type rename_type
;
192 struct diff_filepair
*pair1
;
193 struct diff_filepair
*pair2
;
196 struct stage_data
*dst_entry1
;
197 struct stage_data
*dst_entry2
;
198 struct diff_filespec ren1_other
;
199 struct diff_filespec ren2_other
;
203 * Since we want to write the index eventually, we cannot reuse the index
204 * for these (temporary) data.
209 struct object_id oid
;
211 struct rename_conflict_info
*rename_conflict_info
;
212 unsigned processed
:1;
215 static inline void setup_rename_conflict_info(enum rename_type rename_type
,
216 struct diff_filepair
*pair1
,
217 struct diff_filepair
*pair2
,
220 struct stage_data
*dst_entry1
,
221 struct stage_data
*dst_entry2
,
222 struct merge_options
*o
,
223 struct stage_data
*src_entry1
,
224 struct stage_data
*src_entry2
)
226 struct rename_conflict_info
*ci
= xcalloc(1, sizeof(struct rename_conflict_info
));
227 ci
->rename_type
= rename_type
;
229 ci
->branch1
= branch1
;
230 ci
->branch2
= branch2
;
232 ci
->dst_entry1
= dst_entry1
;
233 dst_entry1
->rename_conflict_info
= ci
;
234 dst_entry1
->processed
= 0;
236 assert(!pair2
== !dst_entry2
);
238 ci
->dst_entry2
= dst_entry2
;
240 dst_entry2
->rename_conflict_info
= ci
;
243 if (rename_type
== RENAME_TWO_FILES_TO_ONE
) {
245 * For each rename, there could have been
246 * modifications on the side of history where that
247 * file was not renamed.
249 int ostage1
= o
->branch1
== branch1
? 3 : 2;
250 int ostage2
= ostage1
^ 1;
252 ci
->ren1_other
.path
= pair1
->one
->path
;
253 oidcpy(&ci
->ren1_other
.oid
, &src_entry1
->stages
[ostage1
].oid
);
254 ci
->ren1_other
.mode
= src_entry1
->stages
[ostage1
].mode
;
256 ci
->ren2_other
.path
= pair2
->one
->path
;
257 oidcpy(&ci
->ren2_other
.oid
, &src_entry2
->stages
[ostage2
].oid
);
258 ci
->ren2_other
.mode
= src_entry2
->stages
[ostage2
].mode
;
262 static int show(struct merge_options
*o
, int v
)
264 return (!o
->call_depth
&& o
->verbosity
>= v
) || o
->verbosity
>= 5;
267 __attribute__((format (printf
, 3, 4)))
268 static void output(struct merge_options
*o
, int v
, const char *fmt
, ...)
275 strbuf_addchars(&o
->obuf
, ' ', o
->call_depth
* 2);
278 strbuf_vaddf(&o
->obuf
, fmt
, ap
);
281 strbuf_addch(&o
->obuf
, '\n');
282 if (!o
->buffer_output
)
286 static void output_commit_title(struct merge_options
*o
, struct commit
*commit
)
288 strbuf_addchars(&o
->obuf
, ' ', o
->call_depth
* 2);
290 strbuf_addf(&o
->obuf
, "virtual %s\n",
291 merge_remote_util(commit
)->name
);
293 strbuf_add_unique_abbrev(&o
->obuf
, commit
->object
.oid
.hash
,
295 strbuf_addch(&o
->obuf
, ' ');
296 if (parse_commit(commit
) != 0)
297 strbuf_addstr(&o
->obuf
, _("(bad commit)\n"));
300 const char *msg
= get_commit_buffer(commit
, NULL
);
301 int len
= find_commit_subject(msg
, &title
);
303 strbuf_addf(&o
->obuf
, "%.*s\n", len
, title
);
304 unuse_commit_buffer(commit
, msg
);
310 static int add_cacheinfo(struct merge_options
*o
,
311 unsigned int mode
, const struct object_id
*oid
,
312 const char *path
, int stage
, int refresh
, int options
)
314 struct cache_entry
*ce
;
317 ce
= make_cache_entry(mode
, oid
? oid
->hash
: null_sha1
, path
, stage
, 0);
319 return err(o
, _("addinfo_cache failed for path '%s'"), path
);
321 ret
= add_cache_entry(ce
, options
);
323 struct cache_entry
*nce
;
325 nce
= refresh_cache_entry(ce
, CE_MATCH_REFRESH
| CE_MATCH_IGNORE_MISSING
);
327 return err(o
, _("addinfo_cache failed for path '%s'"), path
);
329 ret
= add_cache_entry(nce
, options
);
334 static void init_tree_desc_from_tree(struct tree_desc
*desc
, struct tree
*tree
)
337 init_tree_desc(desc
, tree
->buffer
, tree
->size
);
340 static int git_merge_trees(int index_only
,
346 struct tree_desc t
[3];
347 struct unpack_trees_options opts
;
349 memset(&opts
, 0, sizeof(opts
));
356 opts
.fn
= threeway_merge
;
357 opts
.src_index
= &the_index
;
358 opts
.dst_index
= &the_index
;
359 setup_unpack_trees_porcelain(&opts
, "merge");
361 init_tree_desc_from_tree(t
+0, common
);
362 init_tree_desc_from_tree(t
+1, head
);
363 init_tree_desc_from_tree(t
+2, merge
);
365 rc
= unpack_trees(3, t
, &opts
);
366 cache_tree_free(&active_cache_tree
);
370 struct tree
*write_tree_from_memory(struct merge_options
*o
)
372 struct tree
*result
= NULL
;
374 if (unmerged_cache()) {
376 fprintf(stderr
, "BUG: There are unmerged index entries:\n");
377 for (i
= 0; i
< active_nr
; i
++) {
378 const struct cache_entry
*ce
= active_cache
[i
];
380 fprintf(stderr
, "BUG: %d %.*s\n", ce_stage(ce
),
381 (int)ce_namelen(ce
), ce
->name
);
383 die("BUG: unmerged index entries in merge-recursive.c");
386 if (!active_cache_tree
)
387 active_cache_tree
= cache_tree();
389 if (!cache_tree_fully_valid(active_cache_tree
) &&
390 cache_tree_update(&the_index
, 0) < 0) {
391 err(o
, _("error building trees"));
395 result
= lookup_tree(&active_cache_tree
->oid
);
400 static int save_files_dirs(const unsigned char *sha1
,
401 struct strbuf
*base
, const char *path
,
402 unsigned int mode
, int stage
, void *context
)
404 struct path_hashmap_entry
*entry
;
405 int baselen
= base
->len
;
406 struct merge_options
*o
= context
;
408 strbuf_addstr(base
, path
);
410 FLEX_ALLOC_MEM(entry
, path
, base
->buf
, base
->len
);
411 hashmap_entry_init(entry
, path_hash(entry
->path
));
412 hashmap_add(&o
->current_file_dir_set
, entry
);
414 strbuf_setlen(base
, baselen
);
415 return (S_ISDIR(mode
) ? READ_TREE_RECURSIVE
: 0);
418 static void get_files_dirs(struct merge_options
*o
, struct tree
*tree
)
420 struct pathspec match_all
;
421 memset(&match_all
, 0, sizeof(match_all
));
422 read_tree_recursive(tree
, "", 0, 0, &match_all
, save_files_dirs
, o
);
425 static int get_tree_entry_if_blob(const unsigned char *tree
,
427 unsigned char *hashy
,
428 unsigned int *mode_o
)
432 ret
= get_tree_entry(tree
, path
, hashy
, mode_o
);
433 if (S_ISDIR(*mode_o
)) {
434 hashcpy(hashy
, null_sha1
);
441 * Returns an index_entry instance which doesn't have to correspond to
442 * a real cache entry in Git's index.
444 static struct stage_data
*insert_stage_data(const char *path
,
445 struct tree
*o
, struct tree
*a
, struct tree
*b
,
446 struct string_list
*entries
)
448 struct string_list_item
*item
;
449 struct stage_data
*e
= xcalloc(1, sizeof(struct stage_data
));
450 get_tree_entry_if_blob(o
->object
.oid
.hash
, path
,
451 e
->stages
[1].oid
.hash
, &e
->stages
[1].mode
);
452 get_tree_entry_if_blob(a
->object
.oid
.hash
, path
,
453 e
->stages
[2].oid
.hash
, &e
->stages
[2].mode
);
454 get_tree_entry_if_blob(b
->object
.oid
.hash
, path
,
455 e
->stages
[3].oid
.hash
, &e
->stages
[3].mode
);
456 item
= string_list_insert(entries
, path
);
462 * Create a dictionary mapping file names to stage_data objects. The
463 * dictionary contains one entry for every path with a non-zero stage entry.
465 static struct string_list
*get_unmerged(void)
467 struct string_list
*unmerged
= xcalloc(1, sizeof(struct string_list
));
470 unmerged
->strdup_strings
= 1;
472 for (i
= 0; i
< active_nr
; i
++) {
473 struct string_list_item
*item
;
474 struct stage_data
*e
;
475 const struct cache_entry
*ce
= active_cache
[i
];
479 item
= string_list_lookup(unmerged
, ce
->name
);
481 item
= string_list_insert(unmerged
, ce
->name
);
482 item
->util
= xcalloc(1, sizeof(struct stage_data
));
485 e
->stages
[ce_stage(ce
)].mode
= ce
->ce_mode
;
486 oidcpy(&e
->stages
[ce_stage(ce
)].oid
, &ce
->oid
);
492 static int string_list_df_name_compare(const char *one
, const char *two
)
494 int onelen
= strlen(one
);
495 int twolen
= strlen(two
);
497 * Here we only care that entries for D/F conflicts are
498 * adjacent, in particular with the file of the D/F conflict
499 * appearing before files below the corresponding directory.
500 * The order of the rest of the list is irrelevant for us.
502 * To achieve this, we sort with df_name_compare and provide
503 * the mode S_IFDIR so that D/F conflicts will sort correctly.
504 * We use the mode S_IFDIR for everything else for simplicity,
505 * since in other cases any changes in their order due to
506 * sorting cause no problems for us.
508 int cmp
= df_name_compare(one
, onelen
, S_IFDIR
,
509 two
, twolen
, S_IFDIR
);
511 * Now that 'foo' and 'foo/bar' compare equal, we have to make sure
512 * that 'foo' comes before 'foo/bar'.
516 return onelen
- twolen
;
519 static void record_df_conflict_files(struct merge_options
*o
,
520 struct string_list
*entries
)
522 /* If there is a D/F conflict and the file for such a conflict
523 * currently exist in the working tree, we want to allow it to be
524 * removed to make room for the corresponding directory if needed.
525 * The files underneath the directories of such D/F conflicts will
526 * be processed before the corresponding file involved in the D/F
527 * conflict. If the D/F directory ends up being removed by the
528 * merge, then we won't have to touch the D/F file. If the D/F
529 * directory needs to be written to the working copy, then the D/F
530 * file will simply be removed (in make_room_for_path()) to make
531 * room for the necessary paths. Note that if both the directory
532 * and the file need to be present, then the D/F file will be
533 * reinstated with a new unique name at the time it is processed.
535 struct string_list df_sorted_entries
= STRING_LIST_INIT_NODUP
;
536 const char *last_file
= NULL
;
541 * If we're merging merge-bases, we don't want to bother with
542 * any working directory changes.
547 /* Ensure D/F conflicts are adjacent in the entries list. */
548 for (i
= 0; i
< entries
->nr
; i
++) {
549 struct string_list_item
*next
= &entries
->items
[i
];
550 string_list_append(&df_sorted_entries
, next
->string
)->util
=
553 df_sorted_entries
.cmp
= string_list_df_name_compare
;
554 string_list_sort(&df_sorted_entries
);
556 string_list_clear(&o
->df_conflict_file_set
, 1);
557 for (i
= 0; i
< df_sorted_entries
.nr
; i
++) {
558 const char *path
= df_sorted_entries
.items
[i
].string
;
559 int len
= strlen(path
);
560 struct stage_data
*e
= df_sorted_entries
.items
[i
].util
;
563 * Check if last_file & path correspond to a D/F conflict;
564 * i.e. whether path is last_file+'/'+<something>.
565 * If so, record that it's okay to remove last_file to make
566 * room for path and friends if needed.
570 memcmp(path
, last_file
, last_len
) == 0 &&
571 path
[last_len
] == '/') {
572 string_list_insert(&o
->df_conflict_file_set
, last_file
);
576 * Determine whether path could exist as a file in the
577 * working directory as a possible D/F conflict. This
578 * will only occur when it exists in stage 2 as a
581 if (S_ISREG(e
->stages
[2].mode
) || S_ISLNK(e
->stages
[2].mode
)) {
588 string_list_clear(&df_sorted_entries
, 0);
592 struct diff_filepair
*pair
;
594 * Purpose of src_entry and dst_entry:
596 * If 'before' is renamed to 'after' then src_entry will contain
597 * the versions of 'before' from the merge_base, HEAD, and MERGE in
598 * stages 1, 2, and 3; dst_entry will contain the respective
599 * versions of 'after' in corresponding locations. Thus, we have a
600 * total of six modes and oids, though some will be null. (Stage 0
601 * is ignored; we're interested in handling conflicts.)
603 * Since we don't turn on break-rewrites by default, neither
604 * src_entry nor dst_entry can have all three of their stages have
605 * non-null oids, meaning at most four of the six will be non-null.
606 * Also, since this is a rename, both src_entry and dst_entry will
607 * have at least one non-null oid, meaning at least two will be
608 * non-null. Of the six oids, a typical rename will have three be
609 * non-null. Only two implies a rename/delete, and four implies a
612 struct stage_data
*src_entry
;
613 struct stage_data
*dst_entry
;
614 unsigned add_turned_into_rename
:1;
615 unsigned processed
:1;
618 static int update_stages(struct merge_options
*opt
, const char *path
,
619 const struct diff_filespec
*o
,
620 const struct diff_filespec
*a
,
621 const struct diff_filespec
*b
)
625 * NOTE: It is usually a bad idea to call update_stages on a path
626 * before calling update_file on that same path, since it can
627 * sometimes lead to spurious "refusing to lose untracked file..."
628 * messages from update_file (via make_room_for path via
629 * would_lose_untracked). Instead, reverse the order of the calls
630 * (executing update_file first and then update_stages).
633 int options
= ADD_CACHE_OK_TO_ADD
| ADD_CACHE_SKIP_DFCHECK
;
635 if (remove_file_from_cache(path
))
638 if (add_cacheinfo(opt
, o
->mode
, &o
->oid
, path
, 1, 0, options
))
641 if (add_cacheinfo(opt
, a
->mode
, &a
->oid
, path
, 2, 0, options
))
644 if (add_cacheinfo(opt
, b
->mode
, &b
->oid
, path
, 3, 0, options
))
649 static int update_stages_for_stage_data(struct merge_options
*opt
,
651 const struct stage_data
*stage_data
)
653 struct diff_filespec o
, a
, b
;
655 o
.mode
= stage_data
->stages
[1].mode
;
656 oidcpy(&o
.oid
, &stage_data
->stages
[1].oid
);
658 a
.mode
= stage_data
->stages
[2].mode
;
659 oidcpy(&a
.oid
, &stage_data
->stages
[2].oid
);
661 b
.mode
= stage_data
->stages
[3].mode
;
662 oidcpy(&b
.oid
, &stage_data
->stages
[3].oid
);
664 return update_stages(opt
, path
,
665 is_null_oid(&o
.oid
) ? NULL
: &o
,
666 is_null_oid(&a
.oid
) ? NULL
: &a
,
667 is_null_oid(&b
.oid
) ? NULL
: &b
);
670 static void update_entry(struct stage_data
*entry
,
671 struct diff_filespec
*o
,
672 struct diff_filespec
*a
,
673 struct diff_filespec
*b
)
675 entry
->processed
= 0;
676 entry
->stages
[1].mode
= o
->mode
;
677 entry
->stages
[2].mode
= a
->mode
;
678 entry
->stages
[3].mode
= b
->mode
;
679 oidcpy(&entry
->stages
[1].oid
, &o
->oid
);
680 oidcpy(&entry
->stages
[2].oid
, &a
->oid
);
681 oidcpy(&entry
->stages
[3].oid
, &b
->oid
);
684 static int remove_file(struct merge_options
*o
, int clean
,
685 const char *path
, int no_wd
)
687 int update_cache
= o
->call_depth
|| clean
;
688 int update_working_directory
= !o
->call_depth
&& !no_wd
;
691 if (remove_file_from_cache(path
))
694 if (update_working_directory
) {
696 struct cache_entry
*ce
;
697 ce
= cache_file_exists(path
, strlen(path
), ignore_case
);
698 if (ce
&& ce_stage(ce
) == 0 && strcmp(path
, ce
->name
))
701 if (remove_path(path
))
707 /* add a string to a strbuf, but converting "/" to "_" */
708 static void add_flattened_path(struct strbuf
*out
, const char *s
)
711 strbuf_addstr(out
, s
);
712 for (; i
< out
->len
; i
++)
713 if (out
->buf
[i
] == '/')
717 static char *unique_path(struct merge_options
*o
, const char *path
, const char *branch
)
719 struct path_hashmap_entry
*entry
;
720 struct strbuf newpath
= STRBUF_INIT
;
724 strbuf_addf(&newpath
, "%s~", path
);
725 add_flattened_path(&newpath
, branch
);
727 base_len
= newpath
.len
;
728 while (hashmap_get_from_hash(&o
->current_file_dir_set
,
729 path_hash(newpath
.buf
), newpath
.buf
) ||
730 (!o
->call_depth
&& file_exists(newpath
.buf
))) {
731 strbuf_setlen(&newpath
, base_len
);
732 strbuf_addf(&newpath
, "_%d", suffix
++);
735 FLEX_ALLOC_MEM(entry
, path
, newpath
.buf
, newpath
.len
);
736 hashmap_entry_init(entry
, path_hash(entry
->path
));
737 hashmap_add(&o
->current_file_dir_set
, entry
);
738 return strbuf_detach(&newpath
, NULL
);
742 * Check whether a directory in the index is in the way of an incoming
743 * file. Return 1 if so. If check_working_copy is non-zero, also
744 * check the working directory. If empty_ok is non-zero, also return
745 * 0 in the case where the working-tree dir exists but is empty.
747 static int dir_in_way(const char *path
, int check_working_copy
, int empty_ok
)
750 struct strbuf dirpath
= STRBUF_INIT
;
753 strbuf_addstr(&dirpath
, path
);
754 strbuf_addch(&dirpath
, '/');
756 pos
= cache_name_pos(dirpath
.buf
, dirpath
.len
);
760 if (pos
< active_nr
&&
761 !strncmp(dirpath
.buf
, active_cache
[pos
]->name
, dirpath
.len
)) {
762 strbuf_release(&dirpath
);
766 strbuf_release(&dirpath
);
767 return check_working_copy
&& !lstat(path
, &st
) && S_ISDIR(st
.st_mode
) &&
768 !(empty_ok
&& is_empty_dir(path
));
771 static int was_tracked(const char *path
)
773 int pos
= cache_name_pos(path
, strlen(path
));
776 /* we have been tracking this path */
780 * Look for an unmerged entry for the path,
781 * specifically stage #2, which would indicate
782 * that "our" side before the merge started
783 * had the path tracked (and resulted in a conflict).
786 pos
< active_nr
&& !strcmp(path
, active_cache
[pos
]->name
);
788 if (ce_stage(active_cache
[pos
]) == 2)
793 static int would_lose_untracked(const char *path
)
795 return !was_tracked(path
) && file_exists(path
);
798 static int make_room_for_path(struct merge_options
*o
, const char *path
)
801 const char *msg
= _("failed to create path '%s'%s");
803 /* Unlink any D/F conflict files that are in the way */
804 for (i
= 0; i
< o
->df_conflict_file_set
.nr
; i
++) {
805 const char *df_path
= o
->df_conflict_file_set
.items
[i
].string
;
806 size_t pathlen
= strlen(path
);
807 size_t df_pathlen
= strlen(df_path
);
808 if (df_pathlen
< pathlen
&&
809 path
[df_pathlen
] == '/' &&
810 strncmp(path
, df_path
, df_pathlen
) == 0) {
812 _("Removing %s to make room for subdirectory\n"),
815 unsorted_string_list_delete_item(&o
->df_conflict_file_set
,
821 /* Make sure leading directories are created */
822 status
= safe_create_leading_directories_const(path
);
824 if (status
== SCLD_EXISTS
)
825 /* something else exists */
826 return err(o
, msg
, path
, _(": perhaps a D/F conflict?"));
827 return err(o
, msg
, path
, "");
831 * Do not unlink a file in the work tree if we are not
834 if (would_lose_untracked(path
))
835 return err(o
, _("refusing to lose untracked file at '%s'"),
838 /* Successful unlink is good.. */
841 /* .. and so is no existing file */
844 /* .. but not some other error (who really cares what?) */
845 return err(o
, msg
, path
, _(": perhaps a D/F conflict?"));
848 static int update_file_flags(struct merge_options
*o
,
849 const struct object_id
*oid
,
861 enum object_type type
;
865 if (S_ISGITLINK(mode
)) {
867 * We may later decide to recursively descend into
868 * the submodule directory and update its index
869 * and/or work tree, but we do not do that now.
875 buf
= read_sha1_file(oid
->hash
, &type
, &size
);
877 return err(o
, _("cannot read object %s '%s'"), oid_to_hex(oid
), path
);
878 if (type
!= OBJ_BLOB
) {
879 ret
= err(o
, _("blob expected for %s '%s'"), oid_to_hex(oid
), path
);
883 struct strbuf strbuf
= STRBUF_INIT
;
884 if (convert_to_working_tree(path
, buf
, size
, &strbuf
)) {
887 buf
= strbuf_detach(&strbuf
, NULL
);
891 if (make_room_for_path(o
, path
) < 0) {
895 if (S_ISREG(mode
) || (!has_symlinks
&& S_ISLNK(mode
))) {
901 fd
= open(path
, O_WRONLY
| O_TRUNC
| O_CREAT
, mode
);
903 ret
= err(o
, _("failed to open '%s': %s"),
904 path
, strerror(errno
));
907 write_in_full(fd
, buf
, size
);
909 } else if (S_ISLNK(mode
)) {
910 char *lnk
= xmemdupz(buf
, size
);
911 safe_create_leading_directories_const(path
);
913 if (symlink(lnk
, path
))
914 ret
= err(o
, _("failed to symlink '%s': %s"),
915 path
, strerror(errno
));
919 _("do not know what to do with %06o %s '%s'"),
920 mode
, oid_to_hex(oid
), path
);
925 if (!ret
&& update_cache
)
926 add_cacheinfo(o
, mode
, oid
, path
, 0, update_wd
, ADD_CACHE_OK_TO_ADD
);
930 static int update_file(struct merge_options
*o
,
932 const struct object_id
*oid
,
936 return update_file_flags(o
, oid
, mode
, path
, o
->call_depth
|| clean
, !o
->call_depth
);
939 /* Low level file merging, update and removal */
941 struct merge_file_info
{
942 struct object_id oid
;
948 static int merge_3way(struct merge_options
*o
,
949 mmbuffer_t
*result_buf
,
950 const struct diff_filespec
*one
,
951 const struct diff_filespec
*a
,
952 const struct diff_filespec
*b
,
956 mmfile_t orig
, src1
, src2
;
957 struct ll_merge_options ll_opts
= {0};
958 char *base_name
, *name1
, *name2
;
961 ll_opts
.renormalize
= o
->renormalize
;
962 ll_opts
.xdl_opts
= o
->xdl_opts
;
965 ll_opts
.virtual_ancestor
= 1;
968 switch (o
->recursive_variant
) {
969 case MERGE_RECURSIVE_OURS
:
970 ll_opts
.variant
= XDL_MERGE_FAVOR_OURS
;
972 case MERGE_RECURSIVE_THEIRS
:
973 ll_opts
.variant
= XDL_MERGE_FAVOR_THEIRS
;
981 if (strcmp(a
->path
, b
->path
) ||
982 (o
->ancestor
!= NULL
&& strcmp(a
->path
, one
->path
) != 0)) {
983 base_name
= o
->ancestor
== NULL
? NULL
:
984 mkpathdup("%s:%s", o
->ancestor
, one
->path
);
985 name1
= mkpathdup("%s:%s", branch1
, a
->path
);
986 name2
= mkpathdup("%s:%s", branch2
, b
->path
);
988 base_name
= o
->ancestor
== NULL
? NULL
:
989 mkpathdup("%s", o
->ancestor
);
990 name1
= mkpathdup("%s", branch1
);
991 name2
= mkpathdup("%s", branch2
);
994 read_mmblob(&orig
, &one
->oid
);
995 read_mmblob(&src1
, &a
->oid
);
996 read_mmblob(&src2
, &b
->oid
);
998 merge_status
= ll_merge(result_buf
, a
->path
, &orig
, base_name
,
999 &src1
, name1
, &src2
, name2
, &ll_opts
);
1007 return merge_status
;
1010 static int merge_file_1(struct merge_options
*o
,
1011 const struct diff_filespec
*one
,
1012 const struct diff_filespec
*a
,
1013 const struct diff_filespec
*b
,
1014 const char *branch1
,
1015 const char *branch2
,
1016 struct merge_file_info
*result
)
1021 if ((S_IFMT
& a
->mode
) != (S_IFMT
& b
->mode
)) {
1023 if (S_ISREG(a
->mode
)) {
1024 result
->mode
= a
->mode
;
1025 oidcpy(&result
->oid
, &a
->oid
);
1027 result
->mode
= b
->mode
;
1028 oidcpy(&result
->oid
, &b
->oid
);
1031 if (!oid_eq(&a
->oid
, &one
->oid
) && !oid_eq(&b
->oid
, &one
->oid
))
1037 if (a
->mode
== b
->mode
|| a
->mode
== one
->mode
)
1038 result
->mode
= b
->mode
;
1040 result
->mode
= a
->mode
;
1041 if (b
->mode
!= one
->mode
) {
1047 if (oid_eq(&a
->oid
, &b
->oid
) || oid_eq(&a
->oid
, &one
->oid
))
1048 oidcpy(&result
->oid
, &b
->oid
);
1049 else if (oid_eq(&b
->oid
, &one
->oid
))
1050 oidcpy(&result
->oid
, &a
->oid
);
1051 else if (S_ISREG(a
->mode
)) {
1052 mmbuffer_t result_buf
;
1053 int ret
= 0, merge_status
;
1055 merge_status
= merge_3way(o
, &result_buf
, one
, a
, b
,
1058 if ((merge_status
< 0) || !result_buf
.ptr
)
1059 ret
= err(o
, _("Failed to execute internal merge"));
1061 if (!ret
&& write_sha1_file(result_buf
.ptr
, result_buf
.size
,
1062 blob_type
, result
->oid
.hash
))
1063 ret
= err(o
, _("Unable to add %s to database"),
1066 free(result_buf
.ptr
);
1069 result
->clean
= (merge_status
== 0);
1070 } else if (S_ISGITLINK(a
->mode
)) {
1071 result
->clean
= merge_submodule(&result
->oid
,
1077 } else if (S_ISLNK(a
->mode
)) {
1078 oidcpy(&result
->oid
, &a
->oid
);
1080 if (!oid_eq(&a
->oid
, &b
->oid
))
1083 die("BUG: unsupported object type in the tree");
1089 static int merge_file_special_markers(struct merge_options
*o
,
1090 const struct diff_filespec
*one
,
1091 const struct diff_filespec
*a
,
1092 const struct diff_filespec
*b
,
1093 const char *branch1
,
1094 const char *filename1
,
1095 const char *branch2
,
1096 const char *filename2
,
1097 struct merge_file_info
*mfi
)
1104 side1
= xstrfmt("%s:%s", branch1
, filename1
);
1106 side2
= xstrfmt("%s:%s", branch2
, filename2
);
1108 ret
= merge_file_1(o
, one
, a
, b
,
1109 side1
? side1
: branch1
,
1110 side2
? side2
: branch2
, mfi
);
1116 static int merge_file_one(struct merge_options
*o
,
1118 const struct object_id
*o_oid
, int o_mode
,
1119 const struct object_id
*a_oid
, int a_mode
,
1120 const struct object_id
*b_oid
, int b_mode
,
1121 const char *branch1
,
1122 const char *branch2
,
1123 struct merge_file_info
*mfi
)
1125 struct diff_filespec one
, a
, b
;
1127 one
.path
= a
.path
= b
.path
= (char *)path
;
1128 oidcpy(&one
.oid
, o_oid
);
1130 oidcpy(&a
.oid
, a_oid
);
1132 oidcpy(&b
.oid
, b_oid
);
1134 return merge_file_1(o
, &one
, &a
, &b
, branch1
, branch2
, mfi
);
1137 static int conflict_rename_dir(struct merge_options
*o
,
1138 struct diff_filepair
*pair
,
1139 const char *rename_branch
,
1140 const char *other_branch
)
1142 const struct diff_filespec
*dest
= pair
->two
;
1144 if (!o
->call_depth
&& would_lose_untracked(dest
->path
)) {
1145 char *alt_path
= unique_path(o
, dest
->path
, rename_branch
);
1147 output(o
, 1, _("Error: Refusing to lose untracked file at %s; "
1148 "writing to %s instead."),
1149 dest
->path
, alt_path
);
1151 * Write the file in worktree at alt_path, but not in the
1152 * index. Instead, write to dest->path for the index but
1153 * only at the higher appropriate stage.
1155 if (update_file(o
, 0, &dest
->oid
, dest
->mode
, alt_path
))
1158 return update_stages(o
, dest
->path
, NULL
,
1159 rename_branch
== o
->branch1
? dest
: NULL
,
1160 rename_branch
== o
->branch1
? NULL
: dest
);
1163 /* Update dest->path both in index and in worktree */
1164 if (update_file(o
, 1, &dest
->oid
, dest
->mode
, dest
->path
))
1169 static int handle_change_delete(struct merge_options
*o
,
1170 const char *path
, const char *old_path
,
1171 const struct object_id
*o_oid
, int o_mode
,
1172 const struct object_id
*changed_oid
,
1174 const char *change_branch
,
1175 const char *delete_branch
,
1176 const char *change
, const char *change_past
)
1178 char *alt_path
= NULL
;
1179 const char *update_path
= path
;
1182 if (dir_in_way(path
, !o
->call_depth
, 0) ||
1183 (!o
->call_depth
&& would_lose_untracked(path
))) {
1184 update_path
= alt_path
= unique_path(o
, path
, change_branch
);
1187 if (o
->call_depth
) {
1189 * We cannot arbitrarily accept either a_sha or b_sha as
1190 * correct; since there is no true "middle point" between
1191 * them, simply reuse the base version for virtual merge base.
1193 ret
= remove_file_from_cache(path
);
1195 ret
= update_file(o
, 0, o_oid
, o_mode
, update_path
);
1199 output(o
, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1200 "and %s in %s. Version %s of %s left in tree."),
1201 change
, path
, delete_branch
, change_past
,
1202 change_branch
, change_branch
, path
);
1204 output(o
, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1205 "and %s to %s in %s. Version %s of %s left in tree."),
1206 change
, old_path
, delete_branch
, change_past
, path
,
1207 change_branch
, change_branch
, path
);
1211 output(o
, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1212 "and %s in %s. Version %s of %s left in tree at %s."),
1213 change
, path
, delete_branch
, change_past
,
1214 change_branch
, change_branch
, path
, alt_path
);
1216 output(o
, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1217 "and %s to %s in %s. Version %s of %s left in tree at %s."),
1218 change
, old_path
, delete_branch
, change_past
, path
,
1219 change_branch
, change_branch
, path
, alt_path
);
1223 * No need to call update_file() on path when change_branch ==
1224 * o->branch1 && !alt_path, since that would needlessly touch
1225 * path. We could call update_file_flags() with update_cache=0
1226 * and update_wd=0, but that's a no-op.
1228 if (change_branch
!= o
->branch1
|| alt_path
)
1229 ret
= update_file(o
, 0, changed_oid
, changed_mode
, update_path
);
1236 static int conflict_rename_delete(struct merge_options
*o
,
1237 struct diff_filepair
*pair
,
1238 const char *rename_branch
,
1239 const char *delete_branch
)
1241 const struct diff_filespec
*orig
= pair
->one
;
1242 const struct diff_filespec
*dest
= pair
->two
;
1244 if (handle_change_delete(o
,
1245 o
->call_depth
? orig
->path
: dest
->path
,
1246 o
->call_depth
? NULL
: orig
->path
,
1247 &orig
->oid
, orig
->mode
,
1248 &dest
->oid
, dest
->mode
,
1249 rename_branch
, delete_branch
,
1250 _("rename"), _("renamed")))
1254 return remove_file_from_cache(dest
->path
);
1256 return update_stages(o
, dest
->path
, NULL
,
1257 rename_branch
== o
->branch1
? dest
: NULL
,
1258 rename_branch
== o
->branch1
? NULL
: dest
);
1261 static struct diff_filespec
*filespec_from_entry(struct diff_filespec
*target
,
1262 struct stage_data
*entry
,
1265 struct object_id
*oid
= &entry
->stages
[stage
].oid
;
1266 unsigned mode
= entry
->stages
[stage
].mode
;
1267 if (mode
== 0 || is_null_oid(oid
))
1269 oidcpy(&target
->oid
, oid
);
1270 target
->mode
= mode
;
1274 static int handle_file(struct merge_options
*o
,
1275 struct diff_filespec
*rename
,
1277 struct rename_conflict_info
*ci
)
1279 char *dst_name
= rename
->path
;
1280 struct stage_data
*dst_entry
;
1281 const char *cur_branch
, *other_branch
;
1282 struct diff_filespec other
;
1283 struct diff_filespec
*add
;
1287 dst_entry
= ci
->dst_entry1
;
1288 cur_branch
= ci
->branch1
;
1289 other_branch
= ci
->branch2
;
1291 dst_entry
= ci
->dst_entry2
;
1292 cur_branch
= ci
->branch2
;
1293 other_branch
= ci
->branch1
;
1296 add
= filespec_from_entry(&other
, dst_entry
, stage
^ 1);
1298 char *add_name
= unique_path(o
, rename
->path
, other_branch
);
1299 if (update_file(o
, 0, &add
->oid
, add
->mode
, add_name
))
1302 remove_file(o
, 0, rename
->path
, 0);
1303 dst_name
= unique_path(o
, rename
->path
, cur_branch
);
1305 if (dir_in_way(rename
->path
, !o
->call_depth
, 0)) {
1306 dst_name
= unique_path(o
, rename
->path
, cur_branch
);
1307 output(o
, 1, _("%s is a directory in %s adding as %s instead"),
1308 rename
->path
, other_branch
, dst_name
);
1309 } else if (!o
->call_depth
&&
1310 would_lose_untracked(rename
->path
)) {
1311 dst_name
= unique_path(o
, rename
->path
, cur_branch
);
1312 output(o
, 1, _("Refusing to lose untracked file at %s; "
1313 "adding as %s instead"),
1314 rename
->path
, dst_name
);
1317 if ((ret
= update_file(o
, 0, &rename
->oid
, rename
->mode
, dst_name
)))
1318 ; /* fall through, do allow dst_name to be released */
1319 else if (stage
== 2)
1320 ret
= update_stages(o
, rename
->path
, NULL
, rename
, add
);
1322 ret
= update_stages(o
, rename
->path
, NULL
, add
, rename
);
1324 if (dst_name
!= rename
->path
)
1330 static int conflict_rename_rename_1to2(struct merge_options
*o
,
1331 struct rename_conflict_info
*ci
)
1333 /* One file was renamed in both branches, but to different names. */
1334 struct diff_filespec
*one
= ci
->pair1
->one
;
1335 struct diff_filespec
*a
= ci
->pair1
->two
;
1336 struct diff_filespec
*b
= ci
->pair2
->two
;
1338 output(o
, 1, _("CONFLICT (rename/rename): "
1339 "Rename \"%s\"->\"%s\" in branch \"%s\" "
1340 "rename \"%s\"->\"%s\" in \"%s\"%s"),
1341 one
->path
, a
->path
, ci
->branch1
,
1342 one
->path
, b
->path
, ci
->branch2
,
1343 o
->call_depth
? _(" (left unresolved)") : "");
1344 if (o
->call_depth
) {
1345 struct merge_file_info mfi
;
1346 struct diff_filespec other
;
1347 struct diff_filespec
*add
;
1348 if (merge_file_one(o
, one
->path
,
1349 &one
->oid
, one
->mode
,
1352 ci
->branch1
, ci
->branch2
, &mfi
))
1356 * FIXME: For rename/add-source conflicts (if we could detect
1357 * such), this is wrong. We should instead find a unique
1358 * pathname and then either rename the add-source file to that
1359 * unique path, or use that unique path instead of src here.
1361 if (update_file(o
, 0, &mfi
.oid
, mfi
.mode
, one
->path
))
1365 * Above, we put the merged content at the merge-base's
1366 * path. Now we usually need to delete both a->path and
1367 * b->path. However, the rename on each side of the merge
1368 * could also be involved in a rename/add conflict. In
1369 * such cases, we should keep the added file around,
1370 * resolving the conflict at that path in its favor.
1372 add
= filespec_from_entry(&other
, ci
->dst_entry1
, 2 ^ 1);
1374 if (update_file(o
, 0, &add
->oid
, add
->mode
, a
->path
))
1378 remove_file_from_cache(a
->path
);
1379 add
= filespec_from_entry(&other
, ci
->dst_entry2
, 3 ^ 1);
1381 if (update_file(o
, 0, &add
->oid
, add
->mode
, b
->path
))
1385 remove_file_from_cache(b
->path
);
1386 } else if (handle_file(o
, a
, 2, ci
) || handle_file(o
, b
, 3, ci
))
1392 static int conflict_rename_rename_2to1(struct merge_options
*o
,
1393 struct rename_conflict_info
*ci
)
1395 /* Two files, a & b, were renamed to the same thing, c. */
1396 struct diff_filespec
*a
= ci
->pair1
->one
;
1397 struct diff_filespec
*b
= ci
->pair2
->one
;
1398 struct diff_filespec
*c1
= ci
->pair1
->two
;
1399 struct diff_filespec
*c2
= ci
->pair2
->two
;
1400 char *path
= c1
->path
; /* == c2->path */
1401 struct merge_file_info mfi_c1
;
1402 struct merge_file_info mfi_c2
;
1405 output(o
, 1, _("CONFLICT (rename/rename): "
1406 "Rename %s->%s in %s. "
1407 "Rename %s->%s in %s"),
1408 a
->path
, c1
->path
, ci
->branch1
,
1409 b
->path
, c2
->path
, ci
->branch2
);
1411 remove_file(o
, 1, a
->path
, o
->call_depth
|| would_lose_untracked(a
->path
));
1412 remove_file(o
, 1, b
->path
, o
->call_depth
|| would_lose_untracked(b
->path
));
1414 if (merge_file_special_markers(o
, a
, c1
, &ci
->ren1_other
,
1415 o
->branch1
, c1
->path
,
1416 o
->branch2
, ci
->ren1_other
.path
, &mfi_c1
) ||
1417 merge_file_special_markers(o
, b
, &ci
->ren2_other
, c2
,
1418 o
->branch1
, ci
->ren2_other
.path
,
1419 o
->branch2
, c2
->path
, &mfi_c2
))
1422 if (o
->call_depth
) {
1424 * If mfi_c1.clean && mfi_c2.clean, then it might make
1425 * sense to do a two-way merge of those results. But, I
1426 * think in all cases, it makes sense to have the virtual
1427 * merge base just undo the renames; they can be detected
1428 * again later for the non-recursive merge.
1430 remove_file(o
, 0, path
, 0);
1431 ret
= update_file(o
, 0, &mfi_c1
.oid
, mfi_c1
.mode
, a
->path
);
1433 ret
= update_file(o
, 0, &mfi_c2
.oid
, mfi_c2
.mode
,
1436 char *new_path1
= unique_path(o
, path
, ci
->branch1
);
1437 char *new_path2
= unique_path(o
, path
, ci
->branch2
);
1438 output(o
, 1, _("Renaming %s to %s and %s to %s instead"),
1439 a
->path
, new_path1
, b
->path
, new_path2
);
1440 if (would_lose_untracked(path
))
1442 * Only way we get here is if both renames were from
1443 * a directory rename AND user had an untracked file
1444 * at the location where both files end up after the
1445 * two directory renames. See testcase 10d of t6043.
1447 output(o
, 1, _("Refusing to lose untracked file at "
1448 "%s, even though it's in the way."),
1451 remove_file(o
, 0, path
, 0);
1452 ret
= update_file(o
, 0, &mfi_c1
.oid
, mfi_c1
.mode
, new_path1
);
1454 ret
= update_file(o
, 0, &mfi_c2
.oid
, mfi_c2
.mode
,
1457 * unpack_trees() actually populates the index for us for
1458 * "normal" rename/rename(2to1) situtations so that the
1459 * correct entries are at the higher stages, which would
1460 * make the call below to update_stages_for_stage_data
1461 * unnecessary. However, if either of the renames came
1462 * from a directory rename, then unpack_trees() will not
1463 * have gotten the right data loaded into the index, so we
1464 * need to do so now. (While it'd be tempting to move this
1465 * call to update_stages_for_stage_data() to
1466 * apply_directory_rename_modifications(), that would break
1467 * our intermediate calls to would_lose_untracked() since
1468 * those rely on the current in-memory index. See also the
1469 * big "NOTE" in update_stages()).
1471 if (update_stages_for_stage_data(o
, path
, ci
->dst_entry1
))
1482 * Get the diff_filepairs changed between o_tree and tree.
1484 static struct diff_queue_struct
*get_diffpairs(struct merge_options
*o
,
1485 struct tree
*o_tree
,
1488 struct diff_queue_struct
*ret
;
1489 struct diff_options opts
;
1492 opts
.flags
.recursive
= 1;
1493 opts
.flags
.rename_empty
= 0;
1494 opts
.detect_rename
= DIFF_DETECT_RENAME
;
1495 opts
.rename_limit
= o
->merge_rename_limit
>= 0 ? o
->merge_rename_limit
:
1496 o
->diff_rename_limit
>= 0 ? o
->diff_rename_limit
:
1498 opts
.rename_score
= o
->rename_score
;
1499 opts
.show_rename_progress
= o
->show_rename_progress
;
1500 opts
.output_format
= DIFF_FORMAT_NO_OUTPUT
;
1501 diff_setup_done(&opts
);
1502 diff_tree_oid(&o_tree
->object
.oid
, &tree
->object
.oid
, "", &opts
);
1503 diffcore_std(&opts
);
1504 if (opts
.needed_rename_limit
> o
->needed_rename_limit
)
1505 o
->needed_rename_limit
= opts
.needed_rename_limit
;
1507 ret
= xmalloc(sizeof(*ret
));
1508 *ret
= diff_queued_diff
;
1510 opts
.output_format
= DIFF_FORMAT_NO_OUTPUT
;
1511 diff_queued_diff
.nr
= 0;
1512 diff_queued_diff
.queue
= NULL
;
1517 static int tree_has_path(struct tree
*tree
, const char *path
)
1519 unsigned char hashy
[GIT_MAX_RAWSZ
];
1520 unsigned int mode_o
;
1522 return !get_tree_entry(tree
->object
.oid
.hash
, path
,
1527 * Return a new string that replaces the beginning portion (which matches
1528 * entry->dir), with entry->new_dir. In perl-speak:
1529 * new_path_name = (old_path =~ s/entry->dir/entry->new_dir/);
1531 * Caller must ensure that old_path starts with entry->dir + '/'.
1533 static char *apply_dir_rename(struct dir_rename_entry
*entry
,
1534 const char *old_path
)
1536 struct strbuf new_path
= STRBUF_INIT
;
1539 if (entry
->non_unique_new_dir
)
1542 oldlen
= strlen(entry
->dir
);
1543 newlen
= entry
->new_dir
.len
+ (strlen(old_path
) - oldlen
) + 1;
1544 strbuf_grow(&new_path
, newlen
);
1545 strbuf_addbuf(&new_path
, &entry
->new_dir
);
1546 strbuf_addstr(&new_path
, &old_path
[oldlen
]);
1548 return strbuf_detach(&new_path
, NULL
);
1551 static void get_renamed_dir_portion(const char *old_path
, const char *new_path
,
1552 char **old_dir
, char **new_dir
)
1554 char *end_of_old
, *end_of_new
;
1555 int old_len
, new_len
;
1562 * "a/b/c/d/e/foo.c" -> "a/b/some/thing/else/e/foo.c"
1563 * the "e/foo.c" part is the same, we just want to know that
1564 * "a/b/c/d" was renamed to "a/b/some/thing/else"
1565 * so, for this example, this function returns "a/b/c/d" in
1566 * *old_dir and "a/b/some/thing/else" in *new_dir.
1568 * Also, if the basename of the file changed, we don't care. We
1569 * want to know which portion of the directory, if any, changed.
1571 end_of_old
= strrchr(old_path
, '/');
1572 end_of_new
= strrchr(new_path
, '/');
1574 if (end_of_old
== NULL
|| end_of_new
== NULL
)
1576 while (*--end_of_new
== *--end_of_old
&&
1577 end_of_old
!= old_path
&&
1578 end_of_new
!= new_path
)
1579 ; /* Do nothing; all in the while loop */
1581 * We've found the first non-matching character in the directory
1582 * paths. That means the current directory we were comparing
1583 * represents the rename. Move end_of_old and end_of_new back
1584 * to the full directory name.
1586 if (*end_of_old
== '/')
1588 if (*end_of_old
!= '/')
1590 end_of_old
= strchr(end_of_old
, '/');
1591 end_of_new
= strchr(end_of_new
, '/');
1594 * It may have been the case that old_path and new_path were the same
1595 * directory all along. Don't claim a rename if they're the same.
1597 old_len
= end_of_old
- old_path
;
1598 new_len
= end_of_new
- new_path
;
1600 if (old_len
!= new_len
|| strncmp(old_path
, new_path
, old_len
)) {
1601 *old_dir
= xstrndup(old_path
, old_len
);
1602 *new_dir
= xstrndup(new_path
, new_len
);
1606 static void remove_hashmap_entries(struct hashmap
*dir_renames
,
1607 struct string_list
*items_to_remove
)
1610 struct dir_rename_entry
*entry
;
1612 for (i
= 0; i
< items_to_remove
->nr
; i
++) {
1613 entry
= items_to_remove
->items
[i
].util
;
1614 hashmap_remove(dir_renames
, entry
, NULL
);
1616 string_list_clear(items_to_remove
, 0);
1620 * See if there is a directory rename for path, and if there are any file
1621 * level conflicts for the renamed location. If there is a rename and
1622 * there are no conflicts, return the new name. Otherwise, return NULL.
1624 static char *handle_path_level_conflicts(struct merge_options
*o
,
1626 struct dir_rename_entry
*entry
,
1627 struct hashmap
*collisions
,
1630 char *new_path
= NULL
;
1631 struct collision_entry
*collision_ent
;
1633 struct strbuf collision_paths
= STRBUF_INIT
;
1636 * entry has the mapping of old directory name to new directory name
1637 * that we want to apply to path.
1639 new_path
= apply_dir_rename(entry
, path
);
1642 /* This should only happen when entry->non_unique_new_dir set */
1643 if (!entry
->non_unique_new_dir
)
1644 BUG("entry->non_unqiue_dir not set and !new_path");
1645 output(o
, 1, _("CONFLICT (directory rename split): "
1646 "Unclear where to place %s because directory "
1647 "%s was renamed to multiple other directories, "
1648 "with no destination getting a majority of the "
1656 * The caller needs to have ensured that it has pre-populated
1657 * collisions with all paths that map to new_path. Do a quick check
1658 * to ensure that's the case.
1660 collision_ent
= collision_find_entry(collisions
, new_path
);
1661 if (collision_ent
== NULL
)
1662 BUG("collision_ent is NULL");
1665 * Check for one-sided add/add/.../add conflicts, i.e.
1666 * where implicit renames from the other side doing
1667 * directory rename(s) can affect this side of history
1668 * to put multiple paths into the same location. Warn
1669 * and bail on directory renames for such paths.
1671 if (collision_ent
->reported_already
) {
1673 } else if (tree_has_path(tree
, new_path
)) {
1674 collision_ent
->reported_already
= 1;
1675 strbuf_add_separated_string_list(&collision_paths
, ", ",
1676 &collision_ent
->source_files
);
1677 output(o
, 1, _("CONFLICT (implicit dir rename): Existing "
1678 "file/dir at %s in the way of implicit "
1679 "directory rename(s) putting the following "
1680 "path(s) there: %s."),
1681 new_path
, collision_paths
.buf
);
1683 } else if (collision_ent
->source_files
.nr
> 1) {
1684 collision_ent
->reported_already
= 1;
1685 strbuf_add_separated_string_list(&collision_paths
, ", ",
1686 &collision_ent
->source_files
);
1687 output(o
, 1, _("CONFLICT (implicit dir rename): Cannot map "
1688 "more than one path to %s; implicit directory "
1689 "renames tried to put these paths there: %s"),
1690 new_path
, collision_paths
.buf
);
1694 /* Free memory we no longer need */
1695 strbuf_release(&collision_paths
);
1696 if (!clean
&& new_path
) {
1705 * There are a couple things we want to do at the directory level:
1706 * 1. Check for both sides renaming to the same thing, in order to avoid
1707 * implicit renaming of files that should be left in place. (See
1708 * testcase 6b in t6043 for details.)
1709 * 2. Prune directory renames if there are still files left in the
1710 * the original directory. These represent a partial directory rename,
1711 * i.e. a rename where only some of the files within the directory
1712 * were renamed elsewhere. (Technically, this could be done earlier
1713 * in get_directory_renames(), except that would prevent us from
1714 * doing the previous check and thus failing testcase 6b.)
1715 * 3. Check for rename/rename(1to2) conflicts (at the directory level).
1716 * In the future, we could potentially record this info as well and
1717 * omit reporting rename/rename(1to2) conflicts for each path within
1718 * the affected directories, thus cleaning up the merge output.
1719 * NOTE: We do NOT check for rename/rename(2to1) conflicts at the
1720 * directory level, because merging directories is fine. If it
1721 * causes conflicts for files within those merged directories, then
1722 * that should be detected at the individual path level.
1724 static void handle_directory_level_conflicts(struct merge_options
*o
,
1725 struct hashmap
*dir_re_head
,
1727 struct hashmap
*dir_re_merge
,
1730 struct hashmap_iter iter
;
1731 struct dir_rename_entry
*head_ent
;
1732 struct dir_rename_entry
*merge_ent
;
1734 struct string_list remove_from_head
= STRING_LIST_INIT_NODUP
;
1735 struct string_list remove_from_merge
= STRING_LIST_INIT_NODUP
;
1737 hashmap_iter_init(dir_re_head
, &iter
);
1738 while ((head_ent
= hashmap_iter_next(&iter
))) {
1739 merge_ent
= dir_rename_find_entry(dir_re_merge
, head_ent
->dir
);
1741 !head_ent
->non_unique_new_dir
&&
1742 !merge_ent
->non_unique_new_dir
&&
1743 !strbuf_cmp(&head_ent
->new_dir
, &merge_ent
->new_dir
)) {
1744 /* 1. Renamed identically; remove it from both sides */
1745 string_list_append(&remove_from_head
,
1746 head_ent
->dir
)->util
= head_ent
;
1747 strbuf_release(&head_ent
->new_dir
);
1748 string_list_append(&remove_from_merge
,
1749 merge_ent
->dir
)->util
= merge_ent
;
1750 strbuf_release(&merge_ent
->new_dir
);
1751 } else if (tree_has_path(head
, head_ent
->dir
)) {
1752 /* 2. This wasn't a directory rename after all */
1753 string_list_append(&remove_from_head
,
1754 head_ent
->dir
)->util
= head_ent
;
1755 strbuf_release(&head_ent
->new_dir
);
1759 remove_hashmap_entries(dir_re_head
, &remove_from_head
);
1760 remove_hashmap_entries(dir_re_merge
, &remove_from_merge
);
1762 hashmap_iter_init(dir_re_merge
, &iter
);
1763 while ((merge_ent
= hashmap_iter_next(&iter
))) {
1764 head_ent
= dir_rename_find_entry(dir_re_head
, merge_ent
->dir
);
1765 if (tree_has_path(merge
, merge_ent
->dir
)) {
1766 /* 2. This wasn't a directory rename after all */
1767 string_list_append(&remove_from_merge
,
1768 merge_ent
->dir
)->util
= merge_ent
;
1769 } else if (head_ent
&&
1770 !head_ent
->non_unique_new_dir
&&
1771 !merge_ent
->non_unique_new_dir
) {
1772 /* 3. rename/rename(1to2) */
1774 * We can assume it's not rename/rename(1to1) because
1775 * that was case (1), already checked above. So we
1776 * know that head_ent->new_dir and merge_ent->new_dir
1777 * are different strings.
1779 output(o
, 1, _("CONFLICT (rename/rename): "
1780 "Rename directory %s->%s in %s. "
1781 "Rename directory %s->%s in %s"),
1782 head_ent
->dir
, head_ent
->new_dir
.buf
, o
->branch1
,
1783 head_ent
->dir
, merge_ent
->new_dir
.buf
, o
->branch2
);
1784 string_list_append(&remove_from_head
,
1785 head_ent
->dir
)->util
= head_ent
;
1786 strbuf_release(&head_ent
->new_dir
);
1787 string_list_append(&remove_from_merge
,
1788 merge_ent
->dir
)->util
= merge_ent
;
1789 strbuf_release(&merge_ent
->new_dir
);
1793 remove_hashmap_entries(dir_re_head
, &remove_from_head
);
1794 remove_hashmap_entries(dir_re_merge
, &remove_from_merge
);
1797 static struct hashmap
*get_directory_renames(struct diff_queue_struct
*pairs
,
1800 struct hashmap
*dir_renames
;
1801 struct hashmap_iter iter
;
1802 struct dir_rename_entry
*entry
;
1806 * Typically, we think of a directory rename as all files from a
1807 * certain directory being moved to a target directory. However,
1808 * what if someone first moved two files from the original
1809 * directory in one commit, and then renamed the directory
1810 * somewhere else in a later commit? At merge time, we just know
1811 * that files from the original directory went to two different
1812 * places, and that the bulk of them ended up in the same place.
1813 * We want each directory rename to represent where the bulk of the
1814 * files from that directory end up; this function exists to find
1815 * where the bulk of the files went.
1817 * The first loop below simply iterates through the list of file
1818 * renames, finding out how often each directory rename pair
1819 * possibility occurs.
1821 dir_renames
= xmalloc(sizeof(struct hashmap
));
1822 dir_rename_init(dir_renames
);
1823 for (i
= 0; i
< pairs
->nr
; ++i
) {
1824 struct string_list_item
*item
;
1826 struct diff_filepair
*pair
= pairs
->queue
[i
];
1827 char *old_dir
, *new_dir
;
1829 /* File not part of directory rename if it wasn't renamed */
1830 if (pair
->status
!= 'R')
1833 get_renamed_dir_portion(pair
->one
->path
, pair
->two
->path
,
1834 &old_dir
, &new_dir
);
1836 /* Directory didn't change at all; ignore this one. */
1839 entry
= dir_rename_find_entry(dir_renames
, old_dir
);
1841 entry
= xmalloc(sizeof(struct dir_rename_entry
));
1842 dir_rename_entry_init(entry
, old_dir
);
1843 hashmap_put(dir_renames
, entry
);
1847 item
= string_list_lookup(&entry
->possible_new_dirs
, new_dir
);
1849 item
= string_list_insert(&entry
->possible_new_dirs
,
1851 item
->util
= xcalloc(1, sizeof(int));
1860 * For each directory with files moved out of it, we find out which
1861 * target directory received the most files so we can declare it to
1862 * be the "winning" target location for the directory rename. This
1863 * winner gets recorded in new_dir. If there is no winner
1864 * (multiple target directories received the same number of files),
1865 * we set non_unique_new_dir. Once we've determined the winner (or
1866 * that there is no winner), we no longer need possible_new_dirs.
1868 hashmap_iter_init(dir_renames
, &iter
);
1869 while ((entry
= hashmap_iter_next(&iter
))) {
1874 for (i
= 0; i
< entry
->possible_new_dirs
.nr
; i
++) {
1875 int *count
= entry
->possible_new_dirs
.items
[i
].util
;
1879 else if (*count
> max
) {
1881 best
= entry
->possible_new_dirs
.items
[i
].string
;
1885 entry
->non_unique_new_dir
= 1;
1887 assert(entry
->new_dir
.len
== 0);
1888 strbuf_addstr(&entry
->new_dir
, best
);
1891 * The relevant directory sub-portion of the original full
1892 * filepaths were xstrndup'ed before inserting into
1893 * possible_new_dirs, and instead of manually iterating the
1894 * list and free'ing each, just lie and tell
1895 * possible_new_dirs that it did the strdup'ing so that it
1896 * will free them for us.
1898 entry
->possible_new_dirs
.strdup_strings
= 1;
1899 string_list_clear(&entry
->possible_new_dirs
, 1);
1905 static struct dir_rename_entry
*check_dir_renamed(const char *path
,
1906 struct hashmap
*dir_renames
)
1908 char temp
[PATH_MAX
];
1910 struct dir_rename_entry
*entry
;
1913 while ((end
= strrchr(temp
, '/'))) {
1915 entry
= dir_rename_find_entry(dir_renames
, temp
);
1922 static void compute_collisions(struct hashmap
*collisions
,
1923 struct hashmap
*dir_renames
,
1924 struct diff_queue_struct
*pairs
)
1929 * Multiple files can be mapped to the same path due to directory
1930 * renames done by the other side of history. Since that other
1931 * side of history could have merged multiple directories into one,
1932 * if our side of history added the same file basename to each of
1933 * those directories, then all N of them would get implicitly
1934 * renamed by the directory rename detection into the same path,
1935 * and we'd get an add/add/.../add conflict, and all those adds
1936 * from *this* side of history. This is not representable in the
1937 * index, and users aren't going to easily be able to make sense of
1938 * it. So we need to provide a good warning about what's
1939 * happening, and fall back to no-directory-rename detection
1940 * behavior for those paths.
1942 * See testcases 9e and all of section 5 from t6043 for examples.
1944 collision_init(collisions
);
1946 for (i
= 0; i
< pairs
->nr
; ++i
) {
1947 struct dir_rename_entry
*dir_rename_ent
;
1948 struct collision_entry
*collision_ent
;
1950 struct diff_filepair
*pair
= pairs
->queue
[i
];
1952 if (pair
->status
== 'D')
1954 dir_rename_ent
= check_dir_renamed(pair
->two
->path
,
1956 if (!dir_rename_ent
)
1959 new_path
= apply_dir_rename(dir_rename_ent
, pair
->two
->path
);
1962 * dir_rename_ent->non_unique_new_path is true, which
1963 * means there is no directory rename for us to use,
1964 * which means it won't cause us any additional
1968 collision_ent
= collision_find_entry(collisions
, new_path
);
1969 if (!collision_ent
) {
1970 collision_ent
= xcalloc(1,
1971 sizeof(struct collision_entry
));
1972 hashmap_entry_init(collision_ent
, strhash(new_path
));
1973 hashmap_put(collisions
, collision_ent
);
1974 collision_ent
->target_file
= new_path
;
1978 string_list_insert(&collision_ent
->source_files
,
1983 static char *check_for_directory_rename(struct merge_options
*o
,
1986 struct hashmap
*dir_renames
,
1987 struct hashmap
*dir_rename_exclusions
,
1988 struct hashmap
*collisions
,
1991 char *new_path
= NULL
;
1992 struct dir_rename_entry
*entry
= check_dir_renamed(path
, dir_renames
);
1993 struct dir_rename_entry
*oentry
= NULL
;
1999 * This next part is a little weird. We do not want to do an
2000 * implicit rename into a directory we renamed on our side, because
2001 * that will result in a spurious rename/rename(1to2) conflict. An
2003 * Base commit: dumbdir/afile, otherdir/bfile
2004 * Side 1: smrtdir/afile, otherdir/bfile
2005 * Side 2: dumbdir/afile, dumbdir/bfile
2006 * Here, while working on Side 1, we could notice that otherdir was
2007 * renamed/merged to dumbdir, and change the diff_filepair for
2008 * otherdir/bfile into a rename into dumbdir/bfile. However, Side
2009 * 2 will notice the rename from dumbdir to smrtdir, and do the
2010 * transitive rename to move it from dumbdir/bfile to
2011 * smrtdir/bfile. That gives us bfile in dumbdir vs being in
2012 * smrtdir, a rename/rename(1to2) conflict. We really just want
2013 * the file to end up in smrtdir. And the way to achieve that is
2014 * to not let Side1 do the rename to dumbdir, since we know that is
2015 * the source of one of our directory renames.
2017 * That's why oentry and dir_rename_exclusions is here.
2019 * As it turns out, this also prevents N-way transient rename
2020 * confusion; See testcases 9c and 9d of t6043.
2022 oentry
= dir_rename_find_entry(dir_rename_exclusions
, entry
->new_dir
.buf
);
2024 output(o
, 1, _("WARNING: Avoiding applying %s -> %s rename "
2025 "to %s, because %s itself was renamed."),
2026 entry
->dir
, entry
->new_dir
.buf
, path
, entry
->new_dir
.buf
);
2028 new_path
= handle_path_level_conflicts(o
, path
, entry
,
2030 *clean_merge
&= (new_path
!= NULL
);
2036 static void apply_directory_rename_modifications(struct merge_options
*o
,
2037 struct diff_filepair
*pair
,
2041 struct tree
*o_tree
,
2042 struct tree
*a_tree
,
2043 struct tree
*b_tree
,
2044 struct string_list
*entries
,
2047 struct string_list_item
*item
;
2048 int stage
= (tree
== a_tree
? 2 : 3);
2051 * In all cases where we can do directory rename detection,
2052 * unpack_trees() will have read pair->two->path into the
2053 * index and the working copy. We need to remove it so that
2054 * we can instead place it at new_path. It is guaranteed to
2055 * not be untracked (unpack_trees() would have errored out
2056 * saying the file would have been overwritten), but it might
2059 remove_file(o
, 1, pair
->two
->path
, 0 /* no_wd */);
2061 /* Find or create a new re->dst_entry */
2062 item
= string_list_lookup(entries
, new_path
);
2065 * Since we're renaming on this side of history, and it's
2066 * due to a directory rename on the other side of history
2067 * (which we only allow when the directory in question no
2068 * longer exists on the other side of history), the
2069 * original entry for re->dst_entry is no longer
2072 re
->dst_entry
->processed
= 1;
2075 * ...because we'll be using this new one.
2077 re
->dst_entry
= item
->util
;
2080 * re->dst_entry is for the before-dir-rename path, and we
2081 * need it to hold information for the after-dir-rename
2082 * path. Before creating a new entry, we need to mark the
2083 * old one as unnecessary (...unless it is shared by
2084 * src_entry, i.e. this didn't use to be a rename, in which
2085 * case we can just allow the normal processing to happen
2088 if (pair
->status
== 'R')
2089 re
->dst_entry
->processed
= 1;
2091 re
->dst_entry
= insert_stage_data(new_path
,
2092 o_tree
, a_tree
, b_tree
,
2094 item
= string_list_insert(entries
, new_path
);
2095 item
->util
= re
->dst_entry
;
2099 * Update the stage_data with the information about the path we are
2100 * moving into place. That slot will be empty and available for us
2101 * to write to because of the collision checks in
2102 * handle_path_level_conflicts(). In other words,
2103 * re->dst_entry->stages[stage].oid will be the null_oid, so it's
2104 * open for us to write to.
2106 * It may be tempting to actually update the index at this point as
2107 * well, using update_stages_for_stage_data(), but as per the big
2108 * "NOTE" in update_stages(), doing so will modify the current
2109 * in-memory index which will break calls to would_lose_untracked()
2110 * that we need to make. Instead, we need to just make sure that
2111 * the various conflict_rename_*() functions update the index
2112 * explicitly rather than relying on unpack_trees() to have done it.
2114 get_tree_entry(tree
->object
.oid
.hash
,
2116 re
->dst_entry
->stages
[stage
].oid
.hash
,
2117 &re
->dst_entry
->stages
[stage
].mode
);
2119 /* Update pair status */
2120 if (pair
->status
== 'A') {
2122 * Recording rename information for this add makes it look
2123 * like a rename/delete conflict. Make sure we can
2124 * correctly handle this as an add that was moved to a new
2125 * directory instead of reporting a rename/delete conflict.
2127 re
->add_turned_into_rename
= 1;
2130 * We don't actually look at pair->status again, but it seems
2131 * pedagogically correct to adjust it.
2136 * Finally, record the new location.
2138 pair
->two
->path
= new_path
;
2142 * Get information of all renames which occurred in 'pairs', making use of
2143 * any implicit directory renames inferred from the other side of history.
2144 * We need the three trees in the merge ('o_tree', 'a_tree' and 'b_tree')
2145 * to be able to associate the correct cache entries with the rename
2146 * information; tree is always equal to either a_tree or b_tree.
2148 static struct string_list
*get_renames(struct merge_options
*o
,
2149 struct diff_queue_struct
*pairs
,
2150 struct hashmap
*dir_renames
,
2151 struct hashmap
*dir_rename_exclusions
,
2153 struct tree
*o_tree
,
2154 struct tree
*a_tree
,
2155 struct tree
*b_tree
,
2156 struct string_list
*entries
,
2160 struct hashmap collisions
;
2161 struct hashmap_iter iter
;
2162 struct collision_entry
*e
;
2163 struct string_list
*renames
;
2165 compute_collisions(&collisions
, dir_renames
, pairs
);
2166 renames
= xcalloc(1, sizeof(struct string_list
));
2168 for (i
= 0; i
< pairs
->nr
; ++i
) {
2169 struct string_list_item
*item
;
2171 struct diff_filepair
*pair
= pairs
->queue
[i
];
2172 char *new_path
; /* non-NULL only with directory renames */
2174 if (pair
->status
== 'D') {
2175 diff_free_filepair(pair
);
2178 new_path
= check_for_directory_rename(o
, pair
->two
->path
, tree
,
2180 dir_rename_exclusions
,
2183 if (pair
->status
!= 'R' && !new_path
) {
2184 diff_free_filepair(pair
);
2188 re
= xmalloc(sizeof(*re
));
2190 re
->add_turned_into_rename
= 0;
2192 item
= string_list_lookup(entries
, re
->pair
->one
->path
);
2194 re
->src_entry
= insert_stage_data(re
->pair
->one
->path
,
2195 o_tree
, a_tree
, b_tree
, entries
);
2197 re
->src_entry
= item
->util
;
2199 item
= string_list_lookup(entries
, re
->pair
->two
->path
);
2201 re
->dst_entry
= insert_stage_data(re
->pair
->two
->path
,
2202 o_tree
, a_tree
, b_tree
, entries
);
2204 re
->dst_entry
= item
->util
;
2205 item
= string_list_insert(renames
, pair
->one
->path
);
2208 apply_directory_rename_modifications(o
, pair
, new_path
,
2215 hashmap_iter_init(&collisions
, &iter
);
2216 while ((e
= hashmap_iter_next(&iter
))) {
2217 free(e
->target_file
);
2218 string_list_clear(&e
->source_files
, 0);
2220 hashmap_free(&collisions
, 1);
2224 static int process_renames(struct merge_options
*o
,
2225 struct string_list
*a_renames
,
2226 struct string_list
*b_renames
)
2228 int clean_merge
= 1, i
, j
;
2229 struct string_list a_by_dst
= STRING_LIST_INIT_NODUP
;
2230 struct string_list b_by_dst
= STRING_LIST_INIT_NODUP
;
2231 const struct rename
*sre
;
2233 for (i
= 0; i
< a_renames
->nr
; i
++) {
2234 sre
= a_renames
->items
[i
].util
;
2235 string_list_insert(&a_by_dst
, sre
->pair
->two
->path
)->util
2238 for (i
= 0; i
< b_renames
->nr
; i
++) {
2239 sre
= b_renames
->items
[i
].util
;
2240 string_list_insert(&b_by_dst
, sre
->pair
->two
->path
)->util
2244 for (i
= 0, j
= 0; i
< a_renames
->nr
|| j
< b_renames
->nr
;) {
2245 struct string_list
*renames1
, *renames2Dst
;
2246 struct rename
*ren1
= NULL
, *ren2
= NULL
;
2247 const char *branch1
, *branch2
;
2248 const char *ren1_src
, *ren1_dst
;
2249 struct string_list_item
*lookup
;
2251 if (i
>= a_renames
->nr
) {
2252 ren2
= b_renames
->items
[j
++].util
;
2253 } else if (j
>= b_renames
->nr
) {
2254 ren1
= a_renames
->items
[i
++].util
;
2256 int compare
= strcmp(a_renames
->items
[i
].string
,
2257 b_renames
->items
[j
].string
);
2259 ren1
= a_renames
->items
[i
++].util
;
2261 ren2
= b_renames
->items
[j
++].util
;
2264 /* TODO: refactor, so that 1/2 are not needed */
2266 renames1
= a_renames
;
2267 renames2Dst
= &b_by_dst
;
2268 branch1
= o
->branch1
;
2269 branch2
= o
->branch2
;
2271 renames1
= b_renames
;
2272 renames2Dst
= &a_by_dst
;
2273 branch1
= o
->branch2
;
2274 branch2
= o
->branch1
;
2278 if (ren1
->processed
)
2280 ren1
->processed
= 1;
2281 ren1
->dst_entry
->processed
= 1;
2282 /* BUG: We should only mark src_entry as processed if we
2283 * are not dealing with a rename + add-source case.
2285 ren1
->src_entry
->processed
= 1;
2287 ren1_src
= ren1
->pair
->one
->path
;
2288 ren1_dst
= ren1
->pair
->two
->path
;
2291 /* One file renamed on both sides */
2292 const char *ren2_src
= ren2
->pair
->one
->path
;
2293 const char *ren2_dst
= ren2
->pair
->two
->path
;
2294 enum rename_type rename_type
;
2295 if (strcmp(ren1_src
, ren2_src
) != 0)
2296 die("BUG: ren1_src != ren2_src");
2297 ren2
->dst_entry
->processed
= 1;
2298 ren2
->processed
= 1;
2299 if (strcmp(ren1_dst
, ren2_dst
) != 0) {
2300 rename_type
= RENAME_ONE_FILE_TO_TWO
;
2303 rename_type
= RENAME_ONE_FILE_TO_ONE
;
2304 /* BUG: We should only remove ren1_src in
2305 * the base stage (think of rename +
2306 * add-source cases).
2308 remove_file(o
, 1, ren1_src
, 1);
2309 update_entry(ren1
->dst_entry
,
2314 setup_rename_conflict_info(rename_type
,
2324 } else if ((lookup
= string_list_lookup(renames2Dst
, ren1_dst
))) {
2325 /* Two different files renamed to the same thing */
2327 ren2
= lookup
->util
;
2328 ren2_dst
= ren2
->pair
->two
->path
;
2329 if (strcmp(ren1_dst
, ren2_dst
) != 0)
2330 die("BUG: ren1_dst != ren2_dst");
2333 ren2
->processed
= 1;
2335 * BUG: We should only mark src_entry as processed
2336 * if we are not dealing with a rename + add-source
2339 ren2
->src_entry
->processed
= 1;
2341 setup_rename_conflict_info(RENAME_TWO_FILES_TO_ONE
,
2353 /* Renamed in 1, maybe changed in 2 */
2354 /* we only use sha1 and mode of these */
2355 struct diff_filespec src_other
, dst_other
;
2359 * unpack_trees loads entries from common-commit
2360 * into stage 1, from head-commit into stage 2, and
2361 * from merge-commit into stage 3. We keep track
2362 * of which side corresponds to the rename.
2364 int renamed_stage
= a_renames
== renames1
? 2 : 3;
2365 int other_stage
= a_renames
== renames1
? 3 : 2;
2367 /* BUG: We should only remove ren1_src in the base
2368 * stage and in other_stage (think of rename +
2371 remove_file(o
, 1, ren1_src
,
2372 renamed_stage
== 2 || !was_tracked(ren1_src
));
2374 oidcpy(&src_other
.oid
,
2375 &ren1
->src_entry
->stages
[other_stage
].oid
);
2376 src_other
.mode
= ren1
->src_entry
->stages
[other_stage
].mode
;
2377 oidcpy(&dst_other
.oid
,
2378 &ren1
->dst_entry
->stages
[other_stage
].oid
);
2379 dst_other
.mode
= ren1
->dst_entry
->stages
[other_stage
].mode
;
2382 if (oid_eq(&src_other
.oid
, &null_oid
) &&
2383 ren1
->add_turned_into_rename
) {
2384 setup_rename_conflict_info(RENAME_DIR
,
2394 } else if (oid_eq(&src_other
.oid
, &null_oid
)) {
2395 setup_rename_conflict_info(RENAME_DELETE
,
2405 } else if ((dst_other
.mode
== ren1
->pair
->two
->mode
) &&
2406 oid_eq(&dst_other
.oid
, &ren1
->pair
->two
->oid
)) {
2408 * Added file on the other side identical to
2409 * the file being renamed: clean merge.
2410 * Also, there is no need to overwrite the
2411 * file already in the working copy, so call
2412 * update_file_flags() instead of
2415 if (update_file_flags(o
,
2416 &ren1
->pair
->two
->oid
,
2417 ren1
->pair
->two
->mode
,
2419 1, /* update_cache */
2422 } else if (!oid_eq(&dst_other
.oid
, &null_oid
)) {
2425 output(o
, 1, _("CONFLICT (rename/add): Rename %s->%s in %s. "
2427 ren1_src
, ren1_dst
, branch1
,
2429 if (o
->call_depth
) {
2430 struct merge_file_info mfi
;
2431 if (merge_file_one(o
, ren1_dst
, &null_oid
, 0,
2432 &ren1
->pair
->two
->oid
,
2433 ren1
->pair
->two
->mode
,
2436 branch1
, branch2
, &mfi
)) {
2438 goto cleanup_and_return
;
2440 output(o
, 1, _("Adding merged %s"), ren1_dst
);
2441 if (update_file(o
, 0, &mfi
.oid
,
2442 mfi
.mode
, ren1_dst
))
2446 char *new_path
= unique_path(o
, ren1_dst
, branch2
);
2447 output(o
, 1, _("Adding as %s instead"), new_path
);
2448 if (update_file(o
, 0, &dst_other
.oid
,
2449 dst_other
.mode
, new_path
))
2456 if (clean_merge
< 0)
2457 goto cleanup_and_return
;
2459 struct diff_filespec
*one
, *a
, *b
;
2460 src_other
.path
= (char *)ren1_src
;
2462 one
= ren1
->pair
->one
;
2463 if (a_renames
== renames1
) {
2464 a
= ren1
->pair
->two
;
2467 b
= ren1
->pair
->two
;
2470 update_entry(ren1
->dst_entry
, one
, a
, b
);
2471 setup_rename_conflict_info(RENAME_NORMAL
,
2485 string_list_clear(&a_by_dst
, 0);
2486 string_list_clear(&b_by_dst
, 0);
2491 struct rename_info
{
2492 struct string_list
*head_renames
;
2493 struct string_list
*merge_renames
;
2496 static void initial_cleanup_rename(struct diff_queue_struct
*pairs
,
2497 struct hashmap
*dir_renames
)
2499 struct hashmap_iter iter
;
2500 struct dir_rename_entry
*e
;
2502 hashmap_iter_init(dir_renames
, &iter
);
2503 while ((e
= hashmap_iter_next(&iter
))) {
2505 strbuf_release(&e
->new_dir
);
2506 /* possible_new_dirs already cleared in get_directory_renames */
2508 hashmap_free(dir_renames
, 1);
2515 static int handle_renames(struct merge_options
*o
,
2516 struct tree
*common
,
2519 struct string_list
*entries
,
2520 struct rename_info
*ri
)
2522 struct diff_queue_struct
*head_pairs
, *merge_pairs
;
2523 struct hashmap
*dir_re_head
, *dir_re_merge
;
2526 ri
->head_renames
= NULL
;
2527 ri
->merge_renames
= NULL
;
2529 if (!o
->detect_rename
)
2532 head_pairs
= get_diffpairs(o
, common
, head
);
2533 merge_pairs
= get_diffpairs(o
, common
, merge
);
2535 dir_re_head
= get_directory_renames(head_pairs
, head
);
2536 dir_re_merge
= get_directory_renames(merge_pairs
, merge
);
2538 handle_directory_level_conflicts(o
,
2540 dir_re_merge
, merge
);
2542 ri
->head_renames
= get_renames(o
, head_pairs
,
2543 dir_re_merge
, dir_re_head
, head
,
2544 common
, head
, merge
, entries
,
2548 ri
->merge_renames
= get_renames(o
, merge_pairs
,
2549 dir_re_head
, dir_re_merge
, merge
,
2550 common
, head
, merge
, entries
,
2554 clean
&= process_renames(o
, ri
->head_renames
, ri
->merge_renames
);
2558 * Some cleanup is deferred until cleanup_renames() because the
2559 * data structures are still needed and referenced in
2560 * process_entry(). But there are a few things we can free now.
2562 initial_cleanup_rename(head_pairs
, dir_re_head
);
2563 initial_cleanup_rename(merge_pairs
, dir_re_merge
);
2568 static void final_cleanup_rename(struct string_list
*rename
)
2570 const struct rename
*re
;
2576 for (i
= 0; i
< rename
->nr
; i
++) {
2577 re
= rename
->items
[i
].util
;
2578 diff_free_filepair(re
->pair
);
2580 string_list_clear(rename
, 1);
2584 static void final_cleanup_renames(struct rename_info
*re_info
)
2586 final_cleanup_rename(re_info
->head_renames
);
2587 final_cleanup_rename(re_info
->merge_renames
);
2590 static struct object_id
*stage_oid(const struct object_id
*oid
, unsigned mode
)
2592 return (is_null_oid(oid
) || mode
== 0) ? NULL
: (struct object_id
*)oid
;
2595 static int read_oid_strbuf(struct merge_options
*o
,
2596 const struct object_id
*oid
, struct strbuf
*dst
)
2599 enum object_type type
;
2601 buf
= read_sha1_file(oid
->hash
, &type
, &size
);
2603 return err(o
, _("cannot read object %s"), oid_to_hex(oid
));
2604 if (type
!= OBJ_BLOB
) {
2606 return err(o
, _("object %s is not a blob"), oid_to_hex(oid
));
2608 strbuf_attach(dst
, buf
, size
, size
+ 1);
2612 static int blob_unchanged(struct merge_options
*opt
,
2613 const struct object_id
*o_oid
,
2615 const struct object_id
*a_oid
,
2617 int renormalize
, const char *path
)
2619 struct strbuf o
= STRBUF_INIT
;
2620 struct strbuf a
= STRBUF_INIT
;
2621 int ret
= 0; /* assume changed for safety */
2623 if (a_mode
!= o_mode
)
2625 if (oid_eq(o_oid
, a_oid
))
2630 assert(o_oid
&& a_oid
);
2631 if (read_oid_strbuf(opt
, o_oid
, &o
) || read_oid_strbuf(opt
, a_oid
, &a
))
2634 * Note: binary | is used so that both renormalizations are
2635 * performed. Comparison can be skipped if both files are
2636 * unchanged since their sha1s have already been compared.
2638 if (renormalize_buffer(&the_index
, path
, o
.buf
, o
.len
, &o
) |
2639 renormalize_buffer(&the_index
, path
, a
.buf
, a
.len
, &a
))
2640 ret
= (o
.len
== a
.len
&& !memcmp(o
.buf
, a
.buf
, o
.len
));
2648 static int handle_modify_delete(struct merge_options
*o
,
2650 struct object_id
*o_oid
, int o_mode
,
2651 struct object_id
*a_oid
, int a_mode
,
2652 struct object_id
*b_oid
, int b_mode
)
2654 const char *modify_branch
, *delete_branch
;
2655 struct object_id
*changed_oid
;
2659 modify_branch
= o
->branch1
;
2660 delete_branch
= o
->branch2
;
2661 changed_oid
= a_oid
;
2662 changed_mode
= a_mode
;
2664 modify_branch
= o
->branch2
;
2665 delete_branch
= o
->branch1
;
2666 changed_oid
= b_oid
;
2667 changed_mode
= b_mode
;
2670 return handle_change_delete(o
,
2673 changed_oid
, changed_mode
,
2674 modify_branch
, delete_branch
,
2675 _("modify"), _("modified"));
2678 static int merge_content(struct merge_options
*o
,
2680 struct object_id
*o_oid
, int o_mode
,
2681 struct object_id
*a_oid
, int a_mode
,
2682 struct object_id
*b_oid
, int b_mode
,
2683 struct rename_conflict_info
*rename_conflict_info
)
2685 const char *reason
= _("content");
2686 const char *path1
= NULL
, *path2
= NULL
;
2687 struct merge_file_info mfi
;
2688 struct diff_filespec one
, a
, b
;
2689 unsigned df_conflict_remains
= 0;
2692 reason
= _("add/add");
2693 o_oid
= (struct object_id
*)&null_oid
;
2695 one
.path
= a
.path
= b
.path
= (char *)path
;
2696 oidcpy(&one
.oid
, o_oid
);
2698 oidcpy(&a
.oid
, a_oid
);
2700 oidcpy(&b
.oid
, b_oid
);
2703 if (rename_conflict_info
) {
2704 struct diff_filepair
*pair1
= rename_conflict_info
->pair1
;
2706 path1
= (o
->branch1
== rename_conflict_info
->branch1
) ?
2707 pair1
->two
->path
: pair1
->one
->path
;
2708 /* If rename_conflict_info->pair2 != NULL, we are in
2709 * RENAME_ONE_FILE_TO_ONE case. Otherwise, we have a
2712 path2
= (rename_conflict_info
->pair2
||
2713 o
->branch2
== rename_conflict_info
->branch1
) ?
2714 pair1
->two
->path
: pair1
->one
->path
;
2716 if (dir_in_way(path
, !o
->call_depth
,
2717 S_ISGITLINK(pair1
->two
->mode
)))
2718 df_conflict_remains
= 1;
2720 if (merge_file_special_markers(o
, &one
, &a
, &b
,
2722 o
->branch2
, path2
, &mfi
))
2725 if (mfi
.clean
&& !df_conflict_remains
&&
2726 oid_eq(&mfi
.oid
, a_oid
) && mfi
.mode
== a_mode
) {
2727 int path_renamed_outside_HEAD
;
2728 output(o
, 3, _("Skipped %s (merged same as existing)"), path
);
2730 * The content merge resulted in the same file contents we
2731 * already had. We can return early if those file contents
2732 * are recorded at the correct path (which may not be true
2733 * if the merge involves a rename).
2735 path_renamed_outside_HEAD
= !path2
|| !strcmp(path
, path2
);
2736 if (!path_renamed_outside_HEAD
) {
2737 add_cacheinfo(o
, mfi
.mode
, &mfi
.oid
, path
,
2738 0, (!o
->call_depth
), 0);
2742 output(o
, 2, _("Auto-merging %s"), path
);
2745 if (S_ISGITLINK(mfi
.mode
))
2746 reason
= _("submodule");
2747 output(o
, 1, _("CONFLICT (%s): Merge conflict in %s"),
2749 if (rename_conflict_info
&& !df_conflict_remains
)
2750 if (update_stages(o
, path
, &one
, &a
, &b
))
2754 if (df_conflict_remains
) {
2756 if (o
->call_depth
) {
2757 remove_file_from_cache(path
);
2760 if (update_stages(o
, path
, &one
, &a
, &b
))
2763 int file_from_stage2
= was_tracked(path
);
2764 struct diff_filespec merged
;
2765 oidcpy(&merged
.oid
, &mfi
.oid
);
2766 merged
.mode
= mfi
.mode
;
2768 if (update_stages(o
, path
, NULL
,
2769 file_from_stage2
? &merged
: NULL
,
2770 file_from_stage2
? NULL
: &merged
))
2775 new_path
= unique_path(o
, path
, rename_conflict_info
->branch1
);
2776 output(o
, 1, _("Adding as %s instead"), new_path
);
2777 if (update_file(o
, 0, &mfi
.oid
, mfi
.mode
, new_path
)) {
2783 } else if (update_file(o
, mfi
.clean
, &mfi
.oid
, mfi
.mode
, path
))
2788 /* Per entry merge function */
2789 static int process_entry(struct merge_options
*o
,
2790 const char *path
, struct stage_data
*entry
)
2792 int clean_merge
= 1;
2793 int normalize
= o
->renormalize
;
2794 unsigned o_mode
= entry
->stages
[1].mode
;
2795 unsigned a_mode
= entry
->stages
[2].mode
;
2796 unsigned b_mode
= entry
->stages
[3].mode
;
2797 struct object_id
*o_oid
= stage_oid(&entry
->stages
[1].oid
, o_mode
);
2798 struct object_id
*a_oid
= stage_oid(&entry
->stages
[2].oid
, a_mode
);
2799 struct object_id
*b_oid
= stage_oid(&entry
->stages
[3].oid
, b_mode
);
2801 entry
->processed
= 1;
2802 if (entry
->rename_conflict_info
) {
2803 struct rename_conflict_info
*conflict_info
= entry
->rename_conflict_info
;
2804 switch (conflict_info
->rename_type
) {
2806 case RENAME_ONE_FILE_TO_ONE
:
2807 clean_merge
= merge_content(o
, path
,
2808 o_oid
, o_mode
, a_oid
, a_mode
, b_oid
, b_mode
,
2813 if (conflict_rename_dir(o
,
2814 conflict_info
->pair1
,
2815 conflict_info
->branch1
,
2816 conflict_info
->branch2
))
2821 if (conflict_rename_delete(o
,
2822 conflict_info
->pair1
,
2823 conflict_info
->branch1
,
2824 conflict_info
->branch2
))
2827 case RENAME_ONE_FILE_TO_TWO
:
2829 if (conflict_rename_rename_1to2(o
, conflict_info
))
2832 case RENAME_TWO_FILES_TO_ONE
:
2834 if (conflict_rename_rename_2to1(o
, conflict_info
))
2838 entry
->processed
= 0;
2841 } else if (o_oid
&& (!a_oid
|| !b_oid
)) {
2842 /* Case A: Deleted in one */
2843 if ((!a_oid
&& !b_oid
) ||
2844 (!b_oid
&& blob_unchanged(o
, o_oid
, o_mode
, a_oid
, a_mode
, normalize
, path
)) ||
2845 (!a_oid
&& blob_unchanged(o
, o_oid
, o_mode
, b_oid
, b_mode
, normalize
, path
))) {
2846 /* Deleted in both or deleted in one and
2847 * unchanged in the other */
2849 output(o
, 2, _("Removing %s"), path
);
2850 /* do not touch working file if it did not exist */
2851 remove_file(o
, 1, path
, !a_oid
);
2853 /* Modify/delete; deleted side may have put a directory in the way */
2855 if (handle_modify_delete(o
, path
, o_oid
, o_mode
,
2856 a_oid
, a_mode
, b_oid
, b_mode
))
2859 } else if ((!o_oid
&& a_oid
&& !b_oid
) ||
2860 (!o_oid
&& !a_oid
&& b_oid
)) {
2861 /* Case B: Added in one. */
2862 /* [nothing|directory] -> ([nothing|directory], file) */
2864 const char *add_branch
;
2865 const char *other_branch
;
2867 const struct object_id
*oid
;
2871 add_branch
= o
->branch1
;
2872 other_branch
= o
->branch2
;
2875 conf
= _("file/directory");
2877 add_branch
= o
->branch2
;
2878 other_branch
= o
->branch1
;
2881 conf
= _("directory/file");
2883 if (dir_in_way(path
,
2884 !o
->call_depth
&& !S_ISGITLINK(a_mode
),
2886 char *new_path
= unique_path(o
, path
, add_branch
);
2888 output(o
, 1, _("CONFLICT (%s): There is a directory with name %s in %s. "
2890 conf
, path
, other_branch
, path
, new_path
);
2891 if (update_file(o
, 0, oid
, mode
, new_path
))
2893 else if (o
->call_depth
)
2894 remove_file_from_cache(path
);
2897 output(o
, 2, _("Adding %s"), path
);
2898 /* do not overwrite file if already present */
2899 if (update_file_flags(o
, oid
, mode
, path
, 1, !a_oid
))
2902 } else if (a_oid
&& b_oid
) {
2903 /* Case C: Added in both (check for same permissions) and */
2904 /* case D: Modified in both, but differently. */
2905 clean_merge
= merge_content(o
, path
,
2906 o_oid
, o_mode
, a_oid
, a_mode
, b_oid
, b_mode
,
2908 } else if (!o_oid
&& !a_oid
&& !b_oid
) {
2910 * this entry was deleted altogether. a_mode == 0 means
2911 * we had that path and want to actively remove it.
2913 remove_file(o
, 1, path
, !a_mode
);
2915 die("BUG: fatal merge failure, shouldn't happen.");
2920 int merge_trees(struct merge_options
*o
,
2923 struct tree
*common
,
2924 struct tree
**result
)
2928 if (o
->subtree_shift
) {
2929 merge
= shift_tree_object(head
, merge
, o
->subtree_shift
);
2930 common
= shift_tree_object(head
, common
, o
->subtree_shift
);
2933 if (oid_eq(&common
->object
.oid
, &merge
->object
.oid
)) {
2934 struct strbuf sb
= STRBUF_INIT
;
2936 if (!o
->call_depth
&& index_has_changes(&sb
)) {
2937 err(o
, _("Dirty index: cannot merge (dirty: %s)"),
2941 output(o
, 0, _("Already up to date!"));
2946 code
= git_merge_trees(o
->call_depth
, common
, head
, merge
);
2949 if (show(o
, 4) || o
->call_depth
)
2950 err(o
, _("merging of trees %s and %s failed"),
2951 oid_to_hex(&head
->object
.oid
),
2952 oid_to_hex(&merge
->object
.oid
));
2956 if (unmerged_cache()) {
2957 struct string_list
*entries
;
2958 struct rename_info re_info
;
2961 * Only need the hashmap while processing entries, so
2962 * initialize it here and free it when we are done running
2963 * through the entries. Keeping it in the merge_options as
2964 * opposed to decaring a local hashmap is for convenience
2965 * so that we don't have to pass it to around.
2967 hashmap_init(&o
->current_file_dir_set
, path_hashmap_cmp
, NULL
, 512);
2968 get_files_dirs(o
, head
);
2969 get_files_dirs(o
, merge
);
2971 entries
= get_unmerged();
2972 clean
= handle_renames(o
, common
, head
, merge
, entries
,
2974 record_df_conflict_files(o
, entries
);
2977 for (i
= entries
->nr
-1; 0 <= i
; i
--) {
2978 const char *path
= entries
->items
[i
].string
;
2979 struct stage_data
*e
= entries
->items
[i
].util
;
2980 if (!e
->processed
) {
2981 int ret
= process_entry(o
, path
, e
);
2990 for (i
= 0; i
< entries
->nr
; i
++) {
2991 struct stage_data
*e
= entries
->items
[i
].util
;
2993 die("BUG: unprocessed path??? %s",
2994 entries
->items
[i
].string
);
2998 final_cleanup_renames(&re_info
);
3000 string_list_clear(entries
, 1);
3003 hashmap_free(&o
->current_file_dir_set
, 1);
3011 if (o
->call_depth
&& !(*result
= write_tree_from_memory(o
)))
3017 static struct commit_list
*reverse_commit_list(struct commit_list
*list
)
3019 struct commit_list
*next
= NULL
, *current
, *backup
;
3020 for (current
= list
; current
; current
= backup
) {
3021 backup
= current
->next
;
3022 current
->next
= next
;
3029 * Merge the commits h1 and h2, return the resulting virtual
3030 * commit object and a flag indicating the cleanness of the merge.
3032 int merge_recursive(struct merge_options
*o
,
3035 struct commit_list
*ca
,
3036 struct commit
**result
)
3038 struct commit_list
*iter
;
3039 struct commit
*merged_common_ancestors
;
3040 struct tree
*mrtree
= mrtree
;
3044 output(o
, 4, _("Merging:"));
3045 output_commit_title(o
, h1
);
3046 output_commit_title(o
, h2
);
3050 ca
= get_merge_bases(h1
, h2
);
3051 ca
= reverse_commit_list(ca
);
3055 unsigned cnt
= commit_list_count(ca
);
3057 output(o
, 5, Q_("found %u common ancestor:",
3058 "found %u common ancestors:", cnt
), cnt
);
3059 for (iter
= ca
; iter
; iter
= iter
->next
)
3060 output_commit_title(o
, iter
->item
);
3063 merged_common_ancestors
= pop_commit(&ca
);
3064 if (merged_common_ancestors
== NULL
) {
3065 /* if there is no common ancestor, use an empty tree */
3068 tree
= lookup_tree(the_hash_algo
->empty_tree
);
3069 merged_common_ancestors
= make_virtual_commit(tree
, "ancestor");
3072 for (iter
= ca
; iter
; iter
= iter
->next
) {
3073 const char *saved_b1
, *saved_b2
;
3076 * When the merge fails, the result contains files
3077 * with conflict markers. The cleanness flag is
3078 * ignored (unless indicating an error), it was never
3079 * actually used, as result of merge_trees has always
3080 * overwritten it: the committed "conflicts" were
3084 saved_b1
= o
->branch1
;
3085 saved_b2
= o
->branch2
;
3086 o
->branch1
= "Temporary merge branch 1";
3087 o
->branch2
= "Temporary merge branch 2";
3088 if (merge_recursive(o
, merged_common_ancestors
, iter
->item
,
3089 NULL
, &merged_common_ancestors
) < 0)
3091 o
->branch1
= saved_b1
;
3092 o
->branch2
= saved_b2
;
3095 if (!merged_common_ancestors
)
3096 return err(o
, _("merge returned no commit"));
3103 o
->ancestor
= "merged common ancestors";
3104 clean
= merge_trees(o
, h1
->tree
, h2
->tree
, merged_common_ancestors
->tree
,
3111 if (o
->call_depth
) {
3112 *result
= make_virtual_commit(mrtree
, "merged tree");
3113 commit_list_insert(h1
, &(*result
)->parents
);
3114 commit_list_insert(h2
, &(*result
)->parents
->next
);
3117 if (!o
->call_depth
&& o
->buffer_output
< 2)
3118 strbuf_release(&o
->obuf
);
3120 diff_warn_rename_limit("merge.renamelimit",
3121 o
->needed_rename_limit
, 0);
3125 static struct commit
*get_ref(const struct object_id
*oid
, const char *name
)
3127 struct object
*object
;
3129 object
= deref_tag(parse_object(oid
), name
, strlen(name
));
3132 if (object
->type
== OBJ_TREE
)
3133 return make_virtual_commit((struct tree
*)object
, name
);
3134 if (object
->type
!= OBJ_COMMIT
)
3136 if (parse_commit((struct commit
*)object
))
3138 return (struct commit
*)object
;
3141 int merge_recursive_generic(struct merge_options
*o
,
3142 const struct object_id
*head
,
3143 const struct object_id
*merge
,
3145 const struct object_id
**base_list
,
3146 struct commit
**result
)
3149 struct lock_file lock
= LOCK_INIT
;
3150 struct commit
*head_commit
= get_ref(head
, o
->branch1
);
3151 struct commit
*next_commit
= get_ref(merge
, o
->branch2
);
3152 struct commit_list
*ca
= NULL
;
3156 for (i
= 0; i
< num_base_list
; ++i
) {
3157 struct commit
*base
;
3158 if (!(base
= get_ref(base_list
[i
], oid_to_hex(base_list
[i
]))))
3159 return err(o
, _("Could not parse object '%s'"),
3160 oid_to_hex(base_list
[i
]));
3161 commit_list_insert(base
, &ca
);
3165 hold_locked_index(&lock
, LOCK_DIE_ON_ERROR
);
3166 clean
= merge_recursive(o
, head_commit
, next_commit
, ca
,
3171 if (active_cache_changed
&&
3172 write_locked_index(&the_index
, &lock
, COMMIT_LOCK
))
3173 return err(o
, _("Unable to write index."));
3175 return clean
? 0 : 1;
3178 static void merge_recursive_config(struct merge_options
*o
)
3180 git_config_get_int("merge.verbosity", &o
->verbosity
);
3181 git_config_get_int("diff.renamelimit", &o
->diff_rename_limit
);
3182 git_config_get_int("merge.renamelimit", &o
->merge_rename_limit
);
3183 git_config(git_xmerge_config
, NULL
);
3186 void init_merge_options(struct merge_options
*o
)
3188 const char *merge_verbosity
;
3189 memset(o
, 0, sizeof(struct merge_options
));
3191 o
->buffer_output
= 1;
3192 o
->diff_rename_limit
= -1;
3193 o
->merge_rename_limit
= -1;
3195 o
->detect_rename
= 1;
3196 merge_recursive_config(o
);
3197 merge_verbosity
= getenv("GIT_MERGE_VERBOSITY");
3198 if (merge_verbosity
)
3199 o
->verbosity
= strtol(merge_verbosity
, NULL
, 10);
3200 if (o
->verbosity
>= 5)
3201 o
->buffer_output
= 0;
3202 strbuf_init(&o
->obuf
, 0);
3203 string_list_init(&o
->df_conflict_file_set
, 1);
3206 int parse_merge_opt(struct merge_options
*o
, const char *s
)
3212 if (!strcmp(s
, "ours"))
3213 o
->recursive_variant
= MERGE_RECURSIVE_OURS
;
3214 else if (!strcmp(s
, "theirs"))
3215 o
->recursive_variant
= MERGE_RECURSIVE_THEIRS
;
3216 else if (!strcmp(s
, "subtree"))
3217 o
->subtree_shift
= "";
3218 else if (skip_prefix(s
, "subtree=", &arg
))
3219 o
->subtree_shift
= arg
;
3220 else if (!strcmp(s
, "patience"))
3221 o
->xdl_opts
= DIFF_WITH_ALG(o
, PATIENCE_DIFF
);
3222 else if (!strcmp(s
, "histogram"))
3223 o
->xdl_opts
= DIFF_WITH_ALG(o
, HISTOGRAM_DIFF
);
3224 else if (skip_prefix(s
, "diff-algorithm=", &arg
)) {
3225 long value
= parse_algorithm_value(arg
);
3228 /* clear out previous settings */
3229 DIFF_XDL_CLR(o
, NEED_MINIMAL
);
3230 o
->xdl_opts
&= ~XDF_DIFF_ALGORITHM_MASK
;
3231 o
->xdl_opts
|= value
;
3233 else if (!strcmp(s
, "ignore-space-change"))
3234 DIFF_XDL_SET(o
, IGNORE_WHITESPACE_CHANGE
);
3235 else if (!strcmp(s
, "ignore-all-space"))
3236 DIFF_XDL_SET(o
, IGNORE_WHITESPACE
);
3237 else if (!strcmp(s
, "ignore-space-at-eol"))
3238 DIFF_XDL_SET(o
, IGNORE_WHITESPACE_AT_EOL
);
3239 else if (!strcmp(s
, "ignore-cr-at-eol"))
3240 DIFF_XDL_SET(o
, IGNORE_CR_AT_EOL
);
3241 else if (!strcmp(s
, "renormalize"))
3243 else if (!strcmp(s
, "no-renormalize"))
3245 else if (!strcmp(s
, "no-renames"))
3246 o
->detect_rename
= 0;
3247 else if (!strcmp(s
, "find-renames")) {
3248 o
->detect_rename
= 1;
3249 o
->rename_score
= 0;
3251 else if (skip_prefix(s
, "find-renames=", &arg
) ||
3252 skip_prefix(s
, "rename-threshold=", &arg
)) {
3253 if ((o
->rename_score
= parse_rename_score(&arg
)) == -1 || *arg
!= 0)
3255 o
->detect_rename
= 1;