2 * Recursive Merge algorithm stolen from git-merge-recursive.py by
4 * The thieves were Alex Riesen and Johannes Schindelin, in June/July 2006
7 #include "merge-recursive.h"
14 #include "cache-tree.h"
16 #include "commit-reach.h"
23 #include "object-store.h"
24 #include "repository.h"
26 #include "string-list.h"
27 #include "submodule.h"
29 #include "tree-walk.h"
30 #include "unpack-trees.h"
31 #include "xdiff-interface.h"
33 struct merge_options_internal
{
35 int needed_rename_limit
;
36 struct hashmap current_file_dir_set
;
37 struct string_list df_conflict_file_set
;
38 struct unpack_trees_options unpack_opts
;
39 struct index_state orig_index
;
42 struct path_hashmap_entry
{
43 struct hashmap_entry e
;
44 char path
[FLEX_ARRAY
];
47 static int path_hashmap_cmp(const void *cmp_data
,
48 const struct hashmap_entry
*eptr
,
49 const struct hashmap_entry
*entry_or_key
,
52 const struct path_hashmap_entry
*a
, *b
;
53 const char *key
= keydata
;
55 a
= container_of(eptr
, const struct path_hashmap_entry
, e
);
56 b
= container_of(entry_or_key
, const struct path_hashmap_entry
, e
);
59 return strcasecmp(a
->path
, key
? key
: b
->path
);
61 return strcmp(a
->path
, key
? key
: b
->path
);
64 static unsigned int path_hash(const char *path
)
66 return ignore_case
? strihash(path
) : strhash(path
);
70 * For dir_rename_entry, directory names are stored as a full path from the
71 * toplevel of the repository and do not include a trailing '/'. Also:
73 * dir: original name of directory being renamed
74 * non_unique_new_dir: if true, could not determine new_dir
75 * new_dir: final name of directory being renamed
76 * possible_new_dirs: temporary used to help determine new_dir; see comments
77 * in get_directory_renames() for details
79 struct dir_rename_entry
{
80 struct hashmap_entry ent
;
82 unsigned non_unique_new_dir
:1;
83 struct strbuf new_dir
;
84 struct string_list possible_new_dirs
;
87 static struct dir_rename_entry
*dir_rename_find_entry(struct hashmap
*hashmap
,
90 struct dir_rename_entry key
;
94 hashmap_entry_init(&key
.ent
, strhash(dir
));
96 return hashmap_get_entry(hashmap
, &key
, ent
, NULL
);
99 static int dir_rename_cmp(const void *unused_cmp_data
,
100 const struct hashmap_entry
*eptr
,
101 const struct hashmap_entry
*entry_or_key
,
102 const void *unused_keydata
)
104 const struct dir_rename_entry
*e1
, *e2
;
106 e1
= container_of(eptr
, const struct dir_rename_entry
, ent
);
107 e2
= container_of(entry_or_key
, const struct dir_rename_entry
, ent
);
109 return strcmp(e1
->dir
, e2
->dir
);
112 static void dir_rename_init(struct hashmap
*map
)
114 hashmap_init(map
, dir_rename_cmp
, NULL
, 0);
117 static void dir_rename_entry_init(struct dir_rename_entry
*entry
,
120 hashmap_entry_init(&entry
->ent
, strhash(directory
));
121 entry
->dir
= directory
;
122 entry
->non_unique_new_dir
= 0;
123 strbuf_init(&entry
->new_dir
, 0);
124 string_list_init(&entry
->possible_new_dirs
, 0);
127 struct collision_entry
{
128 struct hashmap_entry ent
;
130 struct string_list source_files
;
131 unsigned reported_already
:1;
134 static struct collision_entry
*collision_find_entry(struct hashmap
*hashmap
,
137 struct collision_entry key
;
139 hashmap_entry_init(&key
.ent
, strhash(target_file
));
140 key
.target_file
= target_file
;
141 return hashmap_get_entry(hashmap
, &key
, ent
, NULL
);
144 static int collision_cmp(const void *unused_cmp_data
,
145 const struct hashmap_entry
*eptr
,
146 const struct hashmap_entry
*entry_or_key
,
147 const void *unused_keydata
)
149 const struct collision_entry
*e1
, *e2
;
151 e1
= container_of(eptr
, const struct collision_entry
, ent
);
152 e2
= container_of(entry_or_key
, const struct collision_entry
, ent
);
154 return strcmp(e1
->target_file
, e2
->target_file
);
157 static void collision_init(struct hashmap
*map
)
159 hashmap_init(map
, collision_cmp
, NULL
, 0);
162 static void flush_output(struct merge_options
*opt
)
164 if (opt
->buffer_output
< 2 && opt
->obuf
.len
) {
165 fputs(opt
->obuf
.buf
, stdout
);
166 strbuf_reset(&opt
->obuf
);
170 static int err(struct merge_options
*opt
, const char *err
, ...)
174 if (opt
->buffer_output
< 2)
177 strbuf_complete(&opt
->obuf
, '\n');
178 strbuf_addstr(&opt
->obuf
, "error: ");
180 va_start(params
, err
);
181 strbuf_vaddf(&opt
->obuf
, err
, params
);
183 if (opt
->buffer_output
> 1)
184 strbuf_addch(&opt
->obuf
, '\n');
186 error("%s", opt
->obuf
.buf
);
187 strbuf_reset(&opt
->obuf
);
193 static struct tree
*shift_tree_object(struct repository
*repo
,
194 struct tree
*one
, struct tree
*two
,
195 const char *subtree_shift
)
197 struct object_id shifted
;
199 if (!*subtree_shift
) {
200 shift_tree(repo
, &one
->object
.oid
, &two
->object
.oid
, &shifted
, 0);
202 shift_tree_by(repo
, &one
->object
.oid
, &two
->object
.oid
, &shifted
,
205 if (oideq(&two
->object
.oid
, &shifted
))
207 return lookup_tree(repo
, &shifted
);
210 static inline void set_commit_tree(struct commit
*c
, struct tree
*t
)
215 static struct commit
*make_virtual_commit(struct repository
*repo
,
219 struct commit
*commit
= alloc_commit_node(repo
);
221 set_merge_remote_desc(commit
, comment
, (struct object
*)commit
);
222 set_commit_tree(commit
, tree
);
223 commit
->object
.parsed
= 1;
232 RENAME_ONE_FILE_TO_ONE
,
233 RENAME_ONE_FILE_TO_TWO
,
234 RENAME_TWO_FILES_TO_ONE
238 * Since we want to write the index eventually, we cannot reuse the index
239 * for these (temporary) data.
242 struct diff_filespec stages
[4]; /* mostly for oid & mode; maybe path */
243 struct rename_conflict_info
*rename_conflict_info
;
244 unsigned processed
:1;
248 unsigned processed
:1;
249 struct diff_filepair
*pair
;
250 const char *branch
; /* branch that the rename occurred on */
252 * If directory rename detection affected this rename, what was its
253 * original type ('A' or 'R') and it's original destination before
254 * the directory rename (otherwise, '\0' and NULL for these two vars).
256 char dir_rename_original_type
;
257 char *dir_rename_original_dest
;
259 * Purpose of src_entry and dst_entry:
261 * If 'before' is renamed to 'after' then src_entry will contain
262 * the versions of 'before' from the merge_base, HEAD, and MERGE in
263 * stages 1, 2, and 3; dst_entry will contain the respective
264 * versions of 'after' in corresponding locations. Thus, we have a
265 * total of six modes and oids, though some will be null. (Stage 0
266 * is ignored; we're interested in handling conflicts.)
268 * Since we don't turn on break-rewrites by default, neither
269 * src_entry nor dst_entry can have all three of their stages have
270 * non-null oids, meaning at most four of the six will be non-null.
271 * Also, since this is a rename, both src_entry and dst_entry will
272 * have at least one non-null oid, meaning at least two will be
273 * non-null. Of the six oids, a typical rename will have three be
274 * non-null. Only two implies a rename/delete, and four implies a
277 struct stage_data
*src_entry
;
278 struct stage_data
*dst_entry
;
281 struct rename_conflict_info
{
282 enum rename_type rename_type
;
287 static inline void setup_rename_conflict_info(enum rename_type rename_type
,
288 struct merge_options
*opt
,
292 struct rename_conflict_info
*ci
;
295 * When we have two renames involved, it's easiest to get the
296 * correct things into stage 2 and 3, and to make sure that the
297 * content merge puts HEAD before the other branch if we just
298 * ensure that branch1 == opt->branch1. So, simply flip arguments
299 * around if we don't have that.
301 if (ren2
&& ren1
->branch
!= opt
->branch1
) {
302 setup_rename_conflict_info(rename_type
, opt
, ren2
, ren1
);
306 ci
= xcalloc(1, sizeof(struct rename_conflict_info
));
307 ci
->rename_type
= rename_type
;
311 ci
->ren1
->dst_entry
->processed
= 0;
312 ci
->ren1
->dst_entry
->rename_conflict_info
= ci
;
314 ci
->ren2
->dst_entry
->rename_conflict_info
= ci
;
318 static int show(struct merge_options
*opt
, int v
)
320 return (!opt
->priv
->call_depth
&& opt
->verbosity
>= v
) ||
324 __attribute__((format (printf
, 3, 4)))
325 static void output(struct merge_options
*opt
, int v
, const char *fmt
, ...)
332 strbuf_addchars(&opt
->obuf
, ' ', opt
->priv
->call_depth
* 2);
335 strbuf_vaddf(&opt
->obuf
, fmt
, ap
);
338 strbuf_addch(&opt
->obuf
, '\n');
339 if (!opt
->buffer_output
)
343 static void output_commit_title(struct merge_options
*opt
, struct commit
*commit
)
345 struct merge_remote_desc
*desc
;
347 strbuf_addchars(&opt
->obuf
, ' ', opt
->priv
->call_depth
* 2);
348 desc
= merge_remote_util(commit
);
350 strbuf_addf(&opt
->obuf
, "virtual %s\n", desc
->name
);
352 strbuf_add_unique_abbrev(&opt
->obuf
, &commit
->object
.oid
,
354 strbuf_addch(&opt
->obuf
, ' ');
355 if (parse_commit(commit
) != 0)
356 strbuf_addstr(&opt
->obuf
, _("(bad commit)\n"));
359 const char *msg
= get_commit_buffer(commit
, NULL
);
360 int len
= find_commit_subject(msg
, &title
);
362 strbuf_addf(&opt
->obuf
, "%.*s\n", len
, title
);
363 unuse_commit_buffer(commit
, msg
);
369 static int add_cacheinfo(struct merge_options
*opt
,
370 const struct diff_filespec
*blob
,
371 const char *path
, int stage
, int refresh
, int options
)
373 struct index_state
*istate
= opt
->repo
->index
;
374 struct cache_entry
*ce
;
377 ce
= make_cache_entry(istate
, blob
->mode
, &blob
->oid
, path
, stage
, 0);
379 return err(opt
, _("add_cacheinfo failed for path '%s'; merge aborting."), path
);
381 ret
= add_index_entry(istate
, ce
, options
);
383 struct cache_entry
*nce
;
385 nce
= refresh_cache_entry(istate
, ce
,
386 CE_MATCH_REFRESH
| CE_MATCH_IGNORE_MISSING
);
388 return err(opt
, _("add_cacheinfo failed to refresh for path '%s'; merge aborting."), path
);
390 ret
= add_index_entry(istate
, nce
, options
);
395 static inline int merge_detect_rename(struct merge_options
*opt
)
397 return (opt
->detect_renames
>= 0) ? opt
->detect_renames
: 1;
400 static void init_tree_desc_from_tree(struct tree_desc
*desc
, struct tree
*tree
)
403 init_tree_desc(desc
, tree
->buffer
, tree
->size
);
406 static int unpack_trees_start(struct merge_options
*opt
,
412 struct tree_desc t
[3];
413 struct index_state tmp_index
= { NULL
};
415 memset(&opt
->priv
->unpack_opts
, 0, sizeof(opt
->priv
->unpack_opts
));
416 if (opt
->priv
->call_depth
)
417 opt
->priv
->unpack_opts
.index_only
= 1;
419 opt
->priv
->unpack_opts
.update
= 1;
420 opt
->priv
->unpack_opts
.merge
= 1;
421 opt
->priv
->unpack_opts
.head_idx
= 2;
422 opt
->priv
->unpack_opts
.fn
= threeway_merge
;
423 opt
->priv
->unpack_opts
.src_index
= opt
->repo
->index
;
424 opt
->priv
->unpack_opts
.dst_index
= &tmp_index
;
425 opt
->priv
->unpack_opts
.aggressive
= !merge_detect_rename(opt
);
426 setup_unpack_trees_porcelain(&opt
->priv
->unpack_opts
, "merge");
428 init_tree_desc_from_tree(t
+0, common
);
429 init_tree_desc_from_tree(t
+1, head
);
430 init_tree_desc_from_tree(t
+2, merge
);
432 rc
= unpack_trees(3, t
, &opt
->priv
->unpack_opts
);
433 cache_tree_free(&opt
->repo
->index
->cache_tree
);
436 * Update opt->repo->index to match the new results, AFTER saving a
437 * copy in opt->priv->orig_index. Update src_index to point to the
438 * saved copy. (verify_uptodate() checks src_index, and the original
439 * index is the one that had the necessary modification timestamps.)
441 opt
->priv
->orig_index
= *opt
->repo
->index
;
442 *opt
->repo
->index
= tmp_index
;
443 opt
->priv
->unpack_opts
.src_index
= &opt
->priv
->orig_index
;
448 static void unpack_trees_finish(struct merge_options
*opt
)
450 discard_index(&opt
->priv
->orig_index
);
451 clear_unpack_trees_porcelain(&opt
->priv
->unpack_opts
);
454 static int save_files_dirs(const struct object_id
*oid
,
455 struct strbuf
*base
, const char *path
,
456 unsigned int mode
, int stage
, void *context
)
458 struct path_hashmap_entry
*entry
;
459 int baselen
= base
->len
;
460 struct merge_options
*opt
= context
;
462 strbuf_addstr(base
, path
);
464 FLEX_ALLOC_MEM(entry
, path
, base
->buf
, base
->len
);
465 hashmap_entry_init(&entry
->e
, path_hash(entry
->path
));
466 hashmap_add(&opt
->priv
->current_file_dir_set
, &entry
->e
);
468 strbuf_setlen(base
, baselen
);
469 return (S_ISDIR(mode
) ? READ_TREE_RECURSIVE
: 0);
472 static void get_files_dirs(struct merge_options
*opt
, struct tree
*tree
)
474 struct pathspec match_all
;
475 memset(&match_all
, 0, sizeof(match_all
));
476 read_tree_recursive(opt
->repo
, tree
, "", 0, 0,
477 &match_all
, save_files_dirs
, opt
);
480 static int get_tree_entry_if_blob(struct repository
*r
,
481 const struct object_id
*tree
,
483 struct diff_filespec
*dfs
)
487 ret
= get_tree_entry(r
, tree
, path
, &dfs
->oid
, &dfs
->mode
);
488 if (S_ISDIR(dfs
->mode
)) {
489 oidcpy(&dfs
->oid
, &null_oid
);
496 * Returns an index_entry instance which doesn't have to correspond to
497 * a real cache entry in Git's index.
499 static struct stage_data
*insert_stage_data(struct repository
*r
,
501 struct tree
*o
, struct tree
*a
, struct tree
*b
,
502 struct string_list
*entries
)
504 struct string_list_item
*item
;
505 struct stage_data
*e
= xcalloc(1, sizeof(struct stage_data
));
506 get_tree_entry_if_blob(r
, &o
->object
.oid
, path
, &e
->stages
[1]);
507 get_tree_entry_if_blob(r
, &a
->object
.oid
, path
, &e
->stages
[2]);
508 get_tree_entry_if_blob(r
, &b
->object
.oid
, path
, &e
->stages
[3]);
509 item
= string_list_insert(entries
, path
);
515 * Create a dictionary mapping file names to stage_data objects. The
516 * dictionary contains one entry for every path with a non-zero stage entry.
518 static struct string_list
*get_unmerged(struct index_state
*istate
)
520 struct string_list
*unmerged
= xcalloc(1, sizeof(struct string_list
));
523 unmerged
->strdup_strings
= 1;
525 for (i
= 0; i
< istate
->cache_nr
; i
++) {
526 struct string_list_item
*item
;
527 struct stage_data
*e
;
528 const struct cache_entry
*ce
= istate
->cache
[i
];
532 item
= string_list_lookup(unmerged
, ce
->name
);
534 item
= string_list_insert(unmerged
, ce
->name
);
535 item
->util
= xcalloc(1, sizeof(struct stage_data
));
538 e
->stages
[ce_stage(ce
)].mode
= ce
->ce_mode
;
539 oidcpy(&e
->stages
[ce_stage(ce
)].oid
, &ce
->oid
);
545 static int string_list_df_name_compare(const char *one
, const char *two
)
547 int onelen
= strlen(one
);
548 int twolen
= strlen(two
);
550 * Here we only care that entries for D/F conflicts are
551 * adjacent, in particular with the file of the D/F conflict
552 * appearing before files below the corresponding directory.
553 * The order of the rest of the list is irrelevant for us.
555 * To achieve this, we sort with df_name_compare and provide
556 * the mode S_IFDIR so that D/F conflicts will sort correctly.
557 * We use the mode S_IFDIR for everything else for simplicity,
558 * since in other cases any changes in their order due to
559 * sorting cause no problems for us.
561 int cmp
= df_name_compare(one
, onelen
, S_IFDIR
,
562 two
, twolen
, S_IFDIR
);
564 * Now that 'foo' and 'foo/bar' compare equal, we have to make sure
565 * that 'foo' comes before 'foo/bar'.
569 return onelen
- twolen
;
572 static void record_df_conflict_files(struct merge_options
*opt
,
573 struct string_list
*entries
)
575 /* If there is a D/F conflict and the file for such a conflict
576 * currently exists in the working tree, we want to allow it to be
577 * removed to make room for the corresponding directory if needed.
578 * The files underneath the directories of such D/F conflicts will
579 * be processed before the corresponding file involved in the D/F
580 * conflict. If the D/F directory ends up being removed by the
581 * merge, then we won't have to touch the D/F file. If the D/F
582 * directory needs to be written to the working copy, then the D/F
583 * file will simply be removed (in make_room_for_path()) to make
584 * room for the necessary paths. Note that if both the directory
585 * and the file need to be present, then the D/F file will be
586 * reinstated with a new unique name at the time it is processed.
588 struct string_list df_sorted_entries
= STRING_LIST_INIT_NODUP
;
589 const char *last_file
= NULL
;
594 * If we're merging merge-bases, we don't want to bother with
595 * any working directory changes.
597 if (opt
->priv
->call_depth
)
600 /* Ensure D/F conflicts are adjacent in the entries list. */
601 for (i
= 0; i
< entries
->nr
; i
++) {
602 struct string_list_item
*next
= &entries
->items
[i
];
603 string_list_append(&df_sorted_entries
, next
->string
)->util
=
606 df_sorted_entries
.cmp
= string_list_df_name_compare
;
607 string_list_sort(&df_sorted_entries
);
609 string_list_clear(&opt
->priv
->df_conflict_file_set
, 1);
610 for (i
= 0; i
< df_sorted_entries
.nr
; i
++) {
611 const char *path
= df_sorted_entries
.items
[i
].string
;
612 int len
= strlen(path
);
613 struct stage_data
*e
= df_sorted_entries
.items
[i
].util
;
616 * Check if last_file & path correspond to a D/F conflict;
617 * i.e. whether path is last_file+'/'+<something>.
618 * If so, record that it's okay to remove last_file to make
619 * room for path and friends if needed.
623 memcmp(path
, last_file
, last_len
) == 0 &&
624 path
[last_len
] == '/') {
625 string_list_insert(&opt
->priv
->df_conflict_file_set
, last_file
);
629 * Determine whether path could exist as a file in the
630 * working directory as a possible D/F conflict. This
631 * will only occur when it exists in stage 2 as a
634 if (S_ISREG(e
->stages
[2].mode
) || S_ISLNK(e
->stages
[2].mode
)) {
641 string_list_clear(&df_sorted_entries
, 0);
644 static int update_stages(struct merge_options
*opt
, const char *path
,
645 const struct diff_filespec
*o
,
646 const struct diff_filespec
*a
,
647 const struct diff_filespec
*b
)
651 * NOTE: It is usually a bad idea to call update_stages on a path
652 * before calling update_file on that same path, since it can
653 * sometimes lead to spurious "refusing to lose untracked file..."
654 * messages from update_file (via make_room_for path via
655 * would_lose_untracked). Instead, reverse the order of the calls
656 * (executing update_file first and then update_stages).
659 int options
= ADD_CACHE_OK_TO_ADD
| ADD_CACHE_SKIP_DFCHECK
;
661 if (remove_file_from_index(opt
->repo
->index
, path
))
664 if (add_cacheinfo(opt
, o
, path
, 1, 0, options
))
667 if (add_cacheinfo(opt
, a
, path
, 2, 0, options
))
670 if (add_cacheinfo(opt
, b
, path
, 3, 0, options
))
675 static void update_entry(struct stage_data
*entry
,
676 struct diff_filespec
*o
,
677 struct diff_filespec
*a
,
678 struct diff_filespec
*b
)
680 entry
->processed
= 0;
681 entry
->stages
[1].mode
= o
->mode
;
682 entry
->stages
[2].mode
= a
->mode
;
683 entry
->stages
[3].mode
= b
->mode
;
684 oidcpy(&entry
->stages
[1].oid
, &o
->oid
);
685 oidcpy(&entry
->stages
[2].oid
, &a
->oid
);
686 oidcpy(&entry
->stages
[3].oid
, &b
->oid
);
689 static int remove_file(struct merge_options
*opt
, int clean
,
690 const char *path
, int no_wd
)
692 int update_cache
= opt
->priv
->call_depth
|| clean
;
693 int update_working_directory
= !opt
->priv
->call_depth
&& !no_wd
;
696 if (remove_file_from_index(opt
->repo
->index
, path
))
699 if (update_working_directory
) {
701 struct cache_entry
*ce
;
702 ce
= index_file_exists(opt
->repo
->index
, path
, strlen(path
),
704 if (ce
&& ce_stage(ce
) == 0 && strcmp(path
, ce
->name
))
707 if (remove_path(path
))
713 /* add a string to a strbuf, but converting "/" to "_" */
714 static void add_flattened_path(struct strbuf
*out
, const char *s
)
717 strbuf_addstr(out
, s
);
718 for (; i
< out
->len
; i
++)
719 if (out
->buf
[i
] == '/')
723 static char *unique_path(struct merge_options
*opt
,
727 struct path_hashmap_entry
*entry
;
728 struct strbuf newpath
= STRBUF_INIT
;
732 strbuf_addf(&newpath
, "%s~", path
);
733 add_flattened_path(&newpath
, branch
);
735 base_len
= newpath
.len
;
736 while (hashmap_get_from_hash(&opt
->priv
->current_file_dir_set
,
737 path_hash(newpath
.buf
), newpath
.buf
) ||
738 (!opt
->priv
->call_depth
&& file_exists(newpath
.buf
))) {
739 strbuf_setlen(&newpath
, base_len
);
740 strbuf_addf(&newpath
, "_%d", suffix
++);
743 FLEX_ALLOC_MEM(entry
, path
, newpath
.buf
, newpath
.len
);
744 hashmap_entry_init(&entry
->e
, path_hash(entry
->path
));
745 hashmap_add(&opt
->priv
->current_file_dir_set
, &entry
->e
);
746 return strbuf_detach(&newpath
, NULL
);
750 * Check whether a directory in the index is in the way of an incoming
751 * file. Return 1 if so. If check_working_copy is non-zero, also
752 * check the working directory. If empty_ok is non-zero, also return
753 * 0 in the case where the working-tree dir exists but is empty.
755 static int dir_in_way(struct index_state
*istate
, const char *path
,
756 int check_working_copy
, int empty_ok
)
759 struct strbuf dirpath
= STRBUF_INIT
;
762 strbuf_addstr(&dirpath
, path
);
763 strbuf_addch(&dirpath
, '/');
765 pos
= index_name_pos(istate
, dirpath
.buf
, dirpath
.len
);
769 if (pos
< istate
->cache_nr
&&
770 !strncmp(dirpath
.buf
, istate
->cache
[pos
]->name
, dirpath
.len
)) {
771 strbuf_release(&dirpath
);
775 strbuf_release(&dirpath
);
776 return check_working_copy
&& !lstat(path
, &st
) && S_ISDIR(st
.st_mode
) &&
777 !(empty_ok
&& is_empty_dir(path
)) &&
778 !has_symlink_leading_path(path
, strlen(path
));
782 * Returns whether path was tracked in the index before the merge started,
783 * and its oid and mode match the specified values
785 static int was_tracked_and_matches(struct merge_options
*opt
, const char *path
,
786 const struct diff_filespec
*blob
)
788 int pos
= index_name_pos(&opt
->priv
->orig_index
, path
, strlen(path
));
789 struct cache_entry
*ce
;
792 /* we were not tracking this path before the merge */
795 /* See if the file we were tracking before matches */
796 ce
= opt
->priv
->orig_index
.cache
[pos
];
797 return (oideq(&ce
->oid
, &blob
->oid
) && ce
->ce_mode
== blob
->mode
);
801 * Returns whether path was tracked in the index before the merge started
803 static int was_tracked(struct merge_options
*opt
, const char *path
)
805 int pos
= index_name_pos(&opt
->priv
->orig_index
, path
, strlen(path
));
808 /* we were tracking this path before the merge */
814 static int would_lose_untracked(struct merge_options
*opt
, const char *path
)
816 struct index_state
*istate
= opt
->repo
->index
;
819 * This may look like it can be simplified to:
820 * return !was_tracked(opt, path) && file_exists(path)
821 * but it can't. This function needs to know whether path was in
822 * the working tree due to EITHER having been tracked in the index
823 * before the merge OR having been put into the working copy and
824 * index by unpack_trees(). Due to that either-or requirement, we
825 * check the current index instead of the original one.
827 * Note that we do not need to worry about merge-recursive itself
828 * updating the index after unpack_trees() and before calling this
829 * function, because we strictly require all code paths in
830 * merge-recursive to update the working tree first and the index
831 * second. Doing otherwise would break
832 * update_file()/would_lose_untracked(); see every comment in this
833 * file which mentions "update_stages".
835 int pos
= index_name_pos(istate
, path
, strlen(path
));
839 while (pos
< istate
->cache_nr
&&
840 !strcmp(path
, istate
->cache
[pos
]->name
)) {
842 * If stage #0, it is definitely tracked.
843 * If it has stage #2 then it was tracked
844 * before this merge started. All other
845 * cases the path was not tracked.
847 switch (ce_stage(istate
->cache
[pos
])) {
854 return file_exists(path
);
857 static int was_dirty(struct merge_options
*opt
, const char *path
)
859 struct cache_entry
*ce
;
862 if (opt
->priv
->call_depth
|| !was_tracked(opt
, path
))
865 ce
= index_file_exists(opt
->priv
->unpack_opts
.src_index
,
866 path
, strlen(path
), ignore_case
);
867 dirty
= verify_uptodate(ce
, &opt
->priv
->unpack_opts
) != 0;
871 static int make_room_for_path(struct merge_options
*opt
, const char *path
)
874 const char *msg
= _("failed to create path '%s'%s");
876 /* Unlink any D/F conflict files that are in the way */
877 for (i
= 0; i
< opt
->priv
->df_conflict_file_set
.nr
; i
++) {
878 const char *df_path
= opt
->priv
->df_conflict_file_set
.items
[i
].string
;
879 size_t pathlen
= strlen(path
);
880 size_t df_pathlen
= strlen(df_path
);
881 if (df_pathlen
< pathlen
&&
882 path
[df_pathlen
] == '/' &&
883 strncmp(path
, df_path
, df_pathlen
) == 0) {
885 _("Removing %s to make room for subdirectory\n"),
888 unsorted_string_list_delete_item(&opt
->priv
->df_conflict_file_set
,
894 /* Make sure leading directories are created */
895 status
= safe_create_leading_directories_const(path
);
897 if (status
== SCLD_EXISTS
)
898 /* something else exists */
899 return err(opt
, msg
, path
, _(": perhaps a D/F conflict?"));
900 return err(opt
, msg
, path
, "");
904 * Do not unlink a file in the work tree if we are not
907 if (would_lose_untracked(opt
, path
))
908 return err(opt
, _("refusing to lose untracked file at '%s'"),
911 /* Successful unlink is good.. */
914 /* .. and so is no existing file */
917 /* .. but not some other error (who really cares what?) */
918 return err(opt
, msg
, path
, _(": perhaps a D/F conflict?"));
921 static int update_file_flags(struct merge_options
*opt
,
922 const struct diff_filespec
*contents
,
929 if (opt
->priv
->call_depth
)
933 enum object_type type
;
937 if (S_ISGITLINK(contents
->mode
)) {
939 * We may later decide to recursively descend into
940 * the submodule directory and update its index
941 * and/or work tree, but we do not do that now.
947 buf
= read_object_file(&contents
->oid
, &type
, &size
);
949 ret
= err(opt
, _("cannot read object %s '%s'"),
950 oid_to_hex(&contents
->oid
), path
);
953 if (type
!= OBJ_BLOB
) {
954 ret
= err(opt
, _("blob expected for %s '%s'"),
955 oid_to_hex(&contents
->oid
), path
);
958 if (S_ISREG(contents
->mode
)) {
959 struct strbuf strbuf
= STRBUF_INIT
;
960 if (convert_to_working_tree(opt
->repo
->index
,
961 path
, buf
, size
, &strbuf
)) {
964 buf
= strbuf_detach(&strbuf
, NULL
);
968 if (make_room_for_path(opt
, path
) < 0) {
972 if (S_ISREG(contents
->mode
) ||
973 (!has_symlinks
&& S_ISLNK(contents
->mode
))) {
975 int mode
= (contents
->mode
& 0100 ? 0777 : 0666);
977 fd
= open(path
, O_WRONLY
| O_TRUNC
| O_CREAT
, mode
);
979 ret
= err(opt
, _("failed to open '%s': %s"),
980 path
, strerror(errno
));
983 write_in_full(fd
, buf
, size
);
985 } else if (S_ISLNK(contents
->mode
)) {
986 char *lnk
= xmemdupz(buf
, size
);
987 safe_create_leading_directories_const(path
);
989 if (symlink(lnk
, path
))
990 ret
= err(opt
, _("failed to symlink '%s': %s"),
991 path
, strerror(errno
));
995 _("do not know what to do with %06o %s '%s'"),
996 contents
->mode
, oid_to_hex(&contents
->oid
), path
);
1001 if (!ret
&& update_cache
)
1002 if (add_cacheinfo(opt
, contents
, path
, 0, update_wd
,
1003 ADD_CACHE_OK_TO_ADD
))
1008 static int update_file(struct merge_options
*opt
,
1010 const struct diff_filespec
*contents
,
1013 return update_file_flags(opt
, contents
, path
,
1014 opt
->priv
->call_depth
|| clean
, !opt
->priv
->call_depth
);
1017 /* Low level file merging, update and removal */
1019 struct merge_file_info
{
1020 struct diff_filespec blob
; /* mostly use oid & mode; sometimes path */
1025 static int merge_3way(struct merge_options
*opt
,
1026 mmbuffer_t
*result_buf
,
1027 const struct diff_filespec
*o
,
1028 const struct diff_filespec
*a
,
1029 const struct diff_filespec
*b
,
1030 const char *branch1
,
1031 const char *branch2
,
1032 const int extra_marker_size
)
1034 mmfile_t orig
, src1
, src2
;
1035 struct ll_merge_options ll_opts
= {0};
1036 char *base
, *name1
, *name2
;
1039 ll_opts
.renormalize
= opt
->renormalize
;
1040 ll_opts
.extra_marker_size
= extra_marker_size
;
1041 ll_opts
.xdl_opts
= opt
->xdl_opts
;
1043 if (opt
->priv
->call_depth
) {
1044 ll_opts
.virtual_ancestor
= 1;
1045 ll_opts
.variant
= 0;
1047 switch (opt
->recursive_variant
) {
1048 case MERGE_VARIANT_OURS
:
1049 ll_opts
.variant
= XDL_MERGE_FAVOR_OURS
;
1051 case MERGE_VARIANT_THEIRS
:
1052 ll_opts
.variant
= XDL_MERGE_FAVOR_THEIRS
;
1055 ll_opts
.variant
= 0;
1060 assert(a
->path
&& b
->path
&& o
->path
&& opt
->ancestor
);
1061 if (strcmp(a
->path
, b
->path
) || strcmp(a
->path
, o
->path
) != 0) {
1062 base
= mkpathdup("%s:%s", opt
->ancestor
, o
->path
);
1063 name1
= mkpathdup("%s:%s", branch1
, a
->path
);
1064 name2
= mkpathdup("%s:%s", branch2
, b
->path
);
1066 base
= mkpathdup("%s", opt
->ancestor
);
1067 name1
= mkpathdup("%s", branch1
);
1068 name2
= mkpathdup("%s", branch2
);
1071 read_mmblob(&orig
, &o
->oid
);
1072 read_mmblob(&src1
, &a
->oid
);
1073 read_mmblob(&src2
, &b
->oid
);
1075 merge_status
= ll_merge(result_buf
, a
->path
, &orig
, base
,
1076 &src1
, name1
, &src2
, name2
,
1077 opt
->repo
->index
, &ll_opts
);
1085 return merge_status
;
1088 static int find_first_merges(struct repository
*repo
,
1089 struct object_array
*result
, const char *path
,
1090 struct commit
*a
, struct commit
*b
)
1093 struct object_array merges
= OBJECT_ARRAY_INIT
;
1094 struct commit
*commit
;
1095 int contains_another
;
1097 char merged_revision
[GIT_MAX_HEXSZ
+ 2];
1098 const char *rev_args
[] = { "rev-list", "--merges", "--ancestry-path",
1099 "--all", merged_revision
, NULL
};
1100 struct rev_info revs
;
1101 struct setup_revision_opt rev_opts
;
1103 memset(result
, 0, sizeof(struct object_array
));
1104 memset(&rev_opts
, 0, sizeof(rev_opts
));
1106 /* get all revisions that merge commit a */
1107 xsnprintf(merged_revision
, sizeof(merged_revision
), "^%s",
1108 oid_to_hex(&a
->object
.oid
));
1109 repo_init_revisions(repo
, &revs
, NULL
);
1110 rev_opts
.submodule
= path
;
1111 /* FIXME: can't handle linked worktrees in submodules yet */
1112 revs
.single_worktree
= path
!= NULL
;
1113 setup_revisions(ARRAY_SIZE(rev_args
)-1, rev_args
, &revs
, &rev_opts
);
1115 /* save all revisions from the above list that contain b */
1116 if (prepare_revision_walk(&revs
))
1117 die("revision walk setup failed");
1118 while ((commit
= get_revision(&revs
)) != NULL
) {
1119 struct object
*o
= &(commit
->object
);
1120 if (in_merge_bases(b
, commit
))
1121 add_object_array(o
, NULL
, &merges
);
1123 reset_revision_walk();
1125 /* Now we've got all merges that contain a and b. Prune all
1126 * merges that contain another found merge and save them in
1129 for (i
= 0; i
< merges
.nr
; i
++) {
1130 struct commit
*m1
= (struct commit
*) merges
.objects
[i
].item
;
1132 contains_another
= 0;
1133 for (j
= 0; j
< merges
.nr
; j
++) {
1134 struct commit
*m2
= (struct commit
*) merges
.objects
[j
].item
;
1135 if (i
!= j
&& in_merge_bases(m2
, m1
)) {
1136 contains_another
= 1;
1141 if (!contains_another
)
1142 add_object_array(merges
.objects
[i
].item
, NULL
, result
);
1145 object_array_clear(&merges
);
1149 static void print_commit(struct commit
*commit
)
1151 struct strbuf sb
= STRBUF_INIT
;
1152 struct pretty_print_context ctx
= {0};
1153 ctx
.date_mode
.type
= DATE_NORMAL
;
1154 format_commit_message(commit
, " %h: %m %s", &sb
, &ctx
);
1155 fprintf(stderr
, "%s\n", sb
.buf
);
1156 strbuf_release(&sb
);
1159 static int is_valid(const struct diff_filespec
*dfs
)
1161 return dfs
->mode
!= 0 && !is_null_oid(&dfs
->oid
);
1164 static int merge_submodule(struct merge_options
*opt
,
1165 struct object_id
*result
, const char *path
,
1166 const struct object_id
*base
, const struct object_id
*a
,
1167 const struct object_id
*b
)
1169 struct commit
*commit_base
, *commit_a
, *commit_b
;
1171 struct object_array merges
;
1174 int search
= !opt
->priv
->call_depth
;
1176 /* store a in result in case we fail */
1179 /* we can not handle deletion conflicts */
1180 if (is_null_oid(base
))
1187 if (add_submodule_odb(path
)) {
1188 output(opt
, 1, _("Failed to merge submodule %s (not checked out)"), path
);
1192 if (!(commit_base
= lookup_commit_reference(opt
->repo
, base
)) ||
1193 !(commit_a
= lookup_commit_reference(opt
->repo
, a
)) ||
1194 !(commit_b
= lookup_commit_reference(opt
->repo
, b
))) {
1195 output(opt
, 1, _("Failed to merge submodule %s (commits not present)"), path
);
1199 /* check whether both changes are forward */
1200 if (!in_merge_bases(commit_base
, commit_a
) ||
1201 !in_merge_bases(commit_base
, commit_b
)) {
1202 output(opt
, 1, _("Failed to merge submodule %s (commits don't follow merge-base)"), path
);
1206 /* Case #1: a is contained in b or vice versa */
1207 if (in_merge_bases(commit_a
, commit_b
)) {
1210 output(opt
, 3, _("Fast-forwarding submodule %s to the following commit:"), path
);
1211 output_commit_title(opt
, commit_b
);
1212 } else if (show(opt
, 2))
1213 output(opt
, 2, _("Fast-forwarding submodule %s"), path
);
1219 if (in_merge_bases(commit_b
, commit_a
)) {
1222 output(opt
, 3, _("Fast-forwarding submodule %s to the following commit:"), path
);
1223 output_commit_title(opt
, commit_a
);
1224 } else if (show(opt
, 2))
1225 output(opt
, 2, _("Fast-forwarding submodule %s"), path
);
1233 * Case #2: There are one or more merges that contain a and b in
1234 * the submodule. If there is only one, then present it as a
1235 * suggestion to the user, but leave it marked unmerged so the
1236 * user needs to confirm the resolution.
1239 /* Skip the search if makes no sense to the calling context. */
1243 /* find commit which merges them */
1244 parent_count
= find_first_merges(opt
->repo
, &merges
, path
,
1245 commit_a
, commit_b
);
1246 switch (parent_count
) {
1248 output(opt
, 1, _("Failed to merge submodule %s (merge following commits not found)"), path
);
1252 output(opt
, 1, _("Failed to merge submodule %s (not fast-forward)"), path
);
1253 output(opt
, 2, _("Found a possible merge resolution for the submodule:\n"));
1254 print_commit((struct commit
*) merges
.objects
[0].item
);
1256 "If this is correct simply add it to the index "
1259 " git update-index --cacheinfo 160000 %s \"%s\"\n\n"
1260 "which will accept this suggestion.\n"),
1261 oid_to_hex(&merges
.objects
[0].item
->oid
), path
);
1265 output(opt
, 1, _("Failed to merge submodule %s (multiple merges found)"), path
);
1266 for (i
= 0; i
< merges
.nr
; i
++)
1267 print_commit((struct commit
*) merges
.objects
[i
].item
);
1270 object_array_clear(&merges
);
1274 static int merge_mode_and_contents(struct merge_options
*opt
,
1275 const struct diff_filespec
*o
,
1276 const struct diff_filespec
*a
,
1277 const struct diff_filespec
*b
,
1278 const char *filename
,
1279 const char *branch1
,
1280 const char *branch2
,
1281 const int extra_marker_size
,
1282 struct merge_file_info
*result
)
1284 if (opt
->branch1
!= branch1
) {
1286 * It's weird getting a reverse merge with HEAD on the bottom
1287 * side of the conflict markers and the other branch on the
1290 return merge_mode_and_contents(opt
, o
, b
, a
,
1293 extra_marker_size
, result
);
1299 if ((S_IFMT
& a
->mode
) != (S_IFMT
& b
->mode
)) {
1301 if (S_ISREG(a
->mode
)) {
1302 result
->blob
.mode
= a
->mode
;
1303 oidcpy(&result
->blob
.oid
, &a
->oid
);
1305 result
->blob
.mode
= b
->mode
;
1306 oidcpy(&result
->blob
.oid
, &b
->oid
);
1309 if (!oideq(&a
->oid
, &o
->oid
) && !oideq(&b
->oid
, &o
->oid
))
1315 if (a
->mode
== b
->mode
|| a
->mode
== o
->mode
)
1316 result
->blob
.mode
= b
->mode
;
1318 result
->blob
.mode
= a
->mode
;
1319 if (b
->mode
!= o
->mode
) {
1325 if (oideq(&a
->oid
, &b
->oid
) || oideq(&a
->oid
, &o
->oid
))
1326 oidcpy(&result
->blob
.oid
, &b
->oid
);
1327 else if (oideq(&b
->oid
, &o
->oid
))
1328 oidcpy(&result
->blob
.oid
, &a
->oid
);
1329 else if (S_ISREG(a
->mode
)) {
1330 mmbuffer_t result_buf
;
1331 int ret
= 0, merge_status
;
1333 merge_status
= merge_3way(opt
, &result_buf
, o
, a
, b
,
1337 if ((merge_status
< 0) || !result_buf
.ptr
)
1338 ret
= err(opt
, _("Failed to execute internal merge"));
1341 write_object_file(result_buf
.ptr
, result_buf
.size
,
1342 blob_type
, &result
->blob
.oid
))
1343 ret
= err(opt
, _("Unable to add %s to database"),
1346 free(result_buf
.ptr
);
1349 result
->clean
= (merge_status
== 0);
1350 } else if (S_ISGITLINK(a
->mode
)) {
1351 result
->clean
= merge_submodule(opt
, &result
->blob
.oid
,
1356 } else if (S_ISLNK(a
->mode
)) {
1357 switch (opt
->recursive_variant
) {
1358 case MERGE_VARIANT_NORMAL
:
1359 oidcpy(&result
->blob
.oid
, &a
->oid
);
1360 if (!oideq(&a
->oid
, &b
->oid
))
1363 case MERGE_VARIANT_OURS
:
1364 oidcpy(&result
->blob
.oid
, &a
->oid
);
1366 case MERGE_VARIANT_THEIRS
:
1367 oidcpy(&result
->blob
.oid
, &b
->oid
);
1371 BUG("unsupported object type in the tree");
1375 output(opt
, 2, _("Auto-merging %s"), filename
);
1380 static int handle_rename_via_dir(struct merge_options
*opt
,
1381 struct rename_conflict_info
*ci
)
1384 * Handle file adds that need to be renamed due to directory rename
1385 * detection. This differs from handle_rename_normal, because
1386 * there is no content merge to do; just move the file into the
1387 * desired final location.
1389 const struct rename
*ren
= ci
->ren1
;
1390 const struct diff_filespec
*dest
= ren
->pair
->two
;
1391 char *file_path
= dest
->path
;
1392 int mark_conflicted
= (opt
->detect_directory_renames
==
1393 MERGE_DIRECTORY_RENAMES_CONFLICT
);
1394 assert(ren
->dir_rename_original_dest
);
1396 if (!opt
->priv
->call_depth
&& would_lose_untracked(opt
, dest
->path
)) {
1397 mark_conflicted
= 1;
1398 file_path
= unique_path(opt
, dest
->path
, ren
->branch
);
1399 output(opt
, 1, _("Error: Refusing to lose untracked file at %s; "
1400 "writing to %s instead."),
1401 dest
->path
, file_path
);
1404 if (mark_conflicted
) {
1406 * Write the file in worktree at file_path. In the index,
1407 * only record the file at dest->path in the appropriate
1410 if (update_file(opt
, 0, dest
, file_path
))
1412 if (file_path
!= dest
->path
)
1414 if (update_stages(opt
, dest
->path
, NULL
,
1415 ren
->branch
== opt
->branch1
? dest
: NULL
,
1416 ren
->branch
== opt
->branch1
? NULL
: dest
))
1418 return 0; /* not clean, but conflicted */
1420 /* Update dest->path both in index and in worktree */
1421 if (update_file(opt
, 1, dest
, dest
->path
))
1423 return 1; /* clean */
1427 static int handle_change_delete(struct merge_options
*opt
,
1428 const char *path
, const char *old_path
,
1429 const struct diff_filespec
*o
,
1430 const struct diff_filespec
*changed
,
1431 const char *change_branch
,
1432 const char *delete_branch
,
1433 const char *change
, const char *change_past
)
1435 char *alt_path
= NULL
;
1436 const char *update_path
= path
;
1439 if (dir_in_way(opt
->repo
->index
, path
, !opt
->priv
->call_depth
, 0) ||
1440 (!opt
->priv
->call_depth
&& would_lose_untracked(opt
, path
))) {
1441 update_path
= alt_path
= unique_path(opt
, path
, change_branch
);
1444 if (opt
->priv
->call_depth
) {
1446 * We cannot arbitrarily accept either a_sha or b_sha as
1447 * correct; since there is no true "middle point" between
1448 * them, simply reuse the base version for virtual merge base.
1450 ret
= remove_file_from_index(opt
->repo
->index
, path
);
1452 ret
= update_file(opt
, 0, o
, update_path
);
1455 * Despite the four nearly duplicate messages and argument
1456 * lists below and the ugliness of the nested if-statements,
1457 * having complete messages makes the job easier for
1460 * The slight variance among the cases is due to the fact
1462 * 1) directory/file conflicts (in effect if
1463 * !alt_path) could cause us to need to write the
1464 * file to a different path.
1465 * 2) renames (in effect if !old_path) could mean that
1466 * there are two names for the path that the user
1467 * may know the file by.
1471 output(opt
, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1472 "and %s in %s. Version %s of %s left in tree."),
1473 change
, path
, delete_branch
, change_past
,
1474 change_branch
, change_branch
, path
);
1476 output(opt
, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1477 "and %s to %s in %s. Version %s of %s left in tree."),
1478 change
, old_path
, delete_branch
, change_past
, path
,
1479 change_branch
, change_branch
, path
);
1483 output(opt
, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1484 "and %s in %s. Version %s of %s left in tree at %s."),
1485 change
, path
, delete_branch
, change_past
,
1486 change_branch
, change_branch
, path
, alt_path
);
1488 output(opt
, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1489 "and %s to %s in %s. Version %s of %s left in tree at %s."),
1490 change
, old_path
, delete_branch
, change_past
, path
,
1491 change_branch
, change_branch
, path
, alt_path
);
1495 * No need to call update_file() on path when change_branch ==
1496 * opt->branch1 && !alt_path, since that would needlessly touch
1497 * path. We could call update_file_flags() with update_cache=0
1498 * and update_wd=0, but that's a no-op.
1500 if (change_branch
!= opt
->branch1
|| alt_path
)
1501 ret
= update_file(opt
, 0, changed
, update_path
);
1508 static int handle_rename_delete(struct merge_options
*opt
,
1509 struct rename_conflict_info
*ci
)
1511 const struct rename
*ren
= ci
->ren1
;
1512 const struct diff_filespec
*orig
= ren
->pair
->one
;
1513 const struct diff_filespec
*dest
= ren
->pair
->two
;
1514 const char *rename_branch
= ren
->branch
;
1515 const char *delete_branch
= (opt
->branch1
== ren
->branch
?
1516 opt
->branch2
: opt
->branch1
);
1518 if (handle_change_delete(opt
,
1519 opt
->priv
->call_depth
? orig
->path
: dest
->path
,
1520 opt
->priv
->call_depth
? NULL
: orig
->path
,
1522 rename_branch
, delete_branch
,
1523 _("rename"), _("renamed")))
1526 if (opt
->priv
->call_depth
)
1527 return remove_file_from_index(opt
->repo
->index
, dest
->path
);
1529 return update_stages(opt
, dest
->path
, NULL
,
1530 rename_branch
== opt
->branch1
? dest
: NULL
,
1531 rename_branch
== opt
->branch1
? NULL
: dest
);
1534 static int handle_file_collision(struct merge_options
*opt
,
1535 const char *collide_path
,
1536 const char *prev_path1
,
1537 const char *prev_path2
,
1538 const char *branch1
, const char *branch2
,
1539 struct diff_filespec
*a
,
1540 struct diff_filespec
*b
)
1542 struct merge_file_info mfi
;
1543 struct diff_filespec null
;
1544 char *alt_path
= NULL
;
1545 const char *update_path
= collide_path
;
1548 * It's easiest to get the correct things into stage 2 and 3, and
1549 * to make sure that the content merge puts HEAD before the other
1550 * branch if we just ensure that branch1 == opt->branch1. So, simply
1551 * flip arguments around if we don't have that.
1553 if (branch1
!= opt
->branch1
) {
1554 return handle_file_collision(opt
, collide_path
,
1555 prev_path2
, prev_path1
,
1561 * In the recursive case, we just opt to undo renames
1563 if (opt
->priv
->call_depth
&& (prev_path1
|| prev_path2
)) {
1564 /* Put first file (a->oid, a->mode) in its original spot */
1566 if (update_file(opt
, 1, a
, prev_path1
))
1569 if (update_file(opt
, 1, a
, collide_path
))
1573 /* Put second file (b->oid, b->mode) in its original spot */
1575 if (update_file(opt
, 1, b
, prev_path2
))
1578 if (update_file(opt
, 1, b
, collide_path
))
1582 /* Don't leave something at collision path if unrenaming both */
1583 if (prev_path1
&& prev_path2
)
1584 remove_file(opt
, 1, collide_path
, 0);
1589 /* Remove rename sources if rename/add or rename/rename(2to1) */
1591 remove_file(opt
, 1, prev_path1
,
1592 opt
->priv
->call_depth
|| would_lose_untracked(opt
, prev_path1
));
1594 remove_file(opt
, 1, prev_path2
,
1595 opt
->priv
->call_depth
|| would_lose_untracked(opt
, prev_path2
));
1598 * Remove the collision path, if it wouldn't cause dirty contents
1599 * or an untracked file to get lost. We'll either overwrite with
1600 * merged contents, or just write out to differently named files.
1602 if (was_dirty(opt
, collide_path
)) {
1603 output(opt
, 1, _("Refusing to lose dirty file at %s"),
1605 update_path
= alt_path
= unique_path(opt
, collide_path
, "merged");
1606 } else if (would_lose_untracked(opt
, collide_path
)) {
1608 * Only way we get here is if both renames were from
1609 * a directory rename AND user had an untracked file
1610 * at the location where both files end up after the
1611 * two directory renames. See testcase 10d of t6043.
1613 output(opt
, 1, _("Refusing to lose untracked file at "
1614 "%s, even though it's in the way."),
1616 update_path
= alt_path
= unique_path(opt
, collide_path
, "merged");
1619 * FIXME: It's possible that the two files are identical
1620 * and that the current working copy happens to match, in
1621 * which case we are unnecessarily touching the working
1622 * tree file. It's not a likely enough scenario that I
1623 * want to code up the checks for it and a better fix is
1624 * available if we restructure how unpack_trees() and
1625 * merge-recursive interoperate anyway, so punting for
1628 remove_file(opt
, 0, collide_path
, 0);
1631 /* Store things in diff_filespecs for functions that need it */
1632 null
.path
= (char *)collide_path
;
1633 oidcpy(&null
.oid
, &null_oid
);
1636 if (merge_mode_and_contents(opt
, &null
, a
, b
, collide_path
,
1637 branch1
, branch2
, opt
->priv
->call_depth
* 2, &mfi
))
1639 mfi
.clean
&= !alt_path
;
1640 if (update_file(opt
, mfi
.clean
, &mfi
.blob
, update_path
))
1642 if (!mfi
.clean
&& !opt
->priv
->call_depth
&&
1643 update_stages(opt
, collide_path
, NULL
, a
, b
))
1647 * FIXME: If both a & b both started with conflicts (only possible
1648 * if they came from a rename/rename(2to1)), but had IDENTICAL
1649 * contents including those conflicts, then in the next line we claim
1650 * it was clean. If someone cares about this case, we should have the
1651 * caller notify us if we started with conflicts.
1656 static int handle_rename_add(struct merge_options
*opt
,
1657 struct rename_conflict_info
*ci
)
1659 /* a was renamed to c, and a separate c was added. */
1660 struct diff_filespec
*a
= ci
->ren1
->pair
->one
;
1661 struct diff_filespec
*c
= ci
->ren1
->pair
->two
;
1662 char *path
= c
->path
;
1663 char *prev_path_desc
;
1664 struct merge_file_info mfi
;
1666 const char *rename_branch
= ci
->ren1
->branch
;
1667 const char *add_branch
= (opt
->branch1
== rename_branch
?
1668 opt
->branch2
: opt
->branch1
);
1669 int other_stage
= (ci
->ren1
->branch
== opt
->branch1
? 3 : 2);
1671 output(opt
, 1, _("CONFLICT (rename/add): "
1672 "Rename %s->%s in %s. Added %s in %s"),
1673 a
->path
, c
->path
, rename_branch
,
1674 c
->path
, add_branch
);
1676 prev_path_desc
= xstrfmt("version of %s from %s", path
, a
->path
);
1677 ci
->ren1
->src_entry
->stages
[other_stage
].path
= a
->path
;
1678 if (merge_mode_and_contents(opt
, a
, c
,
1679 &ci
->ren1
->src_entry
->stages
[other_stage
],
1681 opt
->branch1
, opt
->branch2
,
1682 1 + opt
->priv
->call_depth
* 2, &mfi
))
1684 free(prev_path_desc
);
1686 ci
->ren1
->dst_entry
->stages
[other_stage
].path
= mfi
.blob
.path
= c
->path
;
1687 return handle_file_collision(opt
,
1688 c
->path
, a
->path
, NULL
,
1689 rename_branch
, add_branch
,
1691 &ci
->ren1
->dst_entry
->stages
[other_stage
]);
1694 static char *find_path_for_conflict(struct merge_options
*opt
,
1696 const char *branch1
,
1697 const char *branch2
)
1699 char *new_path
= NULL
;
1700 if (dir_in_way(opt
->repo
->index
, path
, !opt
->priv
->call_depth
, 0)) {
1701 new_path
= unique_path(opt
, path
, branch1
);
1702 output(opt
, 1, _("%s is a directory in %s adding "
1704 path
, branch2
, new_path
);
1705 } else if (would_lose_untracked(opt
, path
)) {
1706 new_path
= unique_path(opt
, path
, branch1
);
1707 output(opt
, 1, _("Refusing to lose untracked file"
1708 " at %s; adding as %s instead"),
1716 * Toggle the stage number between "ours" and "theirs" (2 and 3) by flipping
1719 static inline int flip_stage(int stage
)
1724 static int handle_rename_rename_1to2(struct merge_options
*opt
,
1725 struct rename_conflict_info
*ci
)
1727 /* One file was renamed in both branches, but to different names. */
1728 struct merge_file_info mfi
;
1729 struct diff_filespec
*add
;
1730 struct diff_filespec
*o
= ci
->ren1
->pair
->one
;
1731 struct diff_filespec
*a
= ci
->ren1
->pair
->two
;
1732 struct diff_filespec
*b
= ci
->ren2
->pair
->two
;
1735 output(opt
, 1, _("CONFLICT (rename/rename): "
1736 "Rename \"%s\"->\"%s\" in branch \"%s\" "
1737 "rename \"%s\"->\"%s\" in \"%s\"%s"),
1738 o
->path
, a
->path
, ci
->ren1
->branch
,
1739 o
->path
, b
->path
, ci
->ren2
->branch
,
1740 opt
->priv
->call_depth
? _(" (left unresolved)") : "");
1742 path_desc
= xstrfmt("%s and %s, both renamed from %s",
1743 a
->path
, b
->path
, o
->path
);
1744 if (merge_mode_and_contents(opt
, o
, a
, b
, path_desc
,
1745 ci
->ren1
->branch
, ci
->ren2
->branch
,
1746 opt
->priv
->call_depth
* 2, &mfi
))
1750 if (opt
->priv
->call_depth
) {
1752 * FIXME: For rename/add-source conflicts (if we could detect
1753 * such), this is wrong. We should instead find a unique
1754 * pathname and then either rename the add-source file to that
1755 * unique path, or use that unique path instead of src here.
1757 if (update_file(opt
, 0, &mfi
.blob
, o
->path
))
1761 * Above, we put the merged content at the merge-base's
1762 * path. Now we usually need to delete both a->path and
1763 * b->path. However, the rename on each side of the merge
1764 * could also be involved in a rename/add conflict. In
1765 * such cases, we should keep the added file around,
1766 * resolving the conflict at that path in its favor.
1768 add
= &ci
->ren1
->dst_entry
->stages
[flip_stage(2)];
1769 if (is_valid(add
)) {
1770 if (update_file(opt
, 0, add
, a
->path
))
1774 remove_file_from_index(opt
->repo
->index
, a
->path
);
1775 add
= &ci
->ren2
->dst_entry
->stages
[flip_stage(3)];
1776 if (is_valid(add
)) {
1777 if (update_file(opt
, 0, add
, b
->path
))
1781 remove_file_from_index(opt
->repo
->index
, b
->path
);
1784 * For each destination path, we need to see if there is a
1785 * rename/add collision. If not, we can write the file out
1786 * to the specified location.
1788 add
= &ci
->ren1
->dst_entry
->stages
[flip_stage(2)];
1789 if (is_valid(add
)) {
1790 add
->path
= mfi
.blob
.path
= a
->path
;
1791 if (handle_file_collision(opt
, a
->path
,
1795 &mfi
.blob
, add
) < 0)
1798 char *new_path
= find_path_for_conflict(opt
, a
->path
,
1801 if (update_file(opt
, 0, &mfi
.blob
,
1802 new_path
? new_path
: a
->path
))
1805 if (update_stages(opt
, a
->path
, NULL
, a
, NULL
))
1809 add
= &ci
->ren2
->dst_entry
->stages
[flip_stage(3)];
1810 if (is_valid(add
)) {
1811 add
->path
= mfi
.blob
.path
= b
->path
;
1812 if (handle_file_collision(opt
, b
->path
,
1816 add
, &mfi
.blob
) < 0)
1819 char *new_path
= find_path_for_conflict(opt
, b
->path
,
1822 if (update_file(opt
, 0, &mfi
.blob
,
1823 new_path
? new_path
: b
->path
))
1826 if (update_stages(opt
, b
->path
, NULL
, NULL
, b
))
1834 static int handle_rename_rename_2to1(struct merge_options
*opt
,
1835 struct rename_conflict_info
*ci
)
1837 /* Two files, a & b, were renamed to the same thing, c. */
1838 struct diff_filespec
*a
= ci
->ren1
->pair
->one
;
1839 struct diff_filespec
*b
= ci
->ren2
->pair
->one
;
1840 struct diff_filespec
*c1
= ci
->ren1
->pair
->two
;
1841 struct diff_filespec
*c2
= ci
->ren2
->pair
->two
;
1842 char *path
= c1
->path
; /* == c2->path */
1843 char *path_side_1_desc
;
1844 char *path_side_2_desc
;
1845 struct merge_file_info mfi_c1
;
1846 struct merge_file_info mfi_c2
;
1847 int ostage1
, ostage2
;
1849 output(opt
, 1, _("CONFLICT (rename/rename): "
1850 "Rename %s->%s in %s. "
1851 "Rename %s->%s in %s"),
1852 a
->path
, c1
->path
, ci
->ren1
->branch
,
1853 b
->path
, c2
->path
, ci
->ren2
->branch
);
1855 path_side_1_desc
= xstrfmt("version of %s from %s", path
, a
->path
);
1856 path_side_2_desc
= xstrfmt("version of %s from %s", path
, b
->path
);
1857 ostage1
= ci
->ren1
->branch
== opt
->branch1
? 3 : 2;
1858 ostage2
= flip_stage(ostage1
);
1859 ci
->ren1
->src_entry
->stages
[ostage1
].path
= a
->path
;
1860 ci
->ren2
->src_entry
->stages
[ostage2
].path
= b
->path
;
1861 if (merge_mode_and_contents(opt
, a
, c1
,
1862 &ci
->ren1
->src_entry
->stages
[ostage1
],
1864 opt
->branch1
, opt
->branch2
,
1865 1 + opt
->priv
->call_depth
* 2, &mfi_c1
) ||
1866 merge_mode_and_contents(opt
, b
,
1867 &ci
->ren2
->src_entry
->stages
[ostage2
],
1868 c2
, path_side_2_desc
,
1869 opt
->branch1
, opt
->branch2
,
1870 1 + opt
->priv
->call_depth
* 2, &mfi_c2
))
1872 free(path_side_1_desc
);
1873 free(path_side_2_desc
);
1874 mfi_c1
.blob
.path
= path
;
1875 mfi_c2
.blob
.path
= path
;
1877 return handle_file_collision(opt
, path
, a
->path
, b
->path
,
1878 ci
->ren1
->branch
, ci
->ren2
->branch
,
1879 &mfi_c1
.blob
, &mfi_c2
.blob
);
1883 * Get the diff_filepairs changed between o_tree and tree.
1885 static struct diff_queue_struct
*get_diffpairs(struct merge_options
*opt
,
1886 struct tree
*o_tree
,
1889 struct diff_queue_struct
*ret
;
1890 struct diff_options opts
;
1892 repo_diff_setup(opt
->repo
, &opts
);
1893 opts
.flags
.recursive
= 1;
1894 opts
.flags
.rename_empty
= 0;
1895 opts
.detect_rename
= merge_detect_rename(opt
);
1897 * We do not have logic to handle the detection of copies. In
1898 * fact, it may not even make sense to add such logic: would we
1899 * really want a change to a base file to be propagated through
1900 * multiple other files by a merge?
1902 if (opts
.detect_rename
> DIFF_DETECT_RENAME
)
1903 opts
.detect_rename
= DIFF_DETECT_RENAME
;
1904 opts
.rename_limit
= (opt
->rename_limit
>= 0) ? opt
->rename_limit
: 1000;
1905 opts
.rename_score
= opt
->rename_score
;
1906 opts
.show_rename_progress
= opt
->show_rename_progress
;
1907 opts
.output_format
= DIFF_FORMAT_NO_OUTPUT
;
1908 diff_setup_done(&opts
);
1909 diff_tree_oid(&o_tree
->object
.oid
, &tree
->object
.oid
, "", &opts
);
1910 diffcore_std(&opts
);
1911 if (opts
.needed_rename_limit
> opt
->priv
->needed_rename_limit
)
1912 opt
->priv
->needed_rename_limit
= opts
.needed_rename_limit
;
1914 ret
= xmalloc(sizeof(*ret
));
1915 *ret
= diff_queued_diff
;
1917 opts
.output_format
= DIFF_FORMAT_NO_OUTPUT
;
1918 diff_queued_diff
.nr
= 0;
1919 diff_queued_diff
.queue
= NULL
;
1924 static int tree_has_path(struct repository
*r
, struct tree
*tree
,
1927 struct object_id hashy
;
1928 unsigned short mode_o
;
1930 return !get_tree_entry(r
,
1931 &tree
->object
.oid
, path
,
1936 * Return a new string that replaces the beginning portion (which matches
1937 * entry->dir), with entry->new_dir. In perl-speak:
1938 * new_path_name = (old_path =~ s/entry->dir/entry->new_dir/);
1940 * Caller must ensure that old_path starts with entry->dir + '/'.
1942 static char *apply_dir_rename(struct dir_rename_entry
*entry
,
1943 const char *old_path
)
1945 struct strbuf new_path
= STRBUF_INIT
;
1948 if (entry
->non_unique_new_dir
)
1951 oldlen
= strlen(entry
->dir
);
1952 if (entry
->new_dir
.len
== 0)
1954 * If someone renamed/merged a subdirectory into the root
1955 * directory (e.g. 'some/subdir' -> ''), then we want to
1958 * as the rename; we need to make old_path + oldlen advance
1959 * past the '/' character.
1962 newlen
= entry
->new_dir
.len
+ (strlen(old_path
) - oldlen
) + 1;
1963 strbuf_grow(&new_path
, newlen
);
1964 strbuf_addbuf(&new_path
, &entry
->new_dir
);
1965 strbuf_addstr(&new_path
, &old_path
[oldlen
]);
1967 return strbuf_detach(&new_path
, NULL
);
1970 static void get_renamed_dir_portion(const char *old_path
, const char *new_path
,
1971 char **old_dir
, char **new_dir
)
1973 char *end_of_old
, *end_of_new
;
1975 /* Default return values: NULL, meaning no rename */
1981 * "a/b/c/d/e/foo.c" -> "a/b/some/thing/else/e/foo.c"
1982 * the "e/foo.c" part is the same, we just want to know that
1983 * "a/b/c/d" was renamed to "a/b/some/thing/else"
1984 * so, for this example, this function returns "a/b/c/d" in
1985 * *old_dir and "a/b/some/thing/else" in *new_dir.
1989 * If the basename of the file changed, we don't care. We want
1990 * to know which portion of the directory, if any, changed.
1992 end_of_old
= strrchr(old_path
, '/');
1993 end_of_new
= strrchr(new_path
, '/');
1996 * If end_of_old is NULL, old_path wasn't in a directory, so there
1997 * could not be a directory rename (our rule elsewhere that a
1998 * directory which still exists is not considered to have been
1999 * renamed means the root directory can never be renamed -- because
2000 * the root directory always exists).
2002 if (end_of_old
== NULL
)
2003 return; /* Note: *old_dir and *new_dir are still NULL */
2006 * If new_path contains no directory (end_of_new is NULL), then we
2007 * have a rename of old_path's directory to the root directory.
2009 if (end_of_new
== NULL
) {
2010 *old_dir
= xstrndup(old_path
, end_of_old
- old_path
);
2011 *new_dir
= xstrdup("");
2015 /* Find the first non-matching character traversing backwards */
2016 while (*--end_of_new
== *--end_of_old
&&
2017 end_of_old
!= old_path
&&
2018 end_of_new
!= new_path
)
2019 ; /* Do nothing; all in the while loop */
2022 * If both got back to the beginning of their strings, then the
2023 * directory didn't change at all, only the basename did.
2025 if (end_of_old
== old_path
&& end_of_new
== new_path
&&
2026 *end_of_old
== *end_of_new
)
2027 return; /* Note: *old_dir and *new_dir are still NULL */
2030 * If end_of_new got back to the beginning of its string, and
2031 * end_of_old got back to the beginning of some subdirectory, then
2032 * we have a rename/merge of a subdirectory into the root, which
2033 * needs slightly special handling.
2035 * Note: There is no need to consider the opposite case, with a
2036 * rename/merge of the root directory into some subdirectory
2037 * because as noted above the root directory always exists so it
2038 * cannot be considered to be renamed.
2040 if (end_of_new
== new_path
&&
2041 end_of_old
!= old_path
&& end_of_old
[-1] == '/') {
2042 *old_dir
= xstrndup(old_path
, --end_of_old
- old_path
);
2043 *new_dir
= xstrdup("");
2048 * We've found the first non-matching character in the directory
2049 * paths. That means the current characters we were looking at
2050 * were part of the first non-matching subdir name going back from
2051 * the end of the strings. Get the whole name by advancing both
2052 * end_of_old and end_of_new to the NEXT '/' character. That will
2053 * represent the entire directory rename.
2055 * The reason for the increment is cases like
2056 * a/b/star/foo/whatever.c -> a/b/tar/foo/random.c
2057 * After dropping the basename and going back to the first
2058 * non-matching character, we're now comparing:
2060 * and we want to be comparing:
2061 * a/b/star/ and a/b/tar/
2062 * but without the pre-increment, the one on the right would stay
2065 end_of_old
= strchr(++end_of_old
, '/');
2066 end_of_new
= strchr(++end_of_new
, '/');
2068 /* Copy the old and new directories into *old_dir and *new_dir. */
2069 *old_dir
= xstrndup(old_path
, end_of_old
- old_path
);
2070 *new_dir
= xstrndup(new_path
, end_of_new
- new_path
);
2073 static void remove_hashmap_entries(struct hashmap
*dir_renames
,
2074 struct string_list
*items_to_remove
)
2077 struct dir_rename_entry
*entry
;
2079 for (i
= 0; i
< items_to_remove
->nr
; i
++) {
2080 entry
= items_to_remove
->items
[i
].util
;
2081 hashmap_remove(dir_renames
, &entry
->ent
, NULL
);
2083 string_list_clear(items_to_remove
, 0);
2087 * See if there is a directory rename for path, and if there are any file
2088 * level conflicts for the renamed location. If there is a rename and
2089 * there are no conflicts, return the new name. Otherwise, return NULL.
2091 static char *handle_path_level_conflicts(struct merge_options
*opt
,
2093 struct dir_rename_entry
*entry
,
2094 struct hashmap
*collisions
,
2097 char *new_path
= NULL
;
2098 struct collision_entry
*collision_ent
;
2100 struct strbuf collision_paths
= STRBUF_INIT
;
2103 * entry has the mapping of old directory name to new directory name
2104 * that we want to apply to path.
2106 new_path
= apply_dir_rename(entry
, path
);
2109 /* This should only happen when entry->non_unique_new_dir set */
2110 if (!entry
->non_unique_new_dir
)
2111 BUG("entry->non_unqiue_dir not set and !new_path");
2112 output(opt
, 1, _("CONFLICT (directory rename split): "
2113 "Unclear where to place %s because directory "
2114 "%s was renamed to multiple other directories, "
2115 "with no destination getting a majority of the "
2123 * The caller needs to have ensured that it has pre-populated
2124 * collisions with all paths that map to new_path. Do a quick check
2125 * to ensure that's the case.
2127 collision_ent
= collision_find_entry(collisions
, new_path
);
2128 if (collision_ent
== NULL
)
2129 BUG("collision_ent is NULL");
2132 * Check for one-sided add/add/.../add conflicts, i.e.
2133 * where implicit renames from the other side doing
2134 * directory rename(s) can affect this side of history
2135 * to put multiple paths into the same location. Warn
2136 * and bail on directory renames for such paths.
2138 if (collision_ent
->reported_already
) {
2140 } else if (tree_has_path(opt
->repo
, tree
, new_path
)) {
2141 collision_ent
->reported_already
= 1;
2142 strbuf_add_separated_string_list(&collision_paths
, ", ",
2143 &collision_ent
->source_files
);
2144 output(opt
, 1, _("CONFLICT (implicit dir rename): Existing "
2145 "file/dir at %s in the way of implicit "
2146 "directory rename(s) putting the following "
2147 "path(s) there: %s."),
2148 new_path
, collision_paths
.buf
);
2150 } else if (collision_ent
->source_files
.nr
> 1) {
2151 collision_ent
->reported_already
= 1;
2152 strbuf_add_separated_string_list(&collision_paths
, ", ",
2153 &collision_ent
->source_files
);
2154 output(opt
, 1, _("CONFLICT (implicit dir rename): Cannot map "
2155 "more than one path to %s; implicit directory "
2156 "renames tried to put these paths there: %s"),
2157 new_path
, collision_paths
.buf
);
2161 /* Free memory we no longer need */
2162 strbuf_release(&collision_paths
);
2163 if (!clean
&& new_path
) {
2172 * There are a couple things we want to do at the directory level:
2173 * 1. Check for both sides renaming to the same thing, in order to avoid
2174 * implicit renaming of files that should be left in place. (See
2175 * testcase 6b in t6043 for details.)
2176 * 2. Prune directory renames if there are still files left in the
2177 * the original directory. These represent a partial directory rename,
2178 * i.e. a rename where only some of the files within the directory
2179 * were renamed elsewhere. (Technically, this could be done earlier
2180 * in get_directory_renames(), except that would prevent us from
2181 * doing the previous check and thus failing testcase 6b.)
2182 * 3. Check for rename/rename(1to2) conflicts (at the directory level).
2183 * In the future, we could potentially record this info as well and
2184 * omit reporting rename/rename(1to2) conflicts for each path within
2185 * the affected directories, thus cleaning up the merge output.
2186 * NOTE: We do NOT check for rename/rename(2to1) conflicts at the
2187 * directory level, because merging directories is fine. If it
2188 * causes conflicts for files within those merged directories, then
2189 * that should be detected at the individual path level.
2191 static void handle_directory_level_conflicts(struct merge_options
*opt
,
2192 struct hashmap
*dir_re_head
,
2194 struct hashmap
*dir_re_merge
,
2197 struct hashmap_iter iter
;
2198 struct dir_rename_entry
*head_ent
;
2199 struct dir_rename_entry
*merge_ent
;
2201 struct string_list remove_from_head
= STRING_LIST_INIT_NODUP
;
2202 struct string_list remove_from_merge
= STRING_LIST_INIT_NODUP
;
2204 hashmap_for_each_entry(dir_re_head
, &iter
, head_ent
,
2205 ent
/* member name */) {
2206 merge_ent
= dir_rename_find_entry(dir_re_merge
, head_ent
->dir
);
2208 !head_ent
->non_unique_new_dir
&&
2209 !merge_ent
->non_unique_new_dir
&&
2210 !strbuf_cmp(&head_ent
->new_dir
, &merge_ent
->new_dir
)) {
2211 /* 1. Renamed identically; remove it from both sides */
2212 string_list_append(&remove_from_head
,
2213 head_ent
->dir
)->util
= head_ent
;
2214 strbuf_release(&head_ent
->new_dir
);
2215 string_list_append(&remove_from_merge
,
2216 merge_ent
->dir
)->util
= merge_ent
;
2217 strbuf_release(&merge_ent
->new_dir
);
2218 } else if (tree_has_path(opt
->repo
, head
, head_ent
->dir
)) {
2219 /* 2. This wasn't a directory rename after all */
2220 string_list_append(&remove_from_head
,
2221 head_ent
->dir
)->util
= head_ent
;
2222 strbuf_release(&head_ent
->new_dir
);
2226 remove_hashmap_entries(dir_re_head
, &remove_from_head
);
2227 remove_hashmap_entries(dir_re_merge
, &remove_from_merge
);
2229 hashmap_for_each_entry(dir_re_merge
, &iter
, merge_ent
,
2230 ent
/* member name */) {
2231 head_ent
= dir_rename_find_entry(dir_re_head
, merge_ent
->dir
);
2232 if (tree_has_path(opt
->repo
, merge
, merge_ent
->dir
)) {
2233 /* 2. This wasn't a directory rename after all */
2234 string_list_append(&remove_from_merge
,
2235 merge_ent
->dir
)->util
= merge_ent
;
2236 } else if (head_ent
&&
2237 !head_ent
->non_unique_new_dir
&&
2238 !merge_ent
->non_unique_new_dir
) {
2239 /* 3. rename/rename(1to2) */
2241 * We can assume it's not rename/rename(1to1) because
2242 * that was case (1), already checked above. So we
2243 * know that head_ent->new_dir and merge_ent->new_dir
2244 * are different strings.
2246 output(opt
, 1, _("CONFLICT (rename/rename): "
2247 "Rename directory %s->%s in %s. "
2248 "Rename directory %s->%s in %s"),
2249 head_ent
->dir
, head_ent
->new_dir
.buf
, opt
->branch1
,
2250 head_ent
->dir
, merge_ent
->new_dir
.buf
, opt
->branch2
);
2251 string_list_append(&remove_from_head
,
2252 head_ent
->dir
)->util
= head_ent
;
2253 strbuf_release(&head_ent
->new_dir
);
2254 string_list_append(&remove_from_merge
,
2255 merge_ent
->dir
)->util
= merge_ent
;
2256 strbuf_release(&merge_ent
->new_dir
);
2260 remove_hashmap_entries(dir_re_head
, &remove_from_head
);
2261 remove_hashmap_entries(dir_re_merge
, &remove_from_merge
);
2264 static struct hashmap
*get_directory_renames(struct diff_queue_struct
*pairs
)
2266 struct hashmap
*dir_renames
;
2267 struct hashmap_iter iter
;
2268 struct dir_rename_entry
*entry
;
2272 * Typically, we think of a directory rename as all files from a
2273 * certain directory being moved to a target directory. However,
2274 * what if someone first moved two files from the original
2275 * directory in one commit, and then renamed the directory
2276 * somewhere else in a later commit? At merge time, we just know
2277 * that files from the original directory went to two different
2278 * places, and that the bulk of them ended up in the same place.
2279 * We want each directory rename to represent where the bulk of the
2280 * files from that directory end up; this function exists to find
2281 * where the bulk of the files went.
2283 * The first loop below simply iterates through the list of file
2284 * renames, finding out how often each directory rename pair
2285 * possibility occurs.
2287 dir_renames
= xmalloc(sizeof(*dir_renames
));
2288 dir_rename_init(dir_renames
);
2289 for (i
= 0; i
< pairs
->nr
; ++i
) {
2290 struct string_list_item
*item
;
2292 struct diff_filepair
*pair
= pairs
->queue
[i
];
2293 char *old_dir
, *new_dir
;
2295 /* File not part of directory rename if it wasn't renamed */
2296 if (pair
->status
!= 'R')
2299 get_renamed_dir_portion(pair
->one
->path
, pair
->two
->path
,
2300 &old_dir
, &new_dir
);
2302 /* Directory didn't change at all; ignore this one. */
2305 entry
= dir_rename_find_entry(dir_renames
, old_dir
);
2307 entry
= xmalloc(sizeof(*entry
));
2308 dir_rename_entry_init(entry
, old_dir
);
2309 hashmap_put(dir_renames
, &entry
->ent
);
2313 item
= string_list_lookup(&entry
->possible_new_dirs
, new_dir
);
2315 item
= string_list_insert(&entry
->possible_new_dirs
,
2317 item
->util
= xcalloc(1, sizeof(int));
2326 * For each directory with files moved out of it, we find out which
2327 * target directory received the most files so we can declare it to
2328 * be the "winning" target location for the directory rename. This
2329 * winner gets recorded in new_dir. If there is no winner
2330 * (multiple target directories received the same number of files),
2331 * we set non_unique_new_dir. Once we've determined the winner (or
2332 * that there is no winner), we no longer need possible_new_dirs.
2334 hashmap_for_each_entry(dir_renames
, &iter
, entry
,
2335 ent
/* member name */) {
2340 for (i
= 0; i
< entry
->possible_new_dirs
.nr
; i
++) {
2341 int *count
= entry
->possible_new_dirs
.items
[i
].util
;
2345 else if (*count
> max
) {
2347 best
= entry
->possible_new_dirs
.items
[i
].string
;
2351 entry
->non_unique_new_dir
= 1;
2353 assert(entry
->new_dir
.len
== 0);
2354 strbuf_addstr(&entry
->new_dir
, best
);
2357 * The relevant directory sub-portion of the original full
2358 * filepaths were xstrndup'ed before inserting into
2359 * possible_new_dirs, and instead of manually iterating the
2360 * list and free'ing each, just lie and tell
2361 * possible_new_dirs that it did the strdup'ing so that it
2362 * will free them for us.
2364 entry
->possible_new_dirs
.strdup_strings
= 1;
2365 string_list_clear(&entry
->possible_new_dirs
, 1);
2371 static struct dir_rename_entry
*check_dir_renamed(const char *path
,
2372 struct hashmap
*dir_renames
)
2374 char *temp
= xstrdup(path
);
2376 struct dir_rename_entry
*entry
= NULL
;
2378 while ((end
= strrchr(temp
, '/'))) {
2380 entry
= dir_rename_find_entry(dir_renames
, temp
);
2388 static void compute_collisions(struct hashmap
*collisions
,
2389 struct hashmap
*dir_renames
,
2390 struct diff_queue_struct
*pairs
)
2395 * Multiple files can be mapped to the same path due to directory
2396 * renames done by the other side of history. Since that other
2397 * side of history could have merged multiple directories into one,
2398 * if our side of history added the same file basename to each of
2399 * those directories, then all N of them would get implicitly
2400 * renamed by the directory rename detection into the same path,
2401 * and we'd get an add/add/.../add conflict, and all those adds
2402 * from *this* side of history. This is not representable in the
2403 * index, and users aren't going to easily be able to make sense of
2404 * it. So we need to provide a good warning about what's
2405 * happening, and fall back to no-directory-rename detection
2406 * behavior for those paths.
2408 * See testcases 9e and all of section 5 from t6043 for examples.
2410 collision_init(collisions
);
2412 for (i
= 0; i
< pairs
->nr
; ++i
) {
2413 struct dir_rename_entry
*dir_rename_ent
;
2414 struct collision_entry
*collision_ent
;
2416 struct diff_filepair
*pair
= pairs
->queue
[i
];
2418 if (pair
->status
!= 'A' && pair
->status
!= 'R')
2420 dir_rename_ent
= check_dir_renamed(pair
->two
->path
,
2422 if (!dir_rename_ent
)
2425 new_path
= apply_dir_rename(dir_rename_ent
, pair
->two
->path
);
2428 * dir_rename_ent->non_unique_new_path is true, which
2429 * means there is no directory rename for us to use,
2430 * which means it won't cause us any additional
2434 collision_ent
= collision_find_entry(collisions
, new_path
);
2435 if (!collision_ent
) {
2436 collision_ent
= xcalloc(1,
2437 sizeof(struct collision_entry
));
2438 hashmap_entry_init(&collision_ent
->ent
,
2440 hashmap_put(collisions
, &collision_ent
->ent
);
2441 collision_ent
->target_file
= new_path
;
2445 string_list_insert(&collision_ent
->source_files
,
2450 static char *check_for_directory_rename(struct merge_options
*opt
,
2453 struct hashmap
*dir_renames
,
2454 struct hashmap
*dir_rename_exclusions
,
2455 struct hashmap
*collisions
,
2458 char *new_path
= NULL
;
2459 struct dir_rename_entry
*entry
= check_dir_renamed(path
, dir_renames
);
2460 struct dir_rename_entry
*oentry
= NULL
;
2466 * This next part is a little weird. We do not want to do an
2467 * implicit rename into a directory we renamed on our side, because
2468 * that will result in a spurious rename/rename(1to2) conflict. An
2470 * Base commit: dumbdir/afile, otherdir/bfile
2471 * Side 1: smrtdir/afile, otherdir/bfile
2472 * Side 2: dumbdir/afile, dumbdir/bfile
2473 * Here, while working on Side 1, we could notice that otherdir was
2474 * renamed/merged to dumbdir, and change the diff_filepair for
2475 * otherdir/bfile into a rename into dumbdir/bfile. However, Side
2476 * 2 will notice the rename from dumbdir to smrtdir, and do the
2477 * transitive rename to move it from dumbdir/bfile to
2478 * smrtdir/bfile. That gives us bfile in dumbdir vs being in
2479 * smrtdir, a rename/rename(1to2) conflict. We really just want
2480 * the file to end up in smrtdir. And the way to achieve that is
2481 * to not let Side1 do the rename to dumbdir, since we know that is
2482 * the source of one of our directory renames.
2484 * That's why oentry and dir_rename_exclusions is here.
2486 * As it turns out, this also prevents N-way transient rename
2487 * confusion; See testcases 9c and 9d of t6043.
2489 oentry
= dir_rename_find_entry(dir_rename_exclusions
, entry
->new_dir
.buf
);
2491 output(opt
, 1, _("WARNING: Avoiding applying %s -> %s rename "
2492 "to %s, because %s itself was renamed."),
2493 entry
->dir
, entry
->new_dir
.buf
, path
, entry
->new_dir
.buf
);
2495 new_path
= handle_path_level_conflicts(opt
, path
, entry
,
2497 *clean_merge
&= (new_path
!= NULL
);
2503 static void apply_directory_rename_modifications(struct merge_options
*opt
,
2504 struct diff_filepair
*pair
,
2508 struct tree
*o_tree
,
2509 struct tree
*a_tree
,
2510 struct tree
*b_tree
,
2511 struct string_list
*entries
)
2513 struct string_list_item
*item
;
2514 int stage
= (tree
== a_tree
? 2 : 3);
2518 * In all cases where we can do directory rename detection,
2519 * unpack_trees() will have read pair->two->path into the
2520 * index and the working copy. We need to remove it so that
2521 * we can instead place it at new_path. It is guaranteed to
2522 * not be untracked (unpack_trees() would have errored out
2523 * saying the file would have been overwritten), but it might
2526 update_wd
= !was_dirty(opt
, pair
->two
->path
);
2528 output(opt
, 1, _("Refusing to lose dirty file at %s"),
2530 remove_file(opt
, 1, pair
->two
->path
, !update_wd
);
2532 /* Find or create a new re->dst_entry */
2533 item
= string_list_lookup(entries
, new_path
);
2536 * Since we're renaming on this side of history, and it's
2537 * due to a directory rename on the other side of history
2538 * (which we only allow when the directory in question no
2539 * longer exists on the other side of history), the
2540 * original entry for re->dst_entry is no longer
2543 re
->dst_entry
->processed
= 1;
2546 * ...because we'll be using this new one.
2548 re
->dst_entry
= item
->util
;
2551 * re->dst_entry is for the before-dir-rename path, and we
2552 * need it to hold information for the after-dir-rename
2553 * path. Before creating a new entry, we need to mark the
2554 * old one as unnecessary (...unless it is shared by
2555 * src_entry, i.e. this didn't use to be a rename, in which
2556 * case we can just allow the normal processing to happen
2559 if (pair
->status
== 'R')
2560 re
->dst_entry
->processed
= 1;
2562 re
->dst_entry
= insert_stage_data(opt
->repo
, new_path
,
2563 o_tree
, a_tree
, b_tree
,
2565 item
= string_list_insert(entries
, new_path
);
2566 item
->util
= re
->dst_entry
;
2570 * Update the stage_data with the information about the path we are
2571 * moving into place. That slot will be empty and available for us
2572 * to write to because of the collision checks in
2573 * handle_path_level_conflicts(). In other words,
2574 * re->dst_entry->stages[stage].oid will be the null_oid, so it's
2575 * open for us to write to.
2577 * It may be tempting to actually update the index at this point as
2578 * well, using update_stages_for_stage_data(), but as per the big
2579 * "NOTE" in update_stages(), doing so will modify the current
2580 * in-memory index which will break calls to would_lose_untracked()
2581 * that we need to make. Instead, we need to just make sure that
2582 * the various handle_rename_*() functions update the index
2583 * explicitly rather than relying on unpack_trees() to have done it.
2585 get_tree_entry(opt
->repo
,
2588 &re
->dst_entry
->stages
[stage
].oid
,
2589 &re
->dst_entry
->stages
[stage
].mode
);
2592 * Record the original change status (or 'type' of change). If it
2593 * was originally an add ('A'), this lets us differentiate later
2594 * between a RENAME_DELETE conflict and RENAME_VIA_DIR (they
2595 * otherwise look the same). If it was originally a rename ('R'),
2596 * this lets us remember and report accurately about the transitive
2597 * renaming that occurred via the directory rename detection. Also,
2598 * record the original destination name.
2600 re
->dir_rename_original_type
= pair
->status
;
2601 re
->dir_rename_original_dest
= pair
->two
->path
;
2604 * We don't actually look at pair->status again, but it seems
2605 * pedagogically correct to adjust it.
2610 * Finally, record the new location.
2612 pair
->two
->path
= new_path
;
2616 * Get information of all renames which occurred in 'pairs', making use of
2617 * any implicit directory renames inferred from the other side of history.
2618 * We need the three trees in the merge ('o_tree', 'a_tree' and 'b_tree')
2619 * to be able to associate the correct cache entries with the rename
2620 * information; tree is always equal to either a_tree or b_tree.
2622 static struct string_list
*get_renames(struct merge_options
*opt
,
2624 struct diff_queue_struct
*pairs
,
2625 struct hashmap
*dir_renames
,
2626 struct hashmap
*dir_rename_exclusions
,
2628 struct tree
*o_tree
,
2629 struct tree
*a_tree
,
2630 struct tree
*b_tree
,
2631 struct string_list
*entries
,
2635 struct hashmap collisions
;
2636 struct hashmap_iter iter
;
2637 struct collision_entry
*e
;
2638 struct string_list
*renames
;
2640 compute_collisions(&collisions
, dir_renames
, pairs
);
2641 renames
= xcalloc(1, sizeof(struct string_list
));
2643 for (i
= 0; i
< pairs
->nr
; ++i
) {
2644 struct string_list_item
*item
;
2646 struct diff_filepair
*pair
= pairs
->queue
[i
];
2647 char *new_path
; /* non-NULL only with directory renames */
2649 if (pair
->status
!= 'A' && pair
->status
!= 'R') {
2650 diff_free_filepair(pair
);
2653 new_path
= check_for_directory_rename(opt
, pair
->two
->path
, tree
,
2655 dir_rename_exclusions
,
2658 if (pair
->status
!= 'R' && !new_path
) {
2659 diff_free_filepair(pair
);
2663 re
= xmalloc(sizeof(*re
));
2666 re
->branch
= branch
;
2667 re
->dir_rename_original_type
= '\0';
2668 re
->dir_rename_original_dest
= NULL
;
2669 item
= string_list_lookup(entries
, re
->pair
->one
->path
);
2671 re
->src_entry
= insert_stage_data(opt
->repo
,
2672 re
->pair
->one
->path
,
2673 o_tree
, a_tree
, b_tree
, entries
);
2675 re
->src_entry
= item
->util
;
2677 item
= string_list_lookup(entries
, re
->pair
->two
->path
);
2679 re
->dst_entry
= insert_stage_data(opt
->repo
,
2680 re
->pair
->two
->path
,
2681 o_tree
, a_tree
, b_tree
, entries
);
2683 re
->dst_entry
= item
->util
;
2684 item
= string_list_insert(renames
, pair
->one
->path
);
2687 apply_directory_rename_modifications(opt
, pair
, new_path
,
2693 hashmap_for_each_entry(&collisions
, &iter
, e
,
2694 ent
/* member name */) {
2695 free(e
->target_file
);
2696 string_list_clear(&e
->source_files
, 0);
2698 hashmap_free_entries(&collisions
, struct collision_entry
, ent
);
2702 static int process_renames(struct merge_options
*opt
,
2703 struct string_list
*a_renames
,
2704 struct string_list
*b_renames
)
2706 int clean_merge
= 1, i
, j
;
2707 struct string_list a_by_dst
= STRING_LIST_INIT_NODUP
;
2708 struct string_list b_by_dst
= STRING_LIST_INIT_NODUP
;
2709 const struct rename
*sre
;
2711 for (i
= 0; i
< a_renames
->nr
; i
++) {
2712 sre
= a_renames
->items
[i
].util
;
2713 string_list_insert(&a_by_dst
, sre
->pair
->two
->path
)->util
2716 for (i
= 0; i
< b_renames
->nr
; i
++) {
2717 sre
= b_renames
->items
[i
].util
;
2718 string_list_insert(&b_by_dst
, sre
->pair
->two
->path
)->util
2722 for (i
= 0, j
= 0; i
< a_renames
->nr
|| j
< b_renames
->nr
;) {
2723 struct string_list
*renames1
, *renames2Dst
;
2724 struct rename
*ren1
= NULL
, *ren2
= NULL
;
2725 const char *ren1_src
, *ren1_dst
;
2726 struct string_list_item
*lookup
;
2728 if (i
>= a_renames
->nr
) {
2729 ren2
= b_renames
->items
[j
++].util
;
2730 } else if (j
>= b_renames
->nr
) {
2731 ren1
= a_renames
->items
[i
++].util
;
2733 int compare
= strcmp(a_renames
->items
[i
].string
,
2734 b_renames
->items
[j
].string
);
2736 ren1
= a_renames
->items
[i
++].util
;
2738 ren2
= b_renames
->items
[j
++].util
;
2741 /* TODO: refactor, so that 1/2 are not needed */
2743 renames1
= a_renames
;
2744 renames2Dst
= &b_by_dst
;
2746 renames1
= b_renames
;
2747 renames2Dst
= &a_by_dst
;
2751 if (ren1
->processed
)
2753 ren1
->processed
= 1;
2754 ren1
->dst_entry
->processed
= 1;
2755 /* BUG: We should only mark src_entry as processed if we
2756 * are not dealing with a rename + add-source case.
2758 ren1
->src_entry
->processed
= 1;
2760 ren1_src
= ren1
->pair
->one
->path
;
2761 ren1_dst
= ren1
->pair
->two
->path
;
2764 /* One file renamed on both sides */
2765 const char *ren2_src
= ren2
->pair
->one
->path
;
2766 const char *ren2_dst
= ren2
->pair
->two
->path
;
2767 enum rename_type rename_type
;
2768 if (strcmp(ren1_src
, ren2_src
) != 0)
2769 BUG("ren1_src != ren2_src");
2770 ren2
->dst_entry
->processed
= 1;
2771 ren2
->processed
= 1;
2772 if (strcmp(ren1_dst
, ren2_dst
) != 0) {
2773 rename_type
= RENAME_ONE_FILE_TO_TWO
;
2776 rename_type
= RENAME_ONE_FILE_TO_ONE
;
2777 /* BUG: We should only remove ren1_src in
2778 * the base stage (think of rename +
2779 * add-source cases).
2781 remove_file(opt
, 1, ren1_src
, 1);
2782 update_entry(ren1
->dst_entry
,
2787 setup_rename_conflict_info(rename_type
, opt
, ren1
, ren2
);
2788 } else if ((lookup
= string_list_lookup(renames2Dst
, ren1_dst
))) {
2789 /* Two different files renamed to the same thing */
2791 ren2
= lookup
->util
;
2792 ren2_dst
= ren2
->pair
->two
->path
;
2793 if (strcmp(ren1_dst
, ren2_dst
) != 0)
2794 BUG("ren1_dst != ren2_dst");
2797 ren2
->processed
= 1;
2799 * BUG: We should only mark src_entry as processed
2800 * if we are not dealing with a rename + add-source
2803 ren2
->src_entry
->processed
= 1;
2805 setup_rename_conflict_info(RENAME_TWO_FILES_TO_ONE
,
2808 /* Renamed in 1, maybe changed in 2 */
2809 /* we only use sha1 and mode of these */
2810 struct diff_filespec src_other
, dst_other
;
2814 * unpack_trees loads entries from common-commit
2815 * into stage 1, from head-commit into stage 2, and
2816 * from merge-commit into stage 3. We keep track
2817 * of which side corresponds to the rename.
2819 int renamed_stage
= a_renames
== renames1
? 2 : 3;
2820 int other_stage
= a_renames
== renames1
? 3 : 2;
2822 /* BUG: We should only remove ren1_src in the base
2823 * stage and in other_stage (think of rename +
2826 remove_file(opt
, 1, ren1_src
,
2827 renamed_stage
== 2 || !was_tracked(opt
, ren1_src
));
2829 oidcpy(&src_other
.oid
,
2830 &ren1
->src_entry
->stages
[other_stage
].oid
);
2831 src_other
.mode
= ren1
->src_entry
->stages
[other_stage
].mode
;
2832 oidcpy(&dst_other
.oid
,
2833 &ren1
->dst_entry
->stages
[other_stage
].oid
);
2834 dst_other
.mode
= ren1
->dst_entry
->stages
[other_stage
].mode
;
2837 if (oideq(&src_other
.oid
, &null_oid
) &&
2838 ren1
->dir_rename_original_type
== 'A') {
2839 setup_rename_conflict_info(RENAME_VIA_DIR
,
2841 } else if (oideq(&src_other
.oid
, &null_oid
)) {
2842 setup_rename_conflict_info(RENAME_DELETE
,
2844 } else if ((dst_other
.mode
== ren1
->pair
->two
->mode
) &&
2845 oideq(&dst_other
.oid
, &ren1
->pair
->two
->oid
)) {
2847 * Added file on the other side identical to
2848 * the file being renamed: clean merge.
2849 * Also, there is no need to overwrite the
2850 * file already in the working copy, so call
2851 * update_file_flags() instead of
2854 if (update_file_flags(opt
,
2857 1, /* update_cache */
2860 } else if (!oideq(&dst_other
.oid
, &null_oid
)) {
2862 * Probably not a clean merge, but it's
2863 * premature to set clean_merge to 0 here,
2864 * because if the rename merges cleanly and
2865 * the merge exactly matches the newly added
2866 * file, then the merge will be clean.
2868 setup_rename_conflict_info(RENAME_ADD
,
2873 if (clean_merge
< 0)
2874 goto cleanup_and_return
;
2876 struct diff_filespec
*o
, *a
, *b
;
2877 src_other
.path
= (char *)ren1_src
;
2879 o
= ren1
->pair
->one
;
2880 if (a_renames
== renames1
) {
2881 a
= ren1
->pair
->two
;
2884 b
= ren1
->pair
->two
;
2887 update_entry(ren1
->dst_entry
, o
, a
, b
);
2888 setup_rename_conflict_info(RENAME_NORMAL
,
2894 string_list_clear(&a_by_dst
, 0);
2895 string_list_clear(&b_by_dst
, 0);
2900 struct rename_info
{
2901 struct string_list
*head_renames
;
2902 struct string_list
*merge_renames
;
2905 static void initial_cleanup_rename(struct diff_queue_struct
*pairs
,
2906 struct hashmap
*dir_renames
)
2908 struct hashmap_iter iter
;
2909 struct dir_rename_entry
*e
;
2911 hashmap_for_each_entry(dir_renames
, &iter
, e
,
2912 ent
/* member name */) {
2914 strbuf_release(&e
->new_dir
);
2915 /* possible_new_dirs already cleared in get_directory_renames */
2917 hashmap_free_entries(dir_renames
, struct dir_rename_entry
, ent
);
2924 static int detect_and_process_renames(struct merge_options
*opt
,
2925 struct tree
*common
,
2928 struct string_list
*entries
,
2929 struct rename_info
*ri
)
2931 struct diff_queue_struct
*head_pairs
, *merge_pairs
;
2932 struct hashmap
*dir_re_head
, *dir_re_merge
;
2935 ri
->head_renames
= NULL
;
2936 ri
->merge_renames
= NULL
;
2938 if (!merge_detect_rename(opt
))
2941 head_pairs
= get_diffpairs(opt
, common
, head
);
2942 merge_pairs
= get_diffpairs(opt
, common
, merge
);
2944 if ((opt
->detect_directory_renames
== MERGE_DIRECTORY_RENAMES_TRUE
) ||
2945 (opt
->detect_directory_renames
== MERGE_DIRECTORY_RENAMES_CONFLICT
&&
2946 !opt
->priv
->call_depth
)) {
2947 dir_re_head
= get_directory_renames(head_pairs
);
2948 dir_re_merge
= get_directory_renames(merge_pairs
);
2950 handle_directory_level_conflicts(opt
,
2952 dir_re_merge
, merge
);
2954 dir_re_head
= xmalloc(sizeof(*dir_re_head
));
2955 dir_re_merge
= xmalloc(sizeof(*dir_re_merge
));
2956 dir_rename_init(dir_re_head
);
2957 dir_rename_init(dir_re_merge
);
2960 ri
->head_renames
= get_renames(opt
, opt
->branch1
, head_pairs
,
2961 dir_re_merge
, dir_re_head
, head
,
2962 common
, head
, merge
, entries
,
2966 ri
->merge_renames
= get_renames(opt
, opt
->branch2
, merge_pairs
,
2967 dir_re_head
, dir_re_merge
, merge
,
2968 common
, head
, merge
, entries
,
2972 clean
&= process_renames(opt
, ri
->head_renames
, ri
->merge_renames
);
2976 * Some cleanup is deferred until cleanup_renames() because the
2977 * data structures are still needed and referenced in
2978 * process_entry(). But there are a few things we can free now.
2980 initial_cleanup_rename(head_pairs
, dir_re_head
);
2981 initial_cleanup_rename(merge_pairs
, dir_re_merge
);
2986 static void final_cleanup_rename(struct string_list
*rename
)
2988 const struct rename
*re
;
2994 for (i
= 0; i
< rename
->nr
; i
++) {
2995 re
= rename
->items
[i
].util
;
2996 diff_free_filepair(re
->pair
);
2998 string_list_clear(rename
, 1);
3002 static void final_cleanup_renames(struct rename_info
*re_info
)
3004 final_cleanup_rename(re_info
->head_renames
);
3005 final_cleanup_rename(re_info
->merge_renames
);
3008 static int read_oid_strbuf(struct merge_options
*opt
,
3009 const struct object_id
*oid
,
3013 enum object_type type
;
3015 buf
= read_object_file(oid
, &type
, &size
);
3017 return err(opt
, _("cannot read object %s"), oid_to_hex(oid
));
3018 if (type
!= OBJ_BLOB
) {
3020 return err(opt
, _("object %s is not a blob"), oid_to_hex(oid
));
3022 strbuf_attach(dst
, buf
, size
, size
+ 1);
3026 static int blob_unchanged(struct merge_options
*opt
,
3027 const struct diff_filespec
*o
,
3028 const struct diff_filespec
*a
,
3029 int renormalize
, const char *path
)
3031 struct strbuf obuf
= STRBUF_INIT
;
3032 struct strbuf abuf
= STRBUF_INIT
;
3033 int ret
= 0; /* assume changed for safety */
3034 const struct index_state
*idx
= opt
->repo
->index
;
3036 if (a
->mode
!= o
->mode
)
3038 if (oideq(&o
->oid
, &a
->oid
))
3043 if (read_oid_strbuf(opt
, &o
->oid
, &obuf
) ||
3044 read_oid_strbuf(opt
, &a
->oid
, &abuf
))
3047 * Note: binary | is used so that both renormalizations are
3048 * performed. Comparison can be skipped if both files are
3049 * unchanged since their sha1s have already been compared.
3051 if (renormalize_buffer(idx
, path
, obuf
.buf
, obuf
.len
, &obuf
) |
3052 renormalize_buffer(idx
, path
, abuf
.buf
, abuf
.len
, &abuf
))
3053 ret
= (obuf
.len
== abuf
.len
&& !memcmp(obuf
.buf
, abuf
.buf
, obuf
.len
));
3056 strbuf_release(&obuf
);
3057 strbuf_release(&abuf
);
3061 static int handle_modify_delete(struct merge_options
*opt
,
3063 const struct diff_filespec
*o
,
3064 const struct diff_filespec
*a
,
3065 const struct diff_filespec
*b
)
3067 const char *modify_branch
, *delete_branch
;
3068 const struct diff_filespec
*changed
;
3071 modify_branch
= opt
->branch1
;
3072 delete_branch
= opt
->branch2
;
3075 modify_branch
= opt
->branch2
;
3076 delete_branch
= opt
->branch1
;
3080 return handle_change_delete(opt
,
3083 modify_branch
, delete_branch
,
3084 _("modify"), _("modified"));
3087 static int handle_content_merge(struct merge_file_info
*mfi
,
3088 struct merge_options
*opt
,
3091 const struct diff_filespec
*o
,
3092 const struct diff_filespec
*a
,
3093 const struct diff_filespec
*b
,
3094 struct rename_conflict_info
*ci
)
3096 const char *reason
= _("content");
3097 unsigned df_conflict_remains
= 0;
3100 reason
= _("add/add");
3102 assert(o
->path
&& a
->path
&& b
->path
);
3103 if (ci
&& dir_in_way(opt
->repo
->index
, path
, !opt
->priv
->call_depth
,
3104 S_ISGITLINK(ci
->ren1
->pair
->two
->mode
)))
3105 df_conflict_remains
= 1;
3107 if (merge_mode_and_contents(opt
, o
, a
, b
, path
,
3108 opt
->branch1
, opt
->branch2
,
3109 opt
->priv
->call_depth
* 2, mfi
))
3113 * We can skip updating the working tree file iff:
3114 * a) The merge is clean
3115 * b) The merge matches what was in HEAD (content, mode, pathname)
3116 * c) The target path is usable (i.e. not involved in D/F conflict)
3118 if (mfi
->clean
&& was_tracked_and_matches(opt
, path
, &mfi
->blob
) &&
3119 !df_conflict_remains
) {
3121 struct cache_entry
*ce
;
3123 output(opt
, 3, _("Skipped %s (merged same as existing)"), path
);
3124 if (add_cacheinfo(opt
, &mfi
->blob
, path
,
3125 0, (!opt
->priv
->call_depth
&& !is_dirty
), 0))
3128 * However, add_cacheinfo() will delete the old cache entry
3129 * and add a new one. We need to copy over any skip_worktree
3130 * flag to avoid making the file appear as if it were
3131 * deleted by the user.
3133 pos
= index_name_pos(&opt
->priv
->orig_index
, path
, strlen(path
));
3134 ce
= opt
->priv
->orig_index
.cache
[pos
];
3135 if (ce_skip_worktree(ce
)) {
3136 pos
= index_name_pos(opt
->repo
->index
, path
, strlen(path
));
3137 ce
= opt
->repo
->index
->cache
[pos
];
3138 ce
->ce_flags
|= CE_SKIP_WORKTREE
;
3144 if (S_ISGITLINK(mfi
->blob
.mode
))
3145 reason
= _("submodule");
3146 output(opt
, 1, _("CONFLICT (%s): Merge conflict in %s"),
3148 if (ci
&& !df_conflict_remains
)
3149 if (update_stages(opt
, path
, o
, a
, b
))
3153 if (df_conflict_remains
|| is_dirty
) {
3155 if (opt
->priv
->call_depth
) {
3156 remove_file_from_index(opt
->repo
->index
, path
);
3159 if (update_stages(opt
, path
, o
, a
, b
))
3162 int file_from_stage2
= was_tracked(opt
, path
);
3164 if (update_stages(opt
, path
, NULL
,
3165 file_from_stage2
? &mfi
->blob
: NULL
,
3166 file_from_stage2
? NULL
: &mfi
->blob
))
3171 new_path
= unique_path(opt
, path
, ci
->ren1
->branch
);
3173 output(opt
, 1, _("Refusing to lose dirty file at %s"),
3176 output(opt
, 1, _("Adding as %s instead"), new_path
);
3177 if (update_file(opt
, 0, &mfi
->blob
, new_path
)) {
3183 } else if (update_file(opt
, mfi
->clean
, &mfi
->blob
, path
))
3185 return !is_dirty
&& mfi
->clean
;
3188 static int handle_rename_normal(struct merge_options
*opt
,
3190 const struct diff_filespec
*o
,
3191 const struct diff_filespec
*a
,
3192 const struct diff_filespec
*b
,
3193 struct rename_conflict_info
*ci
)
3195 struct rename
*ren
= ci
->ren1
;
3196 struct merge_file_info mfi
;
3198 int side
= (ren
->branch
== opt
->branch1
? 2 : 3);
3200 /* Merge the content and write it out */
3201 clean
= handle_content_merge(&mfi
, opt
, path
, was_dirty(opt
, path
),
3205 opt
->detect_directory_renames
== MERGE_DIRECTORY_RENAMES_CONFLICT
&&
3206 ren
->dir_rename_original_dest
) {
3207 if (update_stages(opt
, path
,
3209 side
== 2 ? &mfi
.blob
: NULL
,
3210 side
== 2 ? NULL
: &mfi
.blob
))
3212 clean
= 0; /* not clean, but conflicted */
3217 static void dir_rename_warning(const char *msg
,
3220 struct merge_options
*opt
,
3223 const char *other_branch
;
3224 other_branch
= (ren
->branch
== opt
->branch1
?
3225 opt
->branch2
: opt
->branch1
);
3227 output(opt
, clean
? 2 : 1, msg
,
3228 ren
->pair
->one
->path
, ren
->branch
,
3229 other_branch
, ren
->pair
->two
->path
);
3232 output(opt
, clean
? 2 : 1, msg
,
3233 ren
->pair
->one
->path
, ren
->dir_rename_original_dest
, ren
->branch
,
3234 other_branch
, ren
->pair
->two
->path
);
3236 static int warn_about_dir_renamed_entries(struct merge_options
*opt
,
3240 int clean
= 1, is_add
;
3245 /* Return early if ren was not affected/created by a directory rename */
3246 if (!ren
->dir_rename_original_dest
)
3250 assert(opt
->detect_directory_renames
> MERGE_DIRECTORY_RENAMES_NONE
);
3251 assert(ren
->dir_rename_original_type
== 'A' ||
3252 ren
->dir_rename_original_type
== 'R');
3254 /* Check whether to treat directory renames as a conflict */
3255 clean
= (opt
->detect_directory_renames
== MERGE_DIRECTORY_RENAMES_TRUE
);
3257 is_add
= (ren
->dir_rename_original_type
== 'A');
3258 if (ren
->dir_rename_original_type
== 'A' && clean
) {
3259 msg
= _("Path updated: %s added in %s inside a "
3260 "directory that was renamed in %s; moving it to %s.");
3261 } else if (ren
->dir_rename_original_type
== 'A' && !clean
) {
3262 msg
= _("CONFLICT (file location): %s added in %s "
3263 "inside a directory that was renamed in %s, "
3264 "suggesting it should perhaps be moved to %s.");
3265 } else if (ren
->dir_rename_original_type
== 'R' && clean
) {
3266 msg
= _("Path updated: %s renamed to %s in %s, inside a "
3267 "directory that was renamed in %s; moving it to %s.");
3268 } else if (ren
->dir_rename_original_type
== 'R' && !clean
) {
3269 msg
= _("CONFLICT (file location): %s renamed to %s in %s, "
3270 "inside a directory that was renamed in %s, "
3271 "suggesting it should perhaps be moved to %s.");
3273 BUG("Impossible dir_rename_original_type/clean combination");
3275 dir_rename_warning(msg
, is_add
, clean
, opt
, ren
);
3280 /* Per entry merge function */
3281 static int process_entry(struct merge_options
*opt
,
3282 const char *path
, struct stage_data
*entry
)
3284 int clean_merge
= 1;
3285 int normalize
= opt
->renormalize
;
3287 struct diff_filespec
*o
= &entry
->stages
[1];
3288 struct diff_filespec
*a
= &entry
->stages
[2];
3289 struct diff_filespec
*b
= &entry
->stages
[3];
3290 int o_valid
= is_valid(o
);
3291 int a_valid
= is_valid(a
);
3292 int b_valid
= is_valid(b
);
3293 o
->path
= a
->path
= b
->path
= (char*)path
;
3295 entry
->processed
= 1;
3296 if (entry
->rename_conflict_info
) {
3297 struct rename_conflict_info
*ci
= entry
->rename_conflict_info
;
3298 struct diff_filespec
*temp
;
3301 path_clean
= warn_about_dir_renamed_entries(opt
, ci
->ren1
);
3302 path_clean
&= warn_about_dir_renamed_entries(opt
, ci
->ren2
);
3305 * For cases with a single rename, {o,a,b}->path have all been
3306 * set to the rename target path; we need to set two of these
3307 * back to the rename source.
3308 * For rename/rename conflicts, we'll manually fix paths below.
3310 temp
= (opt
->branch1
== ci
->ren1
->branch
) ? b
: a
;
3311 o
->path
= temp
->path
= ci
->ren1
->pair
->one
->path
;
3313 assert(opt
->branch1
== ci
->ren1
->branch
);
3316 switch (ci
->rename_type
) {
3318 case RENAME_ONE_FILE_TO_ONE
:
3319 clean_merge
= handle_rename_normal(opt
, path
, o
, a
, b
,
3322 case RENAME_VIA_DIR
:
3323 clean_merge
= handle_rename_via_dir(opt
, ci
);
3327 * Probably unclean merge, but if the renamed file
3328 * merges cleanly and the result can then be
3329 * two-way merged cleanly with the added file, I
3330 * guess it's a clean merge?
3332 clean_merge
= handle_rename_add(opt
, ci
);
3336 if (handle_rename_delete(opt
, ci
))
3339 case RENAME_ONE_FILE_TO_TWO
:
3341 * Manually fix up paths; note:
3342 * ren[12]->pair->one->path are equal.
3344 o
->path
= ci
->ren1
->pair
->one
->path
;
3345 a
->path
= ci
->ren1
->pair
->two
->path
;
3346 b
->path
= ci
->ren2
->pair
->two
->path
;
3349 if (handle_rename_rename_1to2(opt
, ci
))
3352 case RENAME_TWO_FILES_TO_ONE
:
3354 * Manually fix up paths; note,
3355 * ren[12]->pair->two->path are actually equal.
3358 a
->path
= ci
->ren1
->pair
->two
->path
;
3359 b
->path
= ci
->ren2
->pair
->two
->path
;
3362 * Probably unclean merge, but if the two renamed
3363 * files merge cleanly and the two resulting files
3364 * can then be two-way merged cleanly, I guess it's
3367 clean_merge
= handle_rename_rename_2to1(opt
, ci
);
3370 entry
->processed
= 0;
3373 if (path_clean
< clean_merge
)
3374 clean_merge
= path_clean
;
3375 } else if (o_valid
&& (!a_valid
|| !b_valid
)) {
3376 /* Case A: Deleted in one */
3377 if ((!a_valid
&& !b_valid
) ||
3378 (!b_valid
&& blob_unchanged(opt
, o
, a
, normalize
, path
)) ||
3379 (!a_valid
&& blob_unchanged(opt
, o
, b
, normalize
, path
))) {
3380 /* Deleted in both or deleted in one and
3381 * unchanged in the other */
3383 output(opt
, 2, _("Removing %s"), path
);
3384 /* do not touch working file if it did not exist */
3385 remove_file(opt
, 1, path
, !a_valid
);
3387 /* Modify/delete; deleted side may have put a directory in the way */
3389 if (handle_modify_delete(opt
, path
, o
, a
, b
))
3392 } else if ((!o_valid
&& a_valid
&& !b_valid
) ||
3393 (!o_valid
&& !a_valid
&& b_valid
)) {
3394 /* Case B: Added in one. */
3395 /* [nothing|directory] -> ([nothing|directory], file) */
3397 const char *add_branch
;
3398 const char *other_branch
;
3400 const struct diff_filespec
*contents
;
3403 add_branch
= opt
->branch1
;
3404 other_branch
= opt
->branch2
;
3406 conf
= _("file/directory");
3408 add_branch
= opt
->branch2
;
3409 other_branch
= opt
->branch1
;
3411 conf
= _("directory/file");
3413 if (dir_in_way(opt
->repo
->index
, path
,
3414 !opt
->priv
->call_depth
&& !S_ISGITLINK(a
->mode
),
3416 char *new_path
= unique_path(opt
, path
, add_branch
);
3418 output(opt
, 1, _("CONFLICT (%s): There is a directory with name %s in %s. "
3420 conf
, path
, other_branch
, path
, new_path
);
3421 if (update_file(opt
, 0, contents
, new_path
))
3423 else if (opt
->priv
->call_depth
)
3424 remove_file_from_index(opt
->repo
->index
, path
);
3427 output(opt
, 2, _("Adding %s"), path
);
3428 /* do not overwrite file if already present */
3429 if (update_file_flags(opt
, contents
, path
, 1, !a_valid
))
3432 } else if (a_valid
&& b_valid
) {
3434 /* Case C: Added in both (check for same permissions) */
3436 _("CONFLICT (add/add): Merge conflict in %s"),
3438 clean_merge
= handle_file_collision(opt
,
3444 /* case D: Modified in both, but differently. */
3445 struct merge_file_info mfi
;
3446 int is_dirty
= 0; /* unpack_trees would have bailed if dirty */
3447 clean_merge
= handle_content_merge(&mfi
, opt
, path
,
3451 } else if (!o_valid
&& !a_valid
&& !b_valid
) {
3453 * this entry was deleted altogether. a_mode == 0 means
3454 * we had that path and want to actively remove it.
3456 remove_file(opt
, 1, path
, !a
->mode
);
3458 BUG("fatal merge failure, shouldn't happen.");
3463 static int merge_trees_internal(struct merge_options
*opt
,
3466 struct tree
*merge_base
,
3467 struct tree
**result
)
3469 struct index_state
*istate
= opt
->repo
->index
;
3472 if (opt
->subtree_shift
) {
3473 merge
= shift_tree_object(opt
->repo
, head
, merge
,
3474 opt
->subtree_shift
);
3475 merge_base
= shift_tree_object(opt
->repo
, head
, merge_base
,
3476 opt
->subtree_shift
);
3479 if (oideq(&merge_base
->object
.oid
, &merge
->object
.oid
)) {
3480 output(opt
, 0, _("Already up to date!"));
3485 code
= unpack_trees_start(opt
, merge_base
, head
, merge
);
3488 if (show(opt
, 4) || opt
->priv
->call_depth
)
3489 err(opt
, _("merging of trees %s and %s failed"),
3490 oid_to_hex(&head
->object
.oid
),
3491 oid_to_hex(&merge
->object
.oid
));
3492 unpack_trees_finish(opt
);
3496 if (unmerged_index(istate
)) {
3497 struct string_list
*entries
;
3498 struct rename_info re_info
;
3501 * Only need the hashmap while processing entries, so
3502 * initialize it here and free it when we are done running
3503 * through the entries. Keeping it in the merge_options as
3504 * opposed to decaring a local hashmap is for convenience
3505 * so that we don't have to pass it to around.
3507 hashmap_init(&opt
->priv
->current_file_dir_set
, path_hashmap_cmp
,
3509 get_files_dirs(opt
, head
);
3510 get_files_dirs(opt
, merge
);
3512 entries
= get_unmerged(opt
->repo
->index
);
3513 clean
= detect_and_process_renames(opt
, merge_base
, head
, merge
,
3515 record_df_conflict_files(opt
, entries
);
3518 for (i
= entries
->nr
-1; 0 <= i
; i
--) {
3519 const char *path
= entries
->items
[i
].string
;
3520 struct stage_data
*e
= entries
->items
[i
].util
;
3521 if (!e
->processed
) {
3522 int ret
= process_entry(opt
, path
, e
);
3531 for (i
= 0; i
< entries
->nr
; i
++) {
3532 struct stage_data
*e
= entries
->items
[i
].util
;
3534 BUG("unprocessed path??? %s",
3535 entries
->items
[i
].string
);
3539 final_cleanup_renames(&re_info
);
3541 string_list_clear(entries
, 1);
3544 hashmap_free_entries(&opt
->priv
->current_file_dir_set
,
3545 struct path_hashmap_entry
, e
);
3548 unpack_trees_finish(opt
);
3555 unpack_trees_finish(opt
);
3557 if (opt
->priv
->call_depth
&&
3558 !(*result
= write_in_core_index_as_tree(opt
->repo
)))
3564 static struct commit_list
*reverse_commit_list(struct commit_list
*list
)
3566 struct commit_list
*next
= NULL
, *current
, *backup
;
3567 for (current
= list
; current
; current
= backup
) {
3568 backup
= current
->next
;
3569 current
->next
= next
;
3576 * Merge the commits h1 and h2, return the resulting virtual
3577 * commit object and a flag indicating the cleanness of the merge.
3579 static int merge_recursive_internal(struct merge_options
*opt
,
3582 struct commit_list
*merge_bases
,
3583 struct commit
**result
)
3585 struct commit_list
*iter
;
3586 struct commit
*merged_merge_bases
;
3587 struct tree
*result_tree
;
3589 const char *ancestor_name
;
3590 struct strbuf merge_base_abbrev
= STRBUF_INIT
;
3593 output(opt
, 4, _("Merging:"));
3594 output_commit_title(opt
, h1
);
3595 output_commit_title(opt
, h2
);
3599 merge_bases
= get_merge_bases(h1
, h2
);
3600 merge_bases
= reverse_commit_list(merge_bases
);
3604 unsigned cnt
= commit_list_count(merge_bases
);
3606 output(opt
, 5, Q_("found %u common ancestor:",
3607 "found %u common ancestors:", cnt
), cnt
);
3608 for (iter
= merge_bases
; iter
; iter
= iter
->next
)
3609 output_commit_title(opt
, iter
->item
);
3612 merged_merge_bases
= pop_commit(&merge_bases
);
3613 if (merged_merge_bases
== NULL
) {
3614 /* if there is no common ancestor, use an empty tree */
3617 tree
= lookup_tree(opt
->repo
, opt
->repo
->hash_algo
->empty_tree
);
3618 merged_merge_bases
= make_virtual_commit(opt
->repo
, tree
,
3620 ancestor_name
= "empty tree";
3621 } else if (opt
->ancestor
&& !opt
->priv
->call_depth
) {
3622 ancestor_name
= opt
->ancestor
;
3623 } else if (merge_bases
) {
3624 ancestor_name
= "merged common ancestors";
3626 strbuf_add_unique_abbrev(&merge_base_abbrev
,
3627 &merged_merge_bases
->object
.oid
,
3629 ancestor_name
= merge_base_abbrev
.buf
;
3632 for (iter
= merge_bases
; iter
; iter
= iter
->next
) {
3633 const char *saved_b1
, *saved_b2
;
3634 opt
->priv
->call_depth
++;
3636 * When the merge fails, the result contains files
3637 * with conflict markers. The cleanness flag is
3638 * ignored (unless indicating an error), it was never
3639 * actually used, as result of merge_trees has always
3640 * overwritten it: the committed "conflicts" were
3643 discard_index(opt
->repo
->index
);
3644 saved_b1
= opt
->branch1
;
3645 saved_b2
= opt
->branch2
;
3646 opt
->branch1
= "Temporary merge branch 1";
3647 opt
->branch2
= "Temporary merge branch 2";
3648 if (merge_recursive_internal(opt
, merged_merge_bases
, iter
->item
,
3649 NULL
, &merged_merge_bases
) < 0)
3651 opt
->branch1
= saved_b1
;
3652 opt
->branch2
= saved_b2
;
3653 opt
->priv
->call_depth
--;
3655 if (!merged_merge_bases
)
3656 return err(opt
, _("merge returned no commit"));
3659 discard_index(opt
->repo
->index
);
3660 if (!opt
->priv
->call_depth
)
3661 repo_read_index(opt
->repo
);
3663 opt
->ancestor
= ancestor_name
;
3664 clean
= merge_trees_internal(opt
,
3665 repo_get_commit_tree(opt
->repo
, h1
),
3666 repo_get_commit_tree(opt
->repo
, h2
),
3667 repo_get_commit_tree(opt
->repo
,
3668 merged_merge_bases
),
3670 strbuf_release(&merge_base_abbrev
);
3671 opt
->ancestor
= NULL
; /* avoid accidental re-use of opt->ancestor */
3677 if (opt
->priv
->call_depth
) {
3678 *result
= make_virtual_commit(opt
->repo
, result_tree
,
3680 commit_list_insert(h1
, &(*result
)->parents
);
3681 commit_list_insert(h2
, &(*result
)->parents
->next
);
3686 static int merge_start(struct merge_options
*opt
, struct tree
*head
)
3688 struct strbuf sb
= STRBUF_INIT
;
3690 /* Sanity checks on opt */
3693 assert(opt
->branch1
&& opt
->branch2
);
3695 assert(opt
->detect_renames
>= -1 &&
3696 opt
->detect_renames
<= DIFF_DETECT_COPY
);
3697 assert(opt
->detect_directory_renames
>= MERGE_DIRECTORY_RENAMES_NONE
&&
3698 opt
->detect_directory_renames
<= MERGE_DIRECTORY_RENAMES_TRUE
);
3699 assert(opt
->rename_limit
>= -1);
3700 assert(opt
->rename_score
>= 0 && opt
->rename_score
<= MAX_SCORE
);
3701 assert(opt
->show_rename_progress
>= 0 && opt
->show_rename_progress
<= 1);
3703 assert(opt
->xdl_opts
>= 0);
3704 assert(opt
->recursive_variant
>= MERGE_VARIANT_NORMAL
&&
3705 opt
->recursive_variant
<= MERGE_VARIANT_THEIRS
);
3707 assert(opt
->verbosity
>= 0 && opt
->verbosity
<= 5);
3708 assert(opt
->buffer_output
<= 2);
3709 assert(opt
->obuf
.len
== 0);
3711 assert(opt
->priv
== NULL
);
3713 /* Sanity check on repo state; index must match head */
3714 if (repo_index_has_changes(opt
->repo
, head
, &sb
)) {
3715 err(opt
, _("Your local changes to the following files would be overwritten by merge:\n %s"),
3717 strbuf_release(&sb
);
3721 opt
->priv
= xcalloc(1, sizeof(*opt
->priv
));
3722 string_list_init(&opt
->priv
->df_conflict_file_set
, 1);
3726 static void merge_finalize(struct merge_options
*opt
)
3729 if (!opt
->priv
->call_depth
&& opt
->buffer_output
< 2)
3730 strbuf_release(&opt
->obuf
);
3732 diff_warn_rename_limit("merge.renamelimit",
3733 opt
->priv
->needed_rename_limit
, 0);
3734 FREE_AND_NULL(opt
->priv
);
3737 int merge_trees(struct merge_options
*opt
,
3740 struct tree
*merge_base
)
3743 struct tree
*ignored
;
3745 assert(opt
->ancestor
!= NULL
);
3747 if (merge_start(opt
, head
))
3749 clean
= merge_trees_internal(opt
, head
, merge
, merge_base
, &ignored
);
3750 merge_finalize(opt
);
3755 int merge_recursive(struct merge_options
*opt
,
3758 struct commit_list
*merge_bases
,
3759 struct commit
**result
)
3763 assert(opt
->ancestor
== NULL
||
3764 !strcmp(opt
->ancestor
, "constructed merge base"));
3766 if (merge_start(opt
, repo_get_commit_tree(opt
->repo
, h1
)))
3768 clean
= merge_recursive_internal(opt
, h1
, h2
, merge_bases
, result
);
3769 merge_finalize(opt
);
3774 static struct commit
*get_ref(struct repository
*repo
,
3775 const struct object_id
*oid
,
3778 struct object
*object
;
3780 object
= deref_tag(repo
, parse_object(repo
, oid
),
3781 name
, strlen(name
));
3784 if (object
->type
== OBJ_TREE
)
3785 return make_virtual_commit(repo
, (struct tree
*)object
, name
);
3786 if (object
->type
!= OBJ_COMMIT
)
3788 if (parse_commit((struct commit
*)object
))
3790 return (struct commit
*)object
;
3793 int merge_recursive_generic(struct merge_options
*opt
,
3794 const struct object_id
*head
,
3795 const struct object_id
*merge
,
3796 int num_merge_bases
,
3797 const struct object_id
**merge_bases
,
3798 struct commit
**result
)
3801 struct lock_file lock
= LOCK_INIT
;
3802 struct commit
*head_commit
= get_ref(opt
->repo
, head
, opt
->branch1
);
3803 struct commit
*next_commit
= get_ref(opt
->repo
, merge
, opt
->branch2
);
3804 struct commit_list
*ca
= NULL
;
3808 for (i
= 0; i
< num_merge_bases
; ++i
) {
3809 struct commit
*base
;
3810 if (!(base
= get_ref(opt
->repo
, merge_bases
[i
],
3811 oid_to_hex(merge_bases
[i
]))))
3812 return err(opt
, _("Could not parse object '%s'"),
3813 oid_to_hex(merge_bases
[i
]));
3814 commit_list_insert(base
, &ca
);
3816 if (num_merge_bases
== 1)
3817 opt
->ancestor
= "constructed merge base";
3820 repo_hold_locked_index(opt
->repo
, &lock
, LOCK_DIE_ON_ERROR
);
3821 clean
= merge_recursive(opt
, head_commit
, next_commit
, ca
,
3824 rollback_lock_file(&lock
);
3828 if (write_locked_index(opt
->repo
->index
, &lock
,
3829 COMMIT_LOCK
| SKIP_IF_UNCHANGED
))
3830 return err(opt
, _("Unable to write index."));
3832 return clean
? 0 : 1;
3835 static void merge_recursive_config(struct merge_options
*opt
)
3838 git_config_get_int("merge.verbosity", &opt
->verbosity
);
3839 git_config_get_int("diff.renamelimit", &opt
->rename_limit
);
3840 git_config_get_int("merge.renamelimit", &opt
->rename_limit
);
3841 if (!git_config_get_string("diff.renames", &value
)) {
3842 opt
->detect_renames
= git_config_rename("diff.renames", value
);
3845 if (!git_config_get_string("merge.renames", &value
)) {
3846 opt
->detect_renames
= git_config_rename("merge.renames", value
);
3849 if (!git_config_get_string("merge.directoryrenames", &value
)) {
3850 int boolval
= git_parse_maybe_bool(value
);
3852 opt
->detect_directory_renames
= boolval
?
3853 MERGE_DIRECTORY_RENAMES_TRUE
:
3854 MERGE_DIRECTORY_RENAMES_NONE
;
3855 } else if (!strcasecmp(value
, "conflict")) {
3856 opt
->detect_directory_renames
=
3857 MERGE_DIRECTORY_RENAMES_CONFLICT
;
3858 } /* avoid erroring on values from future versions of git */
3861 git_config(git_xmerge_config
, NULL
);
3864 void init_merge_options(struct merge_options
*opt
,
3865 struct repository
*repo
)
3867 const char *merge_verbosity
;
3868 memset(opt
, 0, sizeof(struct merge_options
));
3872 opt
->detect_renames
= -1;
3873 opt
->detect_directory_renames
= MERGE_DIRECTORY_RENAMES_CONFLICT
;
3874 opt
->rename_limit
= -1;
3877 opt
->buffer_output
= 1;
3878 strbuf_init(&opt
->obuf
, 0);
3880 opt
->renormalize
= 0;
3882 merge_recursive_config(opt
);
3883 merge_verbosity
= getenv("GIT_MERGE_VERBOSITY");
3884 if (merge_verbosity
)
3885 opt
->verbosity
= strtol(merge_verbosity
, NULL
, 10);
3886 if (opt
->verbosity
>= 5)
3887 opt
->buffer_output
= 0;
3890 int parse_merge_opt(struct merge_options
*opt
, const char *s
)
3896 if (!strcmp(s
, "ours"))
3897 opt
->recursive_variant
= MERGE_VARIANT_OURS
;
3898 else if (!strcmp(s
, "theirs"))
3899 opt
->recursive_variant
= MERGE_VARIANT_THEIRS
;
3900 else if (!strcmp(s
, "subtree"))
3901 opt
->subtree_shift
= "";
3902 else if (skip_prefix(s
, "subtree=", &arg
))
3903 opt
->subtree_shift
= arg
;
3904 else if (!strcmp(s
, "patience"))
3905 opt
->xdl_opts
= DIFF_WITH_ALG(opt
, PATIENCE_DIFF
);
3906 else if (!strcmp(s
, "histogram"))
3907 opt
->xdl_opts
= DIFF_WITH_ALG(opt
, HISTOGRAM_DIFF
);
3908 else if (skip_prefix(s
, "diff-algorithm=", &arg
)) {
3909 long value
= parse_algorithm_value(arg
);
3912 /* clear out previous settings */
3913 DIFF_XDL_CLR(opt
, NEED_MINIMAL
);
3914 opt
->xdl_opts
&= ~XDF_DIFF_ALGORITHM_MASK
;
3915 opt
->xdl_opts
|= value
;
3917 else if (!strcmp(s
, "ignore-space-change"))
3918 DIFF_XDL_SET(opt
, IGNORE_WHITESPACE_CHANGE
);
3919 else if (!strcmp(s
, "ignore-all-space"))
3920 DIFF_XDL_SET(opt
, IGNORE_WHITESPACE
);
3921 else if (!strcmp(s
, "ignore-space-at-eol"))
3922 DIFF_XDL_SET(opt
, IGNORE_WHITESPACE_AT_EOL
);
3923 else if (!strcmp(s
, "ignore-cr-at-eol"))
3924 DIFF_XDL_SET(opt
, IGNORE_CR_AT_EOL
);
3925 else if (!strcmp(s
, "renormalize"))
3926 opt
->renormalize
= 1;
3927 else if (!strcmp(s
, "no-renormalize"))
3928 opt
->renormalize
= 0;
3929 else if (!strcmp(s
, "no-renames"))
3930 opt
->detect_renames
= 0;
3931 else if (!strcmp(s
, "find-renames")) {
3932 opt
->detect_renames
= 1;
3933 opt
->rename_score
= 0;
3935 else if (skip_prefix(s
, "find-renames=", &arg
) ||
3936 skip_prefix(s
, "rename-threshold=", &arg
)) {
3937 if ((opt
->rename_score
= parse_rename_score(&arg
)) == -1 || *arg
!= 0)
3939 opt
->detect_renames
= 1;
3942 * Please update $__git_merge_strategy_options in
3943 * git-completion.bash when you add new options