2 * Recursive Merge algorithm stolen from git-merge-recursive.py by
4 * The thieves were Alex Riesen and Johannes Schindelin, in June/July 2006
10 #include "cache-tree.h"
11 #include "object-store.h"
12 #include "repository.h"
16 #include "tree-walk.h"
21 #include "unpack-trees.h"
22 #include "string-list.h"
23 #include "xdiff-interface.h"
26 #include "merge-recursive.h"
28 #include "submodule.h"
31 struct path_hashmap_entry
{
32 struct hashmap_entry e
;
33 char path
[FLEX_ARRAY
];
36 static int path_hashmap_cmp(const void *cmp_data
,
38 const void *entry_or_key
,
41 const struct path_hashmap_entry
*a
= entry
;
42 const struct path_hashmap_entry
*b
= entry_or_key
;
43 const char *key
= keydata
;
46 return strcasecmp(a
->path
, key
? key
: b
->path
);
48 return strcmp(a
->path
, key
? key
: b
->path
);
51 static unsigned int path_hash(const char *path
)
53 return ignore_case
? strihash(path
) : strhash(path
);
56 static struct dir_rename_entry
*dir_rename_find_entry(struct hashmap
*hashmap
,
59 struct dir_rename_entry key
;
63 hashmap_entry_init(&key
, strhash(dir
));
65 return hashmap_get(hashmap
, &key
, NULL
);
68 static int dir_rename_cmp(const void *unused_cmp_data
,
70 const void *entry_or_key
,
71 const void *unused_keydata
)
73 const struct dir_rename_entry
*e1
= entry
;
74 const struct dir_rename_entry
*e2
= entry_or_key
;
76 return strcmp(e1
->dir
, e2
->dir
);
79 static void dir_rename_init(struct hashmap
*map
)
81 hashmap_init(map
, dir_rename_cmp
, NULL
, 0);
84 static void dir_rename_entry_init(struct dir_rename_entry
*entry
,
87 hashmap_entry_init(entry
, strhash(directory
));
88 entry
->dir
= directory
;
89 entry
->non_unique_new_dir
= 0;
90 strbuf_init(&entry
->new_dir
, 0);
91 string_list_init(&entry
->possible_new_dirs
, 0);
94 static struct collision_entry
*collision_find_entry(struct hashmap
*hashmap
,
97 struct collision_entry key
;
99 hashmap_entry_init(&key
, strhash(target_file
));
100 key
.target_file
= target_file
;
101 return hashmap_get(hashmap
, &key
, NULL
);
104 static int collision_cmp(void *unused_cmp_data
,
105 const struct collision_entry
*e1
,
106 const struct collision_entry
*e2
,
107 const void *unused_keydata
)
109 return strcmp(e1
->target_file
, e2
->target_file
);
112 static void collision_init(struct hashmap
*map
)
114 hashmap_init(map
, (hashmap_cmp_fn
) collision_cmp
, NULL
, 0);
117 static void flush_output(struct merge_options
*o
)
119 if (o
->buffer_output
< 2 && o
->obuf
.len
) {
120 fputs(o
->obuf
.buf
, stdout
);
121 strbuf_reset(&o
->obuf
);
125 static int err(struct merge_options
*o
, const char *err
, ...)
129 if (o
->buffer_output
< 2)
132 strbuf_complete(&o
->obuf
, '\n');
133 strbuf_addstr(&o
->obuf
, "error: ");
135 va_start(params
, err
);
136 strbuf_vaddf(&o
->obuf
, err
, params
);
138 if (o
->buffer_output
> 1)
139 strbuf_addch(&o
->obuf
, '\n');
141 error("%s", o
->obuf
.buf
);
142 strbuf_reset(&o
->obuf
);
148 static struct tree
*shift_tree_object(struct tree
*one
, struct tree
*two
,
149 const char *subtree_shift
)
151 struct object_id shifted
;
153 if (!*subtree_shift
) {
154 shift_tree(&one
->object
.oid
, &two
->object
.oid
, &shifted
, 0);
156 shift_tree_by(&one
->object
.oid
, &two
->object
.oid
, &shifted
,
159 if (!oidcmp(&two
->object
.oid
, &shifted
))
161 return lookup_tree(the_repository
, &shifted
);
164 static struct commit
*make_virtual_commit(struct tree
*tree
, const char *comment
)
166 struct commit
*commit
= alloc_commit_node(the_repository
);
168 set_merge_remote_desc(commit
, comment
, (struct object
*)commit
);
169 commit
->maybe_tree
= tree
;
170 commit
->object
.parsed
= 1;
175 * Since we use get_tree_entry(), which does not put the read object into
176 * the object pool, we cannot rely on a == b.
178 static int oid_eq(const struct object_id
*a
, const struct object_id
*b
)
182 return a
&& b
&& oidcmp(a
, b
) == 0;
189 RENAME_ONE_FILE_TO_ONE
,
190 RENAME_ONE_FILE_TO_TWO
,
191 RENAME_TWO_FILES_TO_ONE
194 struct rename_conflict_info
{
195 enum rename_type rename_type
;
196 struct diff_filepair
*pair1
;
197 struct diff_filepair
*pair2
;
200 struct stage_data
*dst_entry1
;
201 struct stage_data
*dst_entry2
;
202 struct diff_filespec ren1_other
;
203 struct diff_filespec ren2_other
;
207 * Since we want to write the index eventually, we cannot reuse the index
208 * for these (temporary) data.
213 struct object_id oid
;
215 struct rename_conflict_info
*rename_conflict_info
;
216 unsigned processed
:1;
219 static inline void setup_rename_conflict_info(enum rename_type rename_type
,
220 struct diff_filepair
*pair1
,
221 struct diff_filepair
*pair2
,
224 struct stage_data
*dst_entry1
,
225 struct stage_data
*dst_entry2
,
226 struct merge_options
*o
,
227 struct stage_data
*src_entry1
,
228 struct stage_data
*src_entry2
)
230 struct rename_conflict_info
*ci
= xcalloc(1, sizeof(struct rename_conflict_info
));
231 ci
->rename_type
= rename_type
;
233 ci
->branch1
= branch1
;
234 ci
->branch2
= branch2
;
236 ci
->dst_entry1
= dst_entry1
;
237 dst_entry1
->rename_conflict_info
= ci
;
238 dst_entry1
->processed
= 0;
240 assert(!pair2
== !dst_entry2
);
242 ci
->dst_entry2
= dst_entry2
;
244 dst_entry2
->rename_conflict_info
= ci
;
247 if (rename_type
== RENAME_TWO_FILES_TO_ONE
) {
249 * For each rename, there could have been
250 * modifications on the side of history where that
251 * file was not renamed.
253 int ostage1
= o
->branch1
== branch1
? 3 : 2;
254 int ostage2
= ostage1
^ 1;
256 ci
->ren1_other
.path
= pair1
->one
->path
;
257 oidcpy(&ci
->ren1_other
.oid
, &src_entry1
->stages
[ostage1
].oid
);
258 ci
->ren1_other
.mode
= src_entry1
->stages
[ostage1
].mode
;
260 ci
->ren2_other
.path
= pair2
->one
->path
;
261 oidcpy(&ci
->ren2_other
.oid
, &src_entry2
->stages
[ostage2
].oid
);
262 ci
->ren2_other
.mode
= src_entry2
->stages
[ostage2
].mode
;
266 static int show(struct merge_options
*o
, int v
)
268 return (!o
->call_depth
&& o
->verbosity
>= v
) || o
->verbosity
>= 5;
271 __attribute__((format (printf
, 3, 4)))
272 static void output(struct merge_options
*o
, int v
, const char *fmt
, ...)
279 strbuf_addchars(&o
->obuf
, ' ', o
->call_depth
* 2);
282 strbuf_vaddf(&o
->obuf
, fmt
, ap
);
285 strbuf_addch(&o
->obuf
, '\n');
286 if (!o
->buffer_output
)
290 static void output_commit_title(struct merge_options
*o
, struct commit
*commit
)
292 struct merge_remote_desc
*desc
;
294 strbuf_addchars(&o
->obuf
, ' ', o
->call_depth
* 2);
295 desc
= merge_remote_util(commit
);
297 strbuf_addf(&o
->obuf
, "virtual %s\n", desc
->name
);
299 strbuf_add_unique_abbrev(&o
->obuf
, &commit
->object
.oid
,
301 strbuf_addch(&o
->obuf
, ' ');
302 if (parse_commit(commit
) != 0)
303 strbuf_addstr(&o
->obuf
, _("(bad commit)\n"));
306 const char *msg
= get_commit_buffer(commit
, NULL
);
307 int len
= find_commit_subject(msg
, &title
);
309 strbuf_addf(&o
->obuf
, "%.*s\n", len
, title
);
310 unuse_commit_buffer(commit
, msg
);
316 static int add_cacheinfo(struct merge_options
*o
,
317 unsigned int mode
, const struct object_id
*oid
,
318 const char *path
, int stage
, int refresh
, int options
)
320 struct cache_entry
*ce
;
323 ce
= make_cache_entry(&the_index
, mode
, oid
? oid
: &null_oid
, path
, stage
, 0);
325 return err(o
, _("add_cacheinfo failed for path '%s'; merge aborting."), path
);
327 ret
= add_cache_entry(ce
, options
);
329 struct cache_entry
*nce
;
331 nce
= refresh_cache_entry(&the_index
, ce
, CE_MATCH_REFRESH
| CE_MATCH_IGNORE_MISSING
);
333 return err(o
, _("add_cacheinfo failed to refresh for path '%s'; merge aborting."), path
);
335 ret
= add_cache_entry(nce
, options
);
340 static void init_tree_desc_from_tree(struct tree_desc
*desc
, struct tree
*tree
)
343 init_tree_desc(desc
, tree
->buffer
, tree
->size
);
346 static int unpack_trees_start(struct merge_options
*o
,
352 struct tree_desc t
[3];
353 struct index_state tmp_index
= { NULL
};
355 memset(&o
->unpack_opts
, 0, sizeof(o
->unpack_opts
));
357 o
->unpack_opts
.index_only
= 1;
359 o
->unpack_opts
.update
= 1;
360 o
->unpack_opts
.merge
= 1;
361 o
->unpack_opts
.head_idx
= 2;
362 o
->unpack_opts
.fn
= threeway_merge
;
363 o
->unpack_opts
.src_index
= &the_index
;
364 o
->unpack_opts
.dst_index
= &tmp_index
;
365 o
->unpack_opts
.aggressive
= !merge_detect_rename(o
);
366 setup_unpack_trees_porcelain(&o
->unpack_opts
, "merge");
368 init_tree_desc_from_tree(t
+0, common
);
369 init_tree_desc_from_tree(t
+1, head
);
370 init_tree_desc_from_tree(t
+2, merge
);
372 rc
= unpack_trees(3, t
, &o
->unpack_opts
);
373 cache_tree_free(&active_cache_tree
);
376 * Update the_index to match the new results, AFTER saving a copy
377 * in o->orig_index. Update src_index to point to the saved copy.
378 * (verify_uptodate() checks src_index, and the original index is
379 * the one that had the necessary modification timestamps.)
381 o
->orig_index
= the_index
;
382 the_index
= tmp_index
;
383 o
->unpack_opts
.src_index
= &o
->orig_index
;
388 static void unpack_trees_finish(struct merge_options
*o
)
390 discard_index(&o
->orig_index
);
391 clear_unpack_trees_porcelain(&o
->unpack_opts
);
394 struct tree
*write_tree_from_memory(struct merge_options
*o
)
396 struct tree
*result
= NULL
;
398 if (unmerged_cache()) {
400 fprintf(stderr
, "BUG: There are unmerged index entries:\n");
401 for (i
= 0; i
< active_nr
; i
++) {
402 const struct cache_entry
*ce
= active_cache
[i
];
404 fprintf(stderr
, "BUG: %d %.*s\n", ce_stage(ce
),
405 (int)ce_namelen(ce
), ce
->name
);
407 BUG("unmerged index entries in merge-recursive.c");
410 if (!active_cache_tree
)
411 active_cache_tree
= cache_tree();
413 if (!cache_tree_fully_valid(active_cache_tree
) &&
414 cache_tree_update(&the_index
, 0) < 0) {
415 err(o
, _("error building trees"));
419 result
= lookup_tree(the_repository
, &active_cache_tree
->oid
);
424 static int save_files_dirs(const struct object_id
*oid
,
425 struct strbuf
*base
, const char *path
,
426 unsigned int mode
, int stage
, void *context
)
428 struct path_hashmap_entry
*entry
;
429 int baselen
= base
->len
;
430 struct merge_options
*o
= context
;
432 strbuf_addstr(base
, path
);
434 FLEX_ALLOC_MEM(entry
, path
, base
->buf
, base
->len
);
435 hashmap_entry_init(entry
, path_hash(entry
->path
));
436 hashmap_add(&o
->current_file_dir_set
, entry
);
438 strbuf_setlen(base
, baselen
);
439 return (S_ISDIR(mode
) ? READ_TREE_RECURSIVE
: 0);
442 static void get_files_dirs(struct merge_options
*o
, struct tree
*tree
)
444 struct pathspec match_all
;
445 memset(&match_all
, 0, sizeof(match_all
));
446 read_tree_recursive(tree
, "", 0, 0, &match_all
, save_files_dirs
, o
);
449 static int get_tree_entry_if_blob(const struct object_id
*tree
,
451 struct object_id
*hashy
,
452 unsigned int *mode_o
)
456 ret
= get_tree_entry(tree
, path
, hashy
, mode_o
);
457 if (S_ISDIR(*mode_o
)) {
458 oidcpy(hashy
, &null_oid
);
465 * Returns an index_entry instance which doesn't have to correspond to
466 * a real cache entry in Git's index.
468 static struct stage_data
*insert_stage_data(const char *path
,
469 struct tree
*o
, struct tree
*a
, struct tree
*b
,
470 struct string_list
*entries
)
472 struct string_list_item
*item
;
473 struct stage_data
*e
= xcalloc(1, sizeof(struct stage_data
));
474 get_tree_entry_if_blob(&o
->object
.oid
, path
,
475 &e
->stages
[1].oid
, &e
->stages
[1].mode
);
476 get_tree_entry_if_blob(&a
->object
.oid
, path
,
477 &e
->stages
[2].oid
, &e
->stages
[2].mode
);
478 get_tree_entry_if_blob(&b
->object
.oid
, path
,
479 &e
->stages
[3].oid
, &e
->stages
[3].mode
);
480 item
= string_list_insert(entries
, path
);
486 * Create a dictionary mapping file names to stage_data objects. The
487 * dictionary contains one entry for every path with a non-zero stage entry.
489 static struct string_list
*get_unmerged(void)
491 struct string_list
*unmerged
= xcalloc(1, sizeof(struct string_list
));
494 unmerged
->strdup_strings
= 1;
496 for (i
= 0; i
< active_nr
; i
++) {
497 struct string_list_item
*item
;
498 struct stage_data
*e
;
499 const struct cache_entry
*ce
= active_cache
[i
];
503 item
= string_list_lookup(unmerged
, ce
->name
);
505 item
= string_list_insert(unmerged
, ce
->name
);
506 item
->util
= xcalloc(1, sizeof(struct stage_data
));
509 e
->stages
[ce_stage(ce
)].mode
= ce
->ce_mode
;
510 oidcpy(&e
->stages
[ce_stage(ce
)].oid
, &ce
->oid
);
516 static int string_list_df_name_compare(const char *one
, const char *two
)
518 int onelen
= strlen(one
);
519 int twolen
= strlen(two
);
521 * Here we only care that entries for D/F conflicts are
522 * adjacent, in particular with the file of the D/F conflict
523 * appearing before files below the corresponding directory.
524 * The order of the rest of the list is irrelevant for us.
526 * To achieve this, we sort with df_name_compare and provide
527 * the mode S_IFDIR so that D/F conflicts will sort correctly.
528 * We use the mode S_IFDIR for everything else for simplicity,
529 * since in other cases any changes in their order due to
530 * sorting cause no problems for us.
532 int cmp
= df_name_compare(one
, onelen
, S_IFDIR
,
533 two
, twolen
, S_IFDIR
);
535 * Now that 'foo' and 'foo/bar' compare equal, we have to make sure
536 * that 'foo' comes before 'foo/bar'.
540 return onelen
- twolen
;
543 static void record_df_conflict_files(struct merge_options
*o
,
544 struct string_list
*entries
)
546 /* If there is a D/F conflict and the file for such a conflict
547 * currently exists in the working tree, we want to allow it to be
548 * removed to make room for the corresponding directory if needed.
549 * The files underneath the directories of such D/F conflicts will
550 * be processed before the corresponding file involved in the D/F
551 * conflict. If the D/F directory ends up being removed by the
552 * merge, then we won't have to touch the D/F file. If the D/F
553 * directory needs to be written to the working copy, then the D/F
554 * file will simply be removed (in make_room_for_path()) to make
555 * room for the necessary paths. Note that if both the directory
556 * and the file need to be present, then the D/F file will be
557 * reinstated with a new unique name at the time it is processed.
559 struct string_list df_sorted_entries
= STRING_LIST_INIT_NODUP
;
560 const char *last_file
= NULL
;
565 * If we're merging merge-bases, we don't want to bother with
566 * any working directory changes.
571 /* Ensure D/F conflicts are adjacent in the entries list. */
572 for (i
= 0; i
< entries
->nr
; i
++) {
573 struct string_list_item
*next
= &entries
->items
[i
];
574 string_list_append(&df_sorted_entries
, next
->string
)->util
=
577 df_sorted_entries
.cmp
= string_list_df_name_compare
;
578 string_list_sort(&df_sorted_entries
);
580 string_list_clear(&o
->df_conflict_file_set
, 1);
581 for (i
= 0; i
< df_sorted_entries
.nr
; i
++) {
582 const char *path
= df_sorted_entries
.items
[i
].string
;
583 int len
= strlen(path
);
584 struct stage_data
*e
= df_sorted_entries
.items
[i
].util
;
587 * Check if last_file & path correspond to a D/F conflict;
588 * i.e. whether path is last_file+'/'+<something>.
589 * If so, record that it's okay to remove last_file to make
590 * room for path and friends if needed.
594 memcmp(path
, last_file
, last_len
) == 0 &&
595 path
[last_len
] == '/') {
596 string_list_insert(&o
->df_conflict_file_set
, last_file
);
600 * Determine whether path could exist as a file in the
601 * working directory as a possible D/F conflict. This
602 * will only occur when it exists in stage 2 as a
605 if (S_ISREG(e
->stages
[2].mode
) || S_ISLNK(e
->stages
[2].mode
)) {
612 string_list_clear(&df_sorted_entries
, 0);
616 struct diff_filepair
*pair
;
618 * Purpose of src_entry and dst_entry:
620 * If 'before' is renamed to 'after' then src_entry will contain
621 * the versions of 'before' from the merge_base, HEAD, and MERGE in
622 * stages 1, 2, and 3; dst_entry will contain the respective
623 * versions of 'after' in corresponding locations. Thus, we have a
624 * total of six modes and oids, though some will be null. (Stage 0
625 * is ignored; we're interested in handling conflicts.)
627 * Since we don't turn on break-rewrites by default, neither
628 * src_entry nor dst_entry can have all three of their stages have
629 * non-null oids, meaning at most four of the six will be non-null.
630 * Also, since this is a rename, both src_entry and dst_entry will
631 * have at least one non-null oid, meaning at least two will be
632 * non-null. Of the six oids, a typical rename will have three be
633 * non-null. Only two implies a rename/delete, and four implies a
636 struct stage_data
*src_entry
;
637 struct stage_data
*dst_entry
;
638 unsigned add_turned_into_rename
:1;
639 unsigned processed
:1;
642 static int update_stages(struct merge_options
*opt
, const char *path
,
643 const struct diff_filespec
*o
,
644 const struct diff_filespec
*a
,
645 const struct diff_filespec
*b
)
649 * NOTE: It is usually a bad idea to call update_stages on a path
650 * before calling update_file on that same path, since it can
651 * sometimes lead to spurious "refusing to lose untracked file..."
652 * messages from update_file (via make_room_for path via
653 * would_lose_untracked). Instead, reverse the order of the calls
654 * (executing update_file first and then update_stages).
657 int options
= ADD_CACHE_OK_TO_ADD
| ADD_CACHE_SKIP_DFCHECK
;
659 if (remove_file_from_cache(path
))
662 if (add_cacheinfo(opt
, o
->mode
, &o
->oid
, path
, 1, 0, options
))
665 if (add_cacheinfo(opt
, a
->mode
, &a
->oid
, path
, 2, 0, options
))
668 if (add_cacheinfo(opt
, b
->mode
, &b
->oid
, path
, 3, 0, options
))
673 static int update_stages_for_stage_data(struct merge_options
*opt
,
675 const struct stage_data
*stage_data
)
677 struct diff_filespec o
, a
, b
;
679 o
.mode
= stage_data
->stages
[1].mode
;
680 oidcpy(&o
.oid
, &stage_data
->stages
[1].oid
);
682 a
.mode
= stage_data
->stages
[2].mode
;
683 oidcpy(&a
.oid
, &stage_data
->stages
[2].oid
);
685 b
.mode
= stage_data
->stages
[3].mode
;
686 oidcpy(&b
.oid
, &stage_data
->stages
[3].oid
);
688 return update_stages(opt
, path
,
689 is_null_oid(&o
.oid
) ? NULL
: &o
,
690 is_null_oid(&a
.oid
) ? NULL
: &a
,
691 is_null_oid(&b
.oid
) ? NULL
: &b
);
694 static void update_entry(struct stage_data
*entry
,
695 struct diff_filespec
*o
,
696 struct diff_filespec
*a
,
697 struct diff_filespec
*b
)
699 entry
->processed
= 0;
700 entry
->stages
[1].mode
= o
->mode
;
701 entry
->stages
[2].mode
= a
->mode
;
702 entry
->stages
[3].mode
= b
->mode
;
703 oidcpy(&entry
->stages
[1].oid
, &o
->oid
);
704 oidcpy(&entry
->stages
[2].oid
, &a
->oid
);
705 oidcpy(&entry
->stages
[3].oid
, &b
->oid
);
708 static int remove_file(struct merge_options
*o
, int clean
,
709 const char *path
, int no_wd
)
711 int update_cache
= o
->call_depth
|| clean
;
712 int update_working_directory
= !o
->call_depth
&& !no_wd
;
715 if (remove_file_from_cache(path
))
718 if (update_working_directory
) {
720 struct cache_entry
*ce
;
721 ce
= cache_file_exists(path
, strlen(path
), ignore_case
);
722 if (ce
&& ce_stage(ce
) == 0 && strcmp(path
, ce
->name
))
725 if (remove_path(path
))
731 /* add a string to a strbuf, but converting "/" to "_" */
732 static void add_flattened_path(struct strbuf
*out
, const char *s
)
735 strbuf_addstr(out
, s
);
736 for (; i
< out
->len
; i
++)
737 if (out
->buf
[i
] == '/')
741 static char *unique_path(struct merge_options
*o
, const char *path
, const char *branch
)
743 struct path_hashmap_entry
*entry
;
744 struct strbuf newpath
= STRBUF_INIT
;
748 strbuf_addf(&newpath
, "%s~", path
);
749 add_flattened_path(&newpath
, branch
);
751 base_len
= newpath
.len
;
752 while (hashmap_get_from_hash(&o
->current_file_dir_set
,
753 path_hash(newpath
.buf
), newpath
.buf
) ||
754 (!o
->call_depth
&& file_exists(newpath
.buf
))) {
755 strbuf_setlen(&newpath
, base_len
);
756 strbuf_addf(&newpath
, "_%d", suffix
++);
759 FLEX_ALLOC_MEM(entry
, path
, newpath
.buf
, newpath
.len
);
760 hashmap_entry_init(entry
, path_hash(entry
->path
));
761 hashmap_add(&o
->current_file_dir_set
, entry
);
762 return strbuf_detach(&newpath
, NULL
);
766 * Check whether a directory in the index is in the way of an incoming
767 * file. Return 1 if so. If check_working_copy is non-zero, also
768 * check the working directory. If empty_ok is non-zero, also return
769 * 0 in the case where the working-tree dir exists but is empty.
771 static int dir_in_way(const char *path
, int check_working_copy
, int empty_ok
)
774 struct strbuf dirpath
= STRBUF_INIT
;
777 strbuf_addstr(&dirpath
, path
);
778 strbuf_addch(&dirpath
, '/');
780 pos
= cache_name_pos(dirpath
.buf
, dirpath
.len
);
784 if (pos
< active_nr
&&
785 !strncmp(dirpath
.buf
, active_cache
[pos
]->name
, dirpath
.len
)) {
786 strbuf_release(&dirpath
);
790 strbuf_release(&dirpath
);
791 return check_working_copy
&& !lstat(path
, &st
) && S_ISDIR(st
.st_mode
) &&
792 !(empty_ok
&& is_empty_dir(path
));
796 * Returns whether path was tracked in the index before the merge started,
797 * and its oid and mode match the specified values
799 static int was_tracked_and_matches(struct merge_options
*o
, const char *path
,
800 const struct object_id
*oid
, unsigned mode
)
802 int pos
= index_name_pos(&o
->orig_index
, path
, strlen(path
));
803 struct cache_entry
*ce
;
806 /* we were not tracking this path before the merge */
809 /* See if the file we were tracking before matches */
810 ce
= o
->orig_index
.cache
[pos
];
811 return (oid_eq(&ce
->oid
, oid
) && ce
->ce_mode
== mode
);
815 * Returns whether path was tracked in the index before the merge started
817 static int was_tracked(struct merge_options
*o
, const char *path
)
819 int pos
= index_name_pos(&o
->orig_index
, path
, strlen(path
));
822 /* we were tracking this path before the merge */
828 static int would_lose_untracked(const char *path
)
831 * This may look like it can be simplified to:
832 * return !was_tracked(o, path) && file_exists(path)
833 * but it can't. This function needs to know whether path was in
834 * the working tree due to EITHER having been tracked in the index
835 * before the merge OR having been put into the working copy and
836 * index by unpack_trees(). Due to that either-or requirement, we
837 * check the current index instead of the original one.
839 * Note that we do not need to worry about merge-recursive itself
840 * updating the index after unpack_trees() and before calling this
841 * function, because we strictly require all code paths in
842 * merge-recursive to update the working tree first and the index
843 * second. Doing otherwise would break
844 * update_file()/would_lose_untracked(); see every comment in this
845 * file which mentions "update_stages".
847 int pos
= cache_name_pos(path
, strlen(path
));
851 while (pos
< active_nr
&&
852 !strcmp(path
, active_cache
[pos
]->name
)) {
854 * If stage #0, it is definitely tracked.
855 * If it has stage #2 then it was tracked
856 * before this merge started. All other
857 * cases the path was not tracked.
859 switch (ce_stage(active_cache
[pos
])) {
866 return file_exists(path
);
869 static int was_dirty(struct merge_options
*o
, const char *path
)
871 struct cache_entry
*ce
;
874 if (o
->call_depth
|| !was_tracked(o
, path
))
877 ce
= index_file_exists(o
->unpack_opts
.src_index
,
878 path
, strlen(path
), ignore_case
);
879 dirty
= verify_uptodate(ce
, &o
->unpack_opts
) != 0;
883 static int make_room_for_path(struct merge_options
*o
, const char *path
)
886 const char *msg
= _("failed to create path '%s'%s");
888 /* Unlink any D/F conflict files that are in the way */
889 for (i
= 0; i
< o
->df_conflict_file_set
.nr
; i
++) {
890 const char *df_path
= o
->df_conflict_file_set
.items
[i
].string
;
891 size_t pathlen
= strlen(path
);
892 size_t df_pathlen
= strlen(df_path
);
893 if (df_pathlen
< pathlen
&&
894 path
[df_pathlen
] == '/' &&
895 strncmp(path
, df_path
, df_pathlen
) == 0) {
897 _("Removing %s to make room for subdirectory\n"),
900 unsorted_string_list_delete_item(&o
->df_conflict_file_set
,
906 /* Make sure leading directories are created */
907 status
= safe_create_leading_directories_const(path
);
909 if (status
== SCLD_EXISTS
)
910 /* something else exists */
911 return err(o
, msg
, path
, _(": perhaps a D/F conflict?"));
912 return err(o
, msg
, path
, "");
916 * Do not unlink a file in the work tree if we are not
919 if (would_lose_untracked(path
))
920 return err(o
, _("refusing to lose untracked file at '%s'"),
923 /* Successful unlink is good.. */
926 /* .. and so is no existing file */
929 /* .. but not some other error (who really cares what?) */
930 return err(o
, msg
, path
, _(": perhaps a D/F conflict?"));
933 static int update_file_flags(struct merge_options
*o
,
934 const struct object_id
*oid
,
946 enum object_type type
;
950 if (S_ISGITLINK(mode
)) {
952 * We may later decide to recursively descend into
953 * the submodule directory and update its index
954 * and/or work tree, but we do not do that now.
960 buf
= read_object_file(oid
, &type
, &size
);
962 return err(o
, _("cannot read object %s '%s'"), oid_to_hex(oid
), path
);
963 if (type
!= OBJ_BLOB
) {
964 ret
= err(o
, _("blob expected for %s '%s'"), oid_to_hex(oid
), path
);
968 struct strbuf strbuf
= STRBUF_INIT
;
969 if (convert_to_working_tree(&the_index
, path
, buf
, size
, &strbuf
)) {
972 buf
= strbuf_detach(&strbuf
, NULL
);
976 if (make_room_for_path(o
, path
) < 0) {
980 if (S_ISREG(mode
) || (!has_symlinks
&& S_ISLNK(mode
))) {
986 fd
= open(path
, O_WRONLY
| O_TRUNC
| O_CREAT
, mode
);
988 ret
= err(o
, _("failed to open '%s': %s"),
989 path
, strerror(errno
));
992 write_in_full(fd
, buf
, size
);
994 } else if (S_ISLNK(mode
)) {
995 char *lnk
= xmemdupz(buf
, size
);
996 safe_create_leading_directories_const(path
);
998 if (symlink(lnk
, path
))
999 ret
= err(o
, _("failed to symlink '%s': %s"),
1000 path
, strerror(errno
));
1004 _("do not know what to do with %06o %s '%s'"),
1005 mode
, oid_to_hex(oid
), path
);
1010 if (!ret
&& update_cache
)
1011 if (add_cacheinfo(o
, mode
, oid
, path
, 0, update_wd
,
1012 ADD_CACHE_OK_TO_ADD
))
1017 static int update_file(struct merge_options
*o
,
1019 const struct object_id
*oid
,
1023 return update_file_flags(o
, oid
, mode
, path
, o
->call_depth
|| clean
, !o
->call_depth
);
1026 /* Low level file merging, update and removal */
1028 struct merge_file_info
{
1029 struct object_id oid
;
1035 static int merge_3way(struct merge_options
*o
,
1036 mmbuffer_t
*result_buf
,
1037 const struct diff_filespec
*one
,
1038 const struct diff_filespec
*a
,
1039 const struct diff_filespec
*b
,
1040 const char *branch1
,
1041 const char *branch2
)
1043 mmfile_t orig
, src1
, src2
;
1044 struct ll_merge_options ll_opts
= {0};
1045 char *base_name
, *name1
, *name2
;
1048 ll_opts
.renormalize
= o
->renormalize
;
1049 ll_opts
.xdl_opts
= o
->xdl_opts
;
1051 if (o
->call_depth
) {
1052 ll_opts
.virtual_ancestor
= 1;
1053 ll_opts
.variant
= 0;
1055 switch (o
->recursive_variant
) {
1056 case MERGE_RECURSIVE_OURS
:
1057 ll_opts
.variant
= XDL_MERGE_FAVOR_OURS
;
1059 case MERGE_RECURSIVE_THEIRS
:
1060 ll_opts
.variant
= XDL_MERGE_FAVOR_THEIRS
;
1063 ll_opts
.variant
= 0;
1068 if (strcmp(a
->path
, b
->path
) ||
1069 (o
->ancestor
!= NULL
&& strcmp(a
->path
, one
->path
) != 0)) {
1070 base_name
= o
->ancestor
== NULL
? NULL
:
1071 mkpathdup("%s:%s", o
->ancestor
, one
->path
);
1072 name1
= mkpathdup("%s:%s", branch1
, a
->path
);
1073 name2
= mkpathdup("%s:%s", branch2
, b
->path
);
1075 base_name
= o
->ancestor
== NULL
? NULL
:
1076 mkpathdup("%s", o
->ancestor
);
1077 name1
= mkpathdup("%s", branch1
);
1078 name2
= mkpathdup("%s", branch2
);
1081 read_mmblob(&orig
, &one
->oid
);
1082 read_mmblob(&src1
, &a
->oid
);
1083 read_mmblob(&src2
, &b
->oid
);
1085 merge_status
= ll_merge(result_buf
, a
->path
, &orig
, base_name
,
1086 &src1
, name1
, &src2
, name2
, &ll_opts
);
1094 return merge_status
;
1097 static int find_first_merges(struct object_array
*result
, const char *path
,
1098 struct commit
*a
, struct commit
*b
)
1101 struct object_array merges
= OBJECT_ARRAY_INIT
;
1102 struct commit
*commit
;
1103 int contains_another
;
1105 char merged_revision
[42];
1106 const char *rev_args
[] = { "rev-list", "--merges", "--ancestry-path",
1107 "--all", merged_revision
, NULL
};
1108 struct rev_info revs
;
1109 struct setup_revision_opt rev_opts
;
1111 memset(result
, 0, sizeof(struct object_array
));
1112 memset(&rev_opts
, 0, sizeof(rev_opts
));
1114 /* get all revisions that merge commit a */
1115 xsnprintf(merged_revision
, sizeof(merged_revision
), "^%s",
1116 oid_to_hex(&a
->object
.oid
));
1117 init_revisions(&revs
, NULL
);
1118 rev_opts
.submodule
= path
;
1119 /* FIXME: can't handle linked worktrees in submodules yet */
1120 revs
.single_worktree
= path
!= NULL
;
1121 setup_revisions(ARRAY_SIZE(rev_args
)-1, rev_args
, &revs
, &rev_opts
);
1123 /* save all revisions from the above list that contain b */
1124 if (prepare_revision_walk(&revs
))
1125 die("revision walk setup failed");
1126 while ((commit
= get_revision(&revs
)) != NULL
) {
1127 struct object
*o
= &(commit
->object
);
1128 if (in_merge_bases(b
, commit
))
1129 add_object_array(o
, NULL
, &merges
);
1131 reset_revision_walk();
1133 /* Now we've got all merges that contain a and b. Prune all
1134 * merges that contain another found merge and save them in
1137 for (i
= 0; i
< merges
.nr
; i
++) {
1138 struct commit
*m1
= (struct commit
*) merges
.objects
[i
].item
;
1140 contains_another
= 0;
1141 for (j
= 0; j
< merges
.nr
; j
++) {
1142 struct commit
*m2
= (struct commit
*) merges
.objects
[j
].item
;
1143 if (i
!= j
&& in_merge_bases(m2
, m1
)) {
1144 contains_another
= 1;
1149 if (!contains_another
)
1150 add_object_array(merges
.objects
[i
].item
, NULL
, result
);
1153 object_array_clear(&merges
);
1157 static void print_commit(struct commit
*commit
)
1159 struct strbuf sb
= STRBUF_INIT
;
1160 struct pretty_print_context ctx
= {0};
1161 ctx
.date_mode
.type
= DATE_NORMAL
;
1162 format_commit_message(commit
, " %h: %m %s", &sb
, &ctx
);
1163 fprintf(stderr
, "%s\n", sb
.buf
);
1164 strbuf_release(&sb
);
1167 static int merge_submodule(struct merge_options
*o
,
1168 struct object_id
*result
, const char *path
,
1169 const struct object_id
*base
, const struct object_id
*a
,
1170 const struct object_id
*b
)
1172 struct commit
*commit_base
, *commit_a
, *commit_b
;
1174 struct object_array merges
;
1177 int search
= !o
->call_depth
;
1179 /* store a in result in case we fail */
1182 /* we can not handle deletion conflicts */
1183 if (is_null_oid(base
))
1190 if (add_submodule_odb(path
)) {
1191 output(o
, 1, _("Failed to merge submodule %s (not checked out)"), path
);
1195 if (!(commit_base
= lookup_commit_reference(the_repository
, base
)) ||
1196 !(commit_a
= lookup_commit_reference(the_repository
, a
)) ||
1197 !(commit_b
= lookup_commit_reference(the_repository
, b
))) {
1198 output(o
, 1, _("Failed to merge submodule %s (commits not present)"), path
);
1202 /* check whether both changes are forward */
1203 if (!in_merge_bases(commit_base
, commit_a
) ||
1204 !in_merge_bases(commit_base
, commit_b
)) {
1205 output(o
, 1, _("Failed to merge submodule %s (commits don't follow merge-base)"), path
);
1209 /* Case #1: a is contained in b or vice versa */
1210 if (in_merge_bases(commit_a
, commit_b
)) {
1213 output(o
, 3, _("Fast-forwarding submodule %s to the following commit:"), path
);
1214 output_commit_title(o
, commit_b
);
1215 } else if (show(o
, 2))
1216 output(o
, 2, _("Fast-forwarding submodule %s"), path
);
1222 if (in_merge_bases(commit_b
, commit_a
)) {
1225 output(o
, 3, _("Fast-forwarding submodule %s to the following commit:"), path
);
1226 output_commit_title(o
, commit_a
);
1227 } else if (show(o
, 2))
1228 output(o
, 2, _("Fast-forwarding submodule %s"), path
);
1236 * Case #2: There are one or more merges that contain a and b in
1237 * the submodule. If there is only one, then present it as a
1238 * suggestion to the user, but leave it marked unmerged so the
1239 * user needs to confirm the resolution.
1242 /* Skip the search if makes no sense to the calling context. */
1246 /* find commit which merges them */
1247 parent_count
= find_first_merges(&merges
, path
, commit_a
, commit_b
);
1248 switch (parent_count
) {
1250 output(o
, 1, _("Failed to merge submodule %s (merge following commits not found)"), path
);
1254 output(o
, 1, _("Failed to merge submodule %s (not fast-forward)"), path
);
1255 output(o
, 2, _("Found a possible merge resolution for the submodule:\n"));
1256 print_commit((struct commit
*) merges
.objects
[0].item
);
1258 "If this is correct simply add it to the index "
1261 " git update-index --cacheinfo 160000 %s \"%s\"\n\n"
1262 "which will accept this suggestion.\n"),
1263 oid_to_hex(&merges
.objects
[0].item
->oid
), path
);
1267 output(o
, 1, _("Failed to merge submodule %s (multiple merges found)"), path
);
1268 for (i
= 0; i
< merges
.nr
; i
++)
1269 print_commit((struct commit
*) merges
.objects
[i
].item
);
1272 object_array_clear(&merges
);
1276 static int merge_file_1(struct merge_options
*o
,
1277 const struct diff_filespec
*one
,
1278 const struct diff_filespec
*a
,
1279 const struct diff_filespec
*b
,
1280 const char *filename
,
1281 const char *branch1
,
1282 const char *branch2
,
1283 struct merge_file_info
*result
)
1288 if ((S_IFMT
& a
->mode
) != (S_IFMT
& b
->mode
)) {
1290 if (S_ISREG(a
->mode
)) {
1291 result
->mode
= a
->mode
;
1292 oidcpy(&result
->oid
, &a
->oid
);
1294 result
->mode
= b
->mode
;
1295 oidcpy(&result
->oid
, &b
->oid
);
1298 if (!oid_eq(&a
->oid
, &one
->oid
) && !oid_eq(&b
->oid
, &one
->oid
))
1304 if (a
->mode
== b
->mode
|| a
->mode
== one
->mode
)
1305 result
->mode
= b
->mode
;
1307 result
->mode
= a
->mode
;
1308 if (b
->mode
!= one
->mode
) {
1314 if (oid_eq(&a
->oid
, &b
->oid
) || oid_eq(&a
->oid
, &one
->oid
))
1315 oidcpy(&result
->oid
, &b
->oid
);
1316 else if (oid_eq(&b
->oid
, &one
->oid
))
1317 oidcpy(&result
->oid
, &a
->oid
);
1318 else if (S_ISREG(a
->mode
)) {
1319 mmbuffer_t result_buf
;
1320 int ret
= 0, merge_status
;
1322 merge_status
= merge_3way(o
, &result_buf
, one
, a
, b
,
1325 if ((merge_status
< 0) || !result_buf
.ptr
)
1326 ret
= err(o
, _("Failed to execute internal merge"));
1329 write_object_file(result_buf
.ptr
, result_buf
.size
,
1330 blob_type
, &result
->oid
))
1331 ret
= err(o
, _("Unable to add %s to database"),
1334 free(result_buf
.ptr
);
1337 result
->clean
= (merge_status
== 0);
1338 } else if (S_ISGITLINK(a
->mode
)) {
1339 result
->clean
= merge_submodule(o
, &result
->oid
,
1344 } else if (S_ISLNK(a
->mode
)) {
1345 switch (o
->recursive_variant
) {
1346 case MERGE_RECURSIVE_NORMAL
:
1347 oidcpy(&result
->oid
, &a
->oid
);
1348 if (!oid_eq(&a
->oid
, &b
->oid
))
1351 case MERGE_RECURSIVE_OURS
:
1352 oidcpy(&result
->oid
, &a
->oid
);
1354 case MERGE_RECURSIVE_THEIRS
:
1355 oidcpy(&result
->oid
, &b
->oid
);
1359 BUG("unsupported object type in the tree");
1363 output(o
, 2, _("Auto-merging %s"), filename
);
1368 static int merge_file_special_markers(struct merge_options
*o
,
1369 const struct diff_filespec
*one
,
1370 const struct diff_filespec
*a
,
1371 const struct diff_filespec
*b
,
1372 const char *target_filename
,
1373 const char *branch1
,
1374 const char *filename1
,
1375 const char *branch2
,
1376 const char *filename2
,
1377 struct merge_file_info
*mfi
)
1384 side1
= xstrfmt("%s:%s", branch1
, filename1
);
1386 side2
= xstrfmt("%s:%s", branch2
, filename2
);
1388 ret
= merge_file_1(o
, one
, a
, b
, target_filename
,
1389 side1
? side1
: branch1
,
1390 side2
? side2
: branch2
, mfi
);
1397 static int merge_file_one(struct merge_options
*o
,
1399 const struct object_id
*o_oid
, int o_mode
,
1400 const struct object_id
*a_oid
, int a_mode
,
1401 const struct object_id
*b_oid
, int b_mode
,
1402 const char *branch1
,
1403 const char *branch2
,
1404 struct merge_file_info
*mfi
)
1406 struct diff_filespec one
, a
, b
;
1408 one
.path
= a
.path
= b
.path
= (char *)path
;
1409 oidcpy(&one
.oid
, o_oid
);
1411 oidcpy(&a
.oid
, a_oid
);
1413 oidcpy(&b
.oid
, b_oid
);
1415 return merge_file_1(o
, &one
, &a
, &b
, path
, branch1
, branch2
, mfi
);
1418 static int handle_rename_via_dir(struct merge_options
*o
,
1419 struct diff_filepair
*pair
,
1420 const char *rename_branch
,
1421 const char *other_branch
)
1424 * Handle file adds that need to be renamed due to directory rename
1425 * detection. This differs from handle_rename_normal, because
1426 * there is no content merge to do; just move the file into the
1427 * desired final location.
1429 const struct diff_filespec
*dest
= pair
->two
;
1431 if (!o
->call_depth
&& would_lose_untracked(dest
->path
)) {
1432 char *alt_path
= unique_path(o
, dest
->path
, rename_branch
);
1434 output(o
, 1, _("Error: Refusing to lose untracked file at %s; "
1435 "writing to %s instead."),
1436 dest
->path
, alt_path
);
1438 * Write the file in worktree at alt_path, but not in the
1439 * index. Instead, write to dest->path for the index but
1440 * only at the higher appropriate stage.
1442 if (update_file(o
, 0, &dest
->oid
, dest
->mode
, alt_path
))
1445 return update_stages(o
, dest
->path
, NULL
,
1446 rename_branch
== o
->branch1
? dest
: NULL
,
1447 rename_branch
== o
->branch1
? NULL
: dest
);
1450 /* Update dest->path both in index and in worktree */
1451 if (update_file(o
, 1, &dest
->oid
, dest
->mode
, dest
->path
))
1456 static int handle_change_delete(struct merge_options
*o
,
1457 const char *path
, const char *old_path
,
1458 const struct object_id
*o_oid
, int o_mode
,
1459 const struct object_id
*changed_oid
,
1461 const char *change_branch
,
1462 const char *delete_branch
,
1463 const char *change
, const char *change_past
)
1465 char *alt_path
= NULL
;
1466 const char *update_path
= path
;
1469 if (dir_in_way(path
, !o
->call_depth
, 0) ||
1470 (!o
->call_depth
&& would_lose_untracked(path
))) {
1471 update_path
= alt_path
= unique_path(o
, path
, change_branch
);
1474 if (o
->call_depth
) {
1476 * We cannot arbitrarily accept either a_sha or b_sha as
1477 * correct; since there is no true "middle point" between
1478 * them, simply reuse the base version for virtual merge base.
1480 ret
= remove_file_from_cache(path
);
1482 ret
= update_file(o
, 0, o_oid
, o_mode
, update_path
);
1485 * Despite the four nearly duplicate messages and argument
1486 * lists below and the ugliness of the nested if-statements,
1487 * having complete messages makes the job easier for
1490 * The slight variance among the cases is due to the fact
1492 * 1) directory/file conflicts (in effect if
1493 * !alt_path) could cause us to need to write the
1494 * file to a different path.
1495 * 2) renames (in effect if !old_path) could mean that
1496 * there are two names for the path that the user
1497 * may know the file by.
1501 output(o
, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1502 "and %s in %s. Version %s of %s left in tree."),
1503 change
, path
, delete_branch
, change_past
,
1504 change_branch
, change_branch
, path
);
1506 output(o
, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1507 "and %s to %s in %s. Version %s of %s left in tree."),
1508 change
, old_path
, delete_branch
, change_past
, path
,
1509 change_branch
, change_branch
, path
);
1513 output(o
, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1514 "and %s in %s. Version %s of %s left in tree at %s."),
1515 change
, path
, delete_branch
, change_past
,
1516 change_branch
, change_branch
, path
, alt_path
);
1518 output(o
, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1519 "and %s to %s in %s. Version %s of %s left in tree at %s."),
1520 change
, old_path
, delete_branch
, change_past
, path
,
1521 change_branch
, change_branch
, path
, alt_path
);
1525 * No need to call update_file() on path when change_branch ==
1526 * o->branch1 && !alt_path, since that would needlessly touch
1527 * path. We could call update_file_flags() with update_cache=0
1528 * and update_wd=0, but that's a no-op.
1530 if (change_branch
!= o
->branch1
|| alt_path
)
1531 ret
= update_file(o
, 0, changed_oid
, changed_mode
, update_path
);
1538 static int handle_rename_delete(struct merge_options
*o
,
1539 struct diff_filepair
*pair
,
1540 const char *rename_branch
,
1541 const char *delete_branch
)
1543 const struct diff_filespec
*orig
= pair
->one
;
1544 const struct diff_filespec
*dest
= pair
->two
;
1546 if (handle_change_delete(o
,
1547 o
->call_depth
? orig
->path
: dest
->path
,
1548 o
->call_depth
? NULL
: orig
->path
,
1549 &orig
->oid
, orig
->mode
,
1550 &dest
->oid
, dest
->mode
,
1551 rename_branch
, delete_branch
,
1552 _("rename"), _("renamed")))
1556 return remove_file_from_cache(dest
->path
);
1558 return update_stages(o
, dest
->path
, NULL
,
1559 rename_branch
== o
->branch1
? dest
: NULL
,
1560 rename_branch
== o
->branch1
? NULL
: dest
);
1563 static struct diff_filespec
*filespec_from_entry(struct diff_filespec
*target
,
1564 struct stage_data
*entry
,
1567 struct object_id
*oid
= &entry
->stages
[stage
].oid
;
1568 unsigned mode
= entry
->stages
[stage
].mode
;
1569 if (mode
== 0 || is_null_oid(oid
))
1571 oidcpy(&target
->oid
, oid
);
1572 target
->mode
= mode
;
1576 static int handle_file(struct merge_options
*o
,
1577 struct diff_filespec
*rename
,
1579 struct rename_conflict_info
*ci
)
1581 char *dst_name
= rename
->path
;
1582 struct stage_data
*dst_entry
;
1583 const char *cur_branch
, *other_branch
;
1584 struct diff_filespec other
;
1585 struct diff_filespec
*add
;
1589 dst_entry
= ci
->dst_entry1
;
1590 cur_branch
= ci
->branch1
;
1591 other_branch
= ci
->branch2
;
1593 dst_entry
= ci
->dst_entry2
;
1594 cur_branch
= ci
->branch2
;
1595 other_branch
= ci
->branch1
;
1598 add
= filespec_from_entry(&other
, dst_entry
, stage
^ 1);
1600 int ren_src_was_dirty
= was_dirty(o
, rename
->path
);
1601 char *add_name
= unique_path(o
, rename
->path
, other_branch
);
1602 if (update_file(o
, 0, &add
->oid
, add
->mode
, add_name
))
1605 if (ren_src_was_dirty
) {
1606 output(o
, 1, _("Refusing to lose dirty file at %s"),
1610 * Because the double negatives somehow keep confusing me...
1611 * 1) update_wd iff !ren_src_was_dirty.
1612 * 2) no_wd iff !update_wd
1613 * 3) so, no_wd == !!ren_src_was_dirty == ren_src_was_dirty
1615 remove_file(o
, 0, rename
->path
, ren_src_was_dirty
);
1616 dst_name
= unique_path(o
, rename
->path
, cur_branch
);
1618 if (dir_in_way(rename
->path
, !o
->call_depth
, 0)) {
1619 dst_name
= unique_path(o
, rename
->path
, cur_branch
);
1620 output(o
, 1, _("%s is a directory in %s adding as %s instead"),
1621 rename
->path
, other_branch
, dst_name
);
1622 } else if (!o
->call_depth
&&
1623 would_lose_untracked(rename
->path
)) {
1624 dst_name
= unique_path(o
, rename
->path
, cur_branch
);
1625 output(o
, 1, _("Refusing to lose untracked file at %s; "
1626 "adding as %s instead"),
1627 rename
->path
, dst_name
);
1630 if ((ret
= update_file(o
, 0, &rename
->oid
, rename
->mode
, dst_name
)))
1631 ; /* fall through, do allow dst_name to be released */
1632 else if (stage
== 2)
1633 ret
= update_stages(o
, rename
->path
, NULL
, rename
, add
);
1635 ret
= update_stages(o
, rename
->path
, NULL
, add
, rename
);
1637 if (dst_name
!= rename
->path
)
1643 static int handle_rename_rename_1to2(struct merge_options
*o
,
1644 struct rename_conflict_info
*ci
)
1646 /* One file was renamed in both branches, but to different names. */
1647 struct diff_filespec
*one
= ci
->pair1
->one
;
1648 struct diff_filespec
*a
= ci
->pair1
->two
;
1649 struct diff_filespec
*b
= ci
->pair2
->two
;
1651 output(o
, 1, _("CONFLICT (rename/rename): "
1652 "Rename \"%s\"->\"%s\" in branch \"%s\" "
1653 "rename \"%s\"->\"%s\" in \"%s\"%s"),
1654 one
->path
, a
->path
, ci
->branch1
,
1655 one
->path
, b
->path
, ci
->branch2
,
1656 o
->call_depth
? _(" (left unresolved)") : "");
1657 if (o
->call_depth
) {
1658 struct merge_file_info mfi
;
1659 struct diff_filespec other
;
1660 struct diff_filespec
*add
;
1661 if (merge_file_one(o
, one
->path
,
1662 &one
->oid
, one
->mode
,
1665 ci
->branch1
, ci
->branch2
, &mfi
))
1669 * FIXME: For rename/add-source conflicts (if we could detect
1670 * such), this is wrong. We should instead find a unique
1671 * pathname and then either rename the add-source file to that
1672 * unique path, or use that unique path instead of src here.
1674 if (update_file(o
, 0, &mfi
.oid
, mfi
.mode
, one
->path
))
1678 * Above, we put the merged content at the merge-base's
1679 * path. Now we usually need to delete both a->path and
1680 * b->path. However, the rename on each side of the merge
1681 * could also be involved in a rename/add conflict. In
1682 * such cases, we should keep the added file around,
1683 * resolving the conflict at that path in its favor.
1685 add
= filespec_from_entry(&other
, ci
->dst_entry1
, 2 ^ 1);
1687 if (update_file(o
, 0, &add
->oid
, add
->mode
, a
->path
))
1691 remove_file_from_cache(a
->path
);
1692 add
= filespec_from_entry(&other
, ci
->dst_entry2
, 3 ^ 1);
1694 if (update_file(o
, 0, &add
->oid
, add
->mode
, b
->path
))
1698 remove_file_from_cache(b
->path
);
1699 } else if (handle_file(o
, a
, 2, ci
) || handle_file(o
, b
, 3, ci
))
1705 static int handle_rename_rename_2to1(struct merge_options
*o
,
1706 struct rename_conflict_info
*ci
)
1708 /* Two files, a & b, were renamed to the same thing, c. */
1709 struct diff_filespec
*a
= ci
->pair1
->one
;
1710 struct diff_filespec
*b
= ci
->pair2
->one
;
1711 struct diff_filespec
*c1
= ci
->pair1
->two
;
1712 struct diff_filespec
*c2
= ci
->pair2
->two
;
1713 char *path
= c1
->path
; /* == c2->path */
1714 char *path_side_1_desc
;
1715 char *path_side_2_desc
;
1716 struct merge_file_info mfi_c1
;
1717 struct merge_file_info mfi_c2
;
1720 output(o
, 1, _("CONFLICT (rename/rename): "
1721 "Rename %s->%s in %s. "
1722 "Rename %s->%s in %s"),
1723 a
->path
, c1
->path
, ci
->branch1
,
1724 b
->path
, c2
->path
, ci
->branch2
);
1726 remove_file(o
, 1, a
->path
, o
->call_depth
|| would_lose_untracked(a
->path
));
1727 remove_file(o
, 1, b
->path
, o
->call_depth
|| would_lose_untracked(b
->path
));
1729 path_side_1_desc
= xstrfmt("%s (was %s)", path
, a
->path
);
1730 path_side_2_desc
= xstrfmt("%s (was %s)", path
, b
->path
);
1731 if (merge_file_special_markers(o
, a
, c1
, &ci
->ren1_other
,
1733 o
->branch1
, c1
->path
,
1734 o
->branch2
, ci
->ren1_other
.path
, &mfi_c1
) ||
1735 merge_file_special_markers(o
, b
, &ci
->ren2_other
, c2
,
1737 o
->branch1
, ci
->ren2_other
.path
,
1738 o
->branch2
, c2
->path
, &mfi_c2
))
1740 free(path_side_1_desc
);
1741 free(path_side_2_desc
);
1743 if (o
->call_depth
) {
1745 * If mfi_c1.clean && mfi_c2.clean, then it might make
1746 * sense to do a two-way merge of those results. But, I
1747 * think in all cases, it makes sense to have the virtual
1748 * merge base just undo the renames; they can be detected
1749 * again later for the non-recursive merge.
1751 remove_file(o
, 0, path
, 0);
1752 ret
= update_file(o
, 0, &mfi_c1
.oid
, mfi_c1
.mode
, a
->path
);
1754 ret
= update_file(o
, 0, &mfi_c2
.oid
, mfi_c2
.mode
,
1757 char *new_path1
= unique_path(o
, path
, ci
->branch1
);
1758 char *new_path2
= unique_path(o
, path
, ci
->branch2
);
1759 output(o
, 1, _("Renaming %s to %s and %s to %s instead"),
1760 a
->path
, new_path1
, b
->path
, new_path2
);
1761 if (was_dirty(o
, path
))
1762 output(o
, 1, _("Refusing to lose dirty file at %s"),
1764 else if (would_lose_untracked(path
))
1766 * Only way we get here is if both renames were from
1767 * a directory rename AND user had an untracked file
1768 * at the location where both files end up after the
1769 * two directory renames. See testcase 10d of t6043.
1771 output(o
, 1, _("Refusing to lose untracked file at "
1772 "%s, even though it's in the way."),
1775 remove_file(o
, 0, path
, 0);
1776 ret
= update_file(o
, 0, &mfi_c1
.oid
, mfi_c1
.mode
, new_path1
);
1778 ret
= update_file(o
, 0, &mfi_c2
.oid
, mfi_c2
.mode
,
1781 * unpack_trees() actually populates the index for us for
1782 * "normal" rename/rename(2to1) situtations so that the
1783 * correct entries are at the higher stages, which would
1784 * make the call below to update_stages_for_stage_data
1785 * unnecessary. However, if either of the renames came
1786 * from a directory rename, then unpack_trees() will not
1787 * have gotten the right data loaded into the index, so we
1788 * need to do so now. (While it'd be tempting to move this
1789 * call to update_stages_for_stage_data() to
1790 * apply_directory_rename_modifications(), that would break
1791 * our intermediate calls to would_lose_untracked() since
1792 * those rely on the current in-memory index. See also the
1793 * big "NOTE" in update_stages()).
1795 if (update_stages_for_stage_data(o
, path
, ci
->dst_entry1
))
1806 * Get the diff_filepairs changed between o_tree and tree.
1808 static struct diff_queue_struct
*get_diffpairs(struct merge_options
*o
,
1809 struct tree
*o_tree
,
1812 struct diff_queue_struct
*ret
;
1813 struct diff_options opts
;
1816 opts
.flags
.recursive
= 1;
1817 opts
.flags
.rename_empty
= 0;
1818 opts
.detect_rename
= merge_detect_rename(o
);
1820 * We do not have logic to handle the detection of copies. In
1821 * fact, it may not even make sense to add such logic: would we
1822 * really want a change to a base file to be propagated through
1823 * multiple other files by a merge?
1825 if (opts
.detect_rename
> DIFF_DETECT_RENAME
)
1826 opts
.detect_rename
= DIFF_DETECT_RENAME
;
1827 opts
.rename_limit
= o
->merge_rename_limit
>= 0 ? o
->merge_rename_limit
:
1828 o
->diff_rename_limit
>= 0 ? o
->diff_rename_limit
:
1830 opts
.rename_score
= o
->rename_score
;
1831 opts
.show_rename_progress
= o
->show_rename_progress
;
1832 opts
.output_format
= DIFF_FORMAT_NO_OUTPUT
;
1833 diff_setup_done(&opts
);
1834 diff_tree_oid(&o_tree
->object
.oid
, &tree
->object
.oid
, "", &opts
);
1835 diffcore_std(&opts
);
1836 if (opts
.needed_rename_limit
> o
->needed_rename_limit
)
1837 o
->needed_rename_limit
= opts
.needed_rename_limit
;
1839 ret
= xmalloc(sizeof(*ret
));
1840 *ret
= diff_queued_diff
;
1842 opts
.output_format
= DIFF_FORMAT_NO_OUTPUT
;
1843 diff_queued_diff
.nr
= 0;
1844 diff_queued_diff
.queue
= NULL
;
1849 static int tree_has_path(struct tree
*tree
, const char *path
)
1851 struct object_id hashy
;
1852 unsigned int mode_o
;
1854 return !get_tree_entry(&tree
->object
.oid
, path
,
1859 * Return a new string that replaces the beginning portion (which matches
1860 * entry->dir), with entry->new_dir. In perl-speak:
1861 * new_path_name = (old_path =~ s/entry->dir/entry->new_dir/);
1863 * Caller must ensure that old_path starts with entry->dir + '/'.
1865 static char *apply_dir_rename(struct dir_rename_entry
*entry
,
1866 const char *old_path
)
1868 struct strbuf new_path
= STRBUF_INIT
;
1871 if (entry
->non_unique_new_dir
)
1874 oldlen
= strlen(entry
->dir
);
1875 newlen
= entry
->new_dir
.len
+ (strlen(old_path
) - oldlen
) + 1;
1876 strbuf_grow(&new_path
, newlen
);
1877 strbuf_addbuf(&new_path
, &entry
->new_dir
);
1878 strbuf_addstr(&new_path
, &old_path
[oldlen
]);
1880 return strbuf_detach(&new_path
, NULL
);
1883 static void get_renamed_dir_portion(const char *old_path
, const char *new_path
,
1884 char **old_dir
, char **new_dir
)
1886 char *end_of_old
, *end_of_new
;
1887 int old_len
, new_len
;
1894 * "a/b/c/d/e/foo.c" -> "a/b/some/thing/else/e/foo.c"
1895 * the "e/foo.c" part is the same, we just want to know that
1896 * "a/b/c/d" was renamed to "a/b/some/thing/else"
1897 * so, for this example, this function returns "a/b/c/d" in
1898 * *old_dir and "a/b/some/thing/else" in *new_dir.
1900 * Also, if the basename of the file changed, we don't care. We
1901 * want to know which portion of the directory, if any, changed.
1903 end_of_old
= strrchr(old_path
, '/');
1904 end_of_new
= strrchr(new_path
, '/');
1906 if (end_of_old
== NULL
|| end_of_new
== NULL
)
1908 while (*--end_of_new
== *--end_of_old
&&
1909 end_of_old
!= old_path
&&
1910 end_of_new
!= new_path
)
1911 ; /* Do nothing; all in the while loop */
1913 * We've found the first non-matching character in the directory
1914 * paths. That means the current directory we were comparing
1915 * represents the rename. Move end_of_old and end_of_new back
1916 * to the full directory name.
1918 if (*end_of_old
== '/')
1920 if (*end_of_old
!= '/')
1922 end_of_old
= strchr(end_of_old
, '/');
1923 end_of_new
= strchr(end_of_new
, '/');
1926 * It may have been the case that old_path and new_path were the same
1927 * directory all along. Don't claim a rename if they're the same.
1929 old_len
= end_of_old
- old_path
;
1930 new_len
= end_of_new
- new_path
;
1932 if (old_len
!= new_len
|| strncmp(old_path
, new_path
, old_len
)) {
1933 *old_dir
= xstrndup(old_path
, old_len
);
1934 *new_dir
= xstrndup(new_path
, new_len
);
1938 static void remove_hashmap_entries(struct hashmap
*dir_renames
,
1939 struct string_list
*items_to_remove
)
1942 struct dir_rename_entry
*entry
;
1944 for (i
= 0; i
< items_to_remove
->nr
; i
++) {
1945 entry
= items_to_remove
->items
[i
].util
;
1946 hashmap_remove(dir_renames
, entry
, NULL
);
1948 string_list_clear(items_to_remove
, 0);
1952 * See if there is a directory rename for path, and if there are any file
1953 * level conflicts for the renamed location. If there is a rename and
1954 * there are no conflicts, return the new name. Otherwise, return NULL.
1956 static char *handle_path_level_conflicts(struct merge_options
*o
,
1958 struct dir_rename_entry
*entry
,
1959 struct hashmap
*collisions
,
1962 char *new_path
= NULL
;
1963 struct collision_entry
*collision_ent
;
1965 struct strbuf collision_paths
= STRBUF_INIT
;
1968 * entry has the mapping of old directory name to new directory name
1969 * that we want to apply to path.
1971 new_path
= apply_dir_rename(entry
, path
);
1974 /* This should only happen when entry->non_unique_new_dir set */
1975 if (!entry
->non_unique_new_dir
)
1976 BUG("entry->non_unqiue_dir not set and !new_path");
1977 output(o
, 1, _("CONFLICT (directory rename split): "
1978 "Unclear where to place %s because directory "
1979 "%s was renamed to multiple other directories, "
1980 "with no destination getting a majority of the "
1988 * The caller needs to have ensured that it has pre-populated
1989 * collisions with all paths that map to new_path. Do a quick check
1990 * to ensure that's the case.
1992 collision_ent
= collision_find_entry(collisions
, new_path
);
1993 if (collision_ent
== NULL
)
1994 BUG("collision_ent is NULL");
1997 * Check for one-sided add/add/.../add conflicts, i.e.
1998 * where implicit renames from the other side doing
1999 * directory rename(s) can affect this side of history
2000 * to put multiple paths into the same location. Warn
2001 * and bail on directory renames for such paths.
2003 if (collision_ent
->reported_already
) {
2005 } else if (tree_has_path(tree
, new_path
)) {
2006 collision_ent
->reported_already
= 1;
2007 strbuf_add_separated_string_list(&collision_paths
, ", ",
2008 &collision_ent
->source_files
);
2009 output(o
, 1, _("CONFLICT (implicit dir rename): Existing "
2010 "file/dir at %s in the way of implicit "
2011 "directory rename(s) putting the following "
2012 "path(s) there: %s."),
2013 new_path
, collision_paths
.buf
);
2015 } else if (collision_ent
->source_files
.nr
> 1) {
2016 collision_ent
->reported_already
= 1;
2017 strbuf_add_separated_string_list(&collision_paths
, ", ",
2018 &collision_ent
->source_files
);
2019 output(o
, 1, _("CONFLICT (implicit dir rename): Cannot map "
2020 "more than one path to %s; implicit directory "
2021 "renames tried to put these paths there: %s"),
2022 new_path
, collision_paths
.buf
);
2026 /* Free memory we no longer need */
2027 strbuf_release(&collision_paths
);
2028 if (!clean
&& new_path
) {
2037 * There are a couple things we want to do at the directory level:
2038 * 1. Check for both sides renaming to the same thing, in order to avoid
2039 * implicit renaming of files that should be left in place. (See
2040 * testcase 6b in t6043 for details.)
2041 * 2. Prune directory renames if there are still files left in the
2042 * the original directory. These represent a partial directory rename,
2043 * i.e. a rename where only some of the files within the directory
2044 * were renamed elsewhere. (Technically, this could be done earlier
2045 * in get_directory_renames(), except that would prevent us from
2046 * doing the previous check and thus failing testcase 6b.)
2047 * 3. Check for rename/rename(1to2) conflicts (at the directory level).
2048 * In the future, we could potentially record this info as well and
2049 * omit reporting rename/rename(1to2) conflicts for each path within
2050 * the affected directories, thus cleaning up the merge output.
2051 * NOTE: We do NOT check for rename/rename(2to1) conflicts at the
2052 * directory level, because merging directories is fine. If it
2053 * causes conflicts for files within those merged directories, then
2054 * that should be detected at the individual path level.
2056 static void handle_directory_level_conflicts(struct merge_options
*o
,
2057 struct hashmap
*dir_re_head
,
2059 struct hashmap
*dir_re_merge
,
2062 struct hashmap_iter iter
;
2063 struct dir_rename_entry
*head_ent
;
2064 struct dir_rename_entry
*merge_ent
;
2066 struct string_list remove_from_head
= STRING_LIST_INIT_NODUP
;
2067 struct string_list remove_from_merge
= STRING_LIST_INIT_NODUP
;
2069 hashmap_iter_init(dir_re_head
, &iter
);
2070 while ((head_ent
= hashmap_iter_next(&iter
))) {
2071 merge_ent
= dir_rename_find_entry(dir_re_merge
, head_ent
->dir
);
2073 !head_ent
->non_unique_new_dir
&&
2074 !merge_ent
->non_unique_new_dir
&&
2075 !strbuf_cmp(&head_ent
->new_dir
, &merge_ent
->new_dir
)) {
2076 /* 1. Renamed identically; remove it from both sides */
2077 string_list_append(&remove_from_head
,
2078 head_ent
->dir
)->util
= head_ent
;
2079 strbuf_release(&head_ent
->new_dir
);
2080 string_list_append(&remove_from_merge
,
2081 merge_ent
->dir
)->util
= merge_ent
;
2082 strbuf_release(&merge_ent
->new_dir
);
2083 } else if (tree_has_path(head
, head_ent
->dir
)) {
2084 /* 2. This wasn't a directory rename after all */
2085 string_list_append(&remove_from_head
,
2086 head_ent
->dir
)->util
= head_ent
;
2087 strbuf_release(&head_ent
->new_dir
);
2091 remove_hashmap_entries(dir_re_head
, &remove_from_head
);
2092 remove_hashmap_entries(dir_re_merge
, &remove_from_merge
);
2094 hashmap_iter_init(dir_re_merge
, &iter
);
2095 while ((merge_ent
= hashmap_iter_next(&iter
))) {
2096 head_ent
= dir_rename_find_entry(dir_re_head
, merge_ent
->dir
);
2097 if (tree_has_path(merge
, merge_ent
->dir
)) {
2098 /* 2. This wasn't a directory rename after all */
2099 string_list_append(&remove_from_merge
,
2100 merge_ent
->dir
)->util
= merge_ent
;
2101 } else if (head_ent
&&
2102 !head_ent
->non_unique_new_dir
&&
2103 !merge_ent
->non_unique_new_dir
) {
2104 /* 3. rename/rename(1to2) */
2106 * We can assume it's not rename/rename(1to1) because
2107 * that was case (1), already checked above. So we
2108 * know that head_ent->new_dir and merge_ent->new_dir
2109 * are different strings.
2111 output(o
, 1, _("CONFLICT (rename/rename): "
2112 "Rename directory %s->%s in %s. "
2113 "Rename directory %s->%s in %s"),
2114 head_ent
->dir
, head_ent
->new_dir
.buf
, o
->branch1
,
2115 head_ent
->dir
, merge_ent
->new_dir
.buf
, o
->branch2
);
2116 string_list_append(&remove_from_head
,
2117 head_ent
->dir
)->util
= head_ent
;
2118 strbuf_release(&head_ent
->new_dir
);
2119 string_list_append(&remove_from_merge
,
2120 merge_ent
->dir
)->util
= merge_ent
;
2121 strbuf_release(&merge_ent
->new_dir
);
2125 remove_hashmap_entries(dir_re_head
, &remove_from_head
);
2126 remove_hashmap_entries(dir_re_merge
, &remove_from_merge
);
2129 static struct hashmap
*get_directory_renames(struct diff_queue_struct
*pairs
,
2132 struct hashmap
*dir_renames
;
2133 struct hashmap_iter iter
;
2134 struct dir_rename_entry
*entry
;
2138 * Typically, we think of a directory rename as all files from a
2139 * certain directory being moved to a target directory. However,
2140 * what if someone first moved two files from the original
2141 * directory in one commit, and then renamed the directory
2142 * somewhere else in a later commit? At merge time, we just know
2143 * that files from the original directory went to two different
2144 * places, and that the bulk of them ended up in the same place.
2145 * We want each directory rename to represent where the bulk of the
2146 * files from that directory end up; this function exists to find
2147 * where the bulk of the files went.
2149 * The first loop below simply iterates through the list of file
2150 * renames, finding out how often each directory rename pair
2151 * possibility occurs.
2153 dir_renames
= xmalloc(sizeof(*dir_renames
));
2154 dir_rename_init(dir_renames
);
2155 for (i
= 0; i
< pairs
->nr
; ++i
) {
2156 struct string_list_item
*item
;
2158 struct diff_filepair
*pair
= pairs
->queue
[i
];
2159 char *old_dir
, *new_dir
;
2161 /* File not part of directory rename if it wasn't renamed */
2162 if (pair
->status
!= 'R')
2165 get_renamed_dir_portion(pair
->one
->path
, pair
->two
->path
,
2166 &old_dir
, &new_dir
);
2168 /* Directory didn't change at all; ignore this one. */
2171 entry
= dir_rename_find_entry(dir_renames
, old_dir
);
2173 entry
= xmalloc(sizeof(*entry
));
2174 dir_rename_entry_init(entry
, old_dir
);
2175 hashmap_put(dir_renames
, entry
);
2179 item
= string_list_lookup(&entry
->possible_new_dirs
, new_dir
);
2181 item
= string_list_insert(&entry
->possible_new_dirs
,
2183 item
->util
= xcalloc(1, sizeof(int));
2192 * For each directory with files moved out of it, we find out which
2193 * target directory received the most files so we can declare it to
2194 * be the "winning" target location for the directory rename. This
2195 * winner gets recorded in new_dir. If there is no winner
2196 * (multiple target directories received the same number of files),
2197 * we set non_unique_new_dir. Once we've determined the winner (or
2198 * that there is no winner), we no longer need possible_new_dirs.
2200 hashmap_iter_init(dir_renames
, &iter
);
2201 while ((entry
= hashmap_iter_next(&iter
))) {
2206 for (i
= 0; i
< entry
->possible_new_dirs
.nr
; i
++) {
2207 int *count
= entry
->possible_new_dirs
.items
[i
].util
;
2211 else if (*count
> max
) {
2213 best
= entry
->possible_new_dirs
.items
[i
].string
;
2217 entry
->non_unique_new_dir
= 1;
2219 assert(entry
->new_dir
.len
== 0);
2220 strbuf_addstr(&entry
->new_dir
, best
);
2223 * The relevant directory sub-portion of the original full
2224 * filepaths were xstrndup'ed before inserting into
2225 * possible_new_dirs, and instead of manually iterating the
2226 * list and free'ing each, just lie and tell
2227 * possible_new_dirs that it did the strdup'ing so that it
2228 * will free them for us.
2230 entry
->possible_new_dirs
.strdup_strings
= 1;
2231 string_list_clear(&entry
->possible_new_dirs
, 1);
2237 static struct dir_rename_entry
*check_dir_renamed(const char *path
,
2238 struct hashmap
*dir_renames
)
2240 char *temp
= xstrdup(path
);
2242 struct dir_rename_entry
*entry
= NULL
;;
2244 while ((end
= strrchr(temp
, '/'))) {
2246 entry
= dir_rename_find_entry(dir_renames
, temp
);
2254 static void compute_collisions(struct hashmap
*collisions
,
2255 struct hashmap
*dir_renames
,
2256 struct diff_queue_struct
*pairs
)
2261 * Multiple files can be mapped to the same path due to directory
2262 * renames done by the other side of history. Since that other
2263 * side of history could have merged multiple directories into one,
2264 * if our side of history added the same file basename to each of
2265 * those directories, then all N of them would get implicitly
2266 * renamed by the directory rename detection into the same path,
2267 * and we'd get an add/add/.../add conflict, and all those adds
2268 * from *this* side of history. This is not representable in the
2269 * index, and users aren't going to easily be able to make sense of
2270 * it. So we need to provide a good warning about what's
2271 * happening, and fall back to no-directory-rename detection
2272 * behavior for those paths.
2274 * See testcases 9e and all of section 5 from t6043 for examples.
2276 collision_init(collisions
);
2278 for (i
= 0; i
< pairs
->nr
; ++i
) {
2279 struct dir_rename_entry
*dir_rename_ent
;
2280 struct collision_entry
*collision_ent
;
2282 struct diff_filepair
*pair
= pairs
->queue
[i
];
2284 if (pair
->status
!= 'A' && pair
->status
!= 'R')
2286 dir_rename_ent
= check_dir_renamed(pair
->two
->path
,
2288 if (!dir_rename_ent
)
2291 new_path
= apply_dir_rename(dir_rename_ent
, pair
->two
->path
);
2294 * dir_rename_ent->non_unique_new_path is true, which
2295 * means there is no directory rename for us to use,
2296 * which means it won't cause us any additional
2300 collision_ent
= collision_find_entry(collisions
, new_path
);
2301 if (!collision_ent
) {
2302 collision_ent
= xcalloc(1,
2303 sizeof(struct collision_entry
));
2304 hashmap_entry_init(collision_ent
, strhash(new_path
));
2305 hashmap_put(collisions
, collision_ent
);
2306 collision_ent
->target_file
= new_path
;
2310 string_list_insert(&collision_ent
->source_files
,
2315 static char *check_for_directory_rename(struct merge_options
*o
,
2318 struct hashmap
*dir_renames
,
2319 struct hashmap
*dir_rename_exclusions
,
2320 struct hashmap
*collisions
,
2323 char *new_path
= NULL
;
2324 struct dir_rename_entry
*entry
= check_dir_renamed(path
, dir_renames
);
2325 struct dir_rename_entry
*oentry
= NULL
;
2331 * This next part is a little weird. We do not want to do an
2332 * implicit rename into a directory we renamed on our side, because
2333 * that will result in a spurious rename/rename(1to2) conflict. An
2335 * Base commit: dumbdir/afile, otherdir/bfile
2336 * Side 1: smrtdir/afile, otherdir/bfile
2337 * Side 2: dumbdir/afile, dumbdir/bfile
2338 * Here, while working on Side 1, we could notice that otherdir was
2339 * renamed/merged to dumbdir, and change the diff_filepair for
2340 * otherdir/bfile into a rename into dumbdir/bfile. However, Side
2341 * 2 will notice the rename from dumbdir to smrtdir, and do the
2342 * transitive rename to move it from dumbdir/bfile to
2343 * smrtdir/bfile. That gives us bfile in dumbdir vs being in
2344 * smrtdir, a rename/rename(1to2) conflict. We really just want
2345 * the file to end up in smrtdir. And the way to achieve that is
2346 * to not let Side1 do the rename to dumbdir, since we know that is
2347 * the source of one of our directory renames.
2349 * That's why oentry and dir_rename_exclusions is here.
2351 * As it turns out, this also prevents N-way transient rename
2352 * confusion; See testcases 9c and 9d of t6043.
2354 oentry
= dir_rename_find_entry(dir_rename_exclusions
, entry
->new_dir
.buf
);
2356 output(o
, 1, _("WARNING: Avoiding applying %s -> %s rename "
2357 "to %s, because %s itself was renamed."),
2358 entry
->dir
, entry
->new_dir
.buf
, path
, entry
->new_dir
.buf
);
2360 new_path
= handle_path_level_conflicts(o
, path
, entry
,
2362 *clean_merge
&= (new_path
!= NULL
);
2368 static void apply_directory_rename_modifications(struct merge_options
*o
,
2369 struct diff_filepair
*pair
,
2373 struct tree
*o_tree
,
2374 struct tree
*a_tree
,
2375 struct tree
*b_tree
,
2376 struct string_list
*entries
,
2379 struct string_list_item
*item
;
2380 int stage
= (tree
== a_tree
? 2 : 3);
2384 * In all cases where we can do directory rename detection,
2385 * unpack_trees() will have read pair->two->path into the
2386 * index and the working copy. We need to remove it so that
2387 * we can instead place it at new_path. It is guaranteed to
2388 * not be untracked (unpack_trees() would have errored out
2389 * saying the file would have been overwritten), but it might
2392 update_wd
= !was_dirty(o
, pair
->two
->path
);
2394 output(o
, 1, _("Refusing to lose dirty file at %s"),
2396 remove_file(o
, 1, pair
->two
->path
, !update_wd
);
2398 /* Find or create a new re->dst_entry */
2399 item
= string_list_lookup(entries
, new_path
);
2402 * Since we're renaming on this side of history, and it's
2403 * due to a directory rename on the other side of history
2404 * (which we only allow when the directory in question no
2405 * longer exists on the other side of history), the
2406 * original entry for re->dst_entry is no longer
2409 re
->dst_entry
->processed
= 1;
2412 * ...because we'll be using this new one.
2414 re
->dst_entry
= item
->util
;
2417 * re->dst_entry is for the before-dir-rename path, and we
2418 * need it to hold information for the after-dir-rename
2419 * path. Before creating a new entry, we need to mark the
2420 * old one as unnecessary (...unless it is shared by
2421 * src_entry, i.e. this didn't use to be a rename, in which
2422 * case we can just allow the normal processing to happen
2425 if (pair
->status
== 'R')
2426 re
->dst_entry
->processed
= 1;
2428 re
->dst_entry
= insert_stage_data(new_path
,
2429 o_tree
, a_tree
, b_tree
,
2431 item
= string_list_insert(entries
, new_path
);
2432 item
->util
= re
->dst_entry
;
2436 * Update the stage_data with the information about the path we are
2437 * moving into place. That slot will be empty and available for us
2438 * to write to because of the collision checks in
2439 * handle_path_level_conflicts(). In other words,
2440 * re->dst_entry->stages[stage].oid will be the null_oid, so it's
2441 * open for us to write to.
2443 * It may be tempting to actually update the index at this point as
2444 * well, using update_stages_for_stage_data(), but as per the big
2445 * "NOTE" in update_stages(), doing so will modify the current
2446 * in-memory index which will break calls to would_lose_untracked()
2447 * that we need to make. Instead, we need to just make sure that
2448 * the various handle_rename_*() functions update the index
2449 * explicitly rather than relying on unpack_trees() to have done it.
2451 get_tree_entry(&tree
->object
.oid
,
2453 &re
->dst_entry
->stages
[stage
].oid
,
2454 &re
->dst_entry
->stages
[stage
].mode
);
2456 /* Update pair status */
2457 if (pair
->status
== 'A') {
2459 * Recording rename information for this add makes it look
2460 * like a rename/delete conflict. Make sure we can
2461 * correctly handle this as an add that was moved to a new
2462 * directory instead of reporting a rename/delete conflict.
2464 re
->add_turned_into_rename
= 1;
2467 * We don't actually look at pair->status again, but it seems
2468 * pedagogically correct to adjust it.
2473 * Finally, record the new location.
2475 pair
->two
->path
= new_path
;
2479 * Get information of all renames which occurred in 'pairs', making use of
2480 * any implicit directory renames inferred from the other side of history.
2481 * We need the three trees in the merge ('o_tree', 'a_tree' and 'b_tree')
2482 * to be able to associate the correct cache entries with the rename
2483 * information; tree is always equal to either a_tree or b_tree.
2485 static struct string_list
*get_renames(struct merge_options
*o
,
2486 struct diff_queue_struct
*pairs
,
2487 struct hashmap
*dir_renames
,
2488 struct hashmap
*dir_rename_exclusions
,
2490 struct tree
*o_tree
,
2491 struct tree
*a_tree
,
2492 struct tree
*b_tree
,
2493 struct string_list
*entries
,
2497 struct hashmap collisions
;
2498 struct hashmap_iter iter
;
2499 struct collision_entry
*e
;
2500 struct string_list
*renames
;
2502 compute_collisions(&collisions
, dir_renames
, pairs
);
2503 renames
= xcalloc(1, sizeof(struct string_list
));
2505 for (i
= 0; i
< pairs
->nr
; ++i
) {
2506 struct string_list_item
*item
;
2508 struct diff_filepair
*pair
= pairs
->queue
[i
];
2509 char *new_path
; /* non-NULL only with directory renames */
2511 if (pair
->status
!= 'A' && pair
->status
!= 'R') {
2512 diff_free_filepair(pair
);
2515 new_path
= check_for_directory_rename(o
, pair
->two
->path
, tree
,
2517 dir_rename_exclusions
,
2520 if (pair
->status
!= 'R' && !new_path
) {
2521 diff_free_filepair(pair
);
2525 re
= xmalloc(sizeof(*re
));
2527 re
->add_turned_into_rename
= 0;
2529 item
= string_list_lookup(entries
, re
->pair
->one
->path
);
2531 re
->src_entry
= insert_stage_data(re
->pair
->one
->path
,
2532 o_tree
, a_tree
, b_tree
, entries
);
2534 re
->src_entry
= item
->util
;
2536 item
= string_list_lookup(entries
, re
->pair
->two
->path
);
2538 re
->dst_entry
= insert_stage_data(re
->pair
->two
->path
,
2539 o_tree
, a_tree
, b_tree
, entries
);
2541 re
->dst_entry
= item
->util
;
2542 item
= string_list_insert(renames
, pair
->one
->path
);
2545 apply_directory_rename_modifications(o
, pair
, new_path
,
2552 hashmap_iter_init(&collisions
, &iter
);
2553 while ((e
= hashmap_iter_next(&iter
))) {
2554 free(e
->target_file
);
2555 string_list_clear(&e
->source_files
, 0);
2557 hashmap_free(&collisions
, 1);
2561 static int process_renames(struct merge_options
*o
,
2562 struct string_list
*a_renames
,
2563 struct string_list
*b_renames
)
2565 int clean_merge
= 1, i
, j
;
2566 struct string_list a_by_dst
= STRING_LIST_INIT_NODUP
;
2567 struct string_list b_by_dst
= STRING_LIST_INIT_NODUP
;
2568 const struct rename
*sre
;
2570 for (i
= 0; i
< a_renames
->nr
; i
++) {
2571 sre
= a_renames
->items
[i
].util
;
2572 string_list_insert(&a_by_dst
, sre
->pair
->two
->path
)->util
2575 for (i
= 0; i
< b_renames
->nr
; i
++) {
2576 sre
= b_renames
->items
[i
].util
;
2577 string_list_insert(&b_by_dst
, sre
->pair
->two
->path
)->util
2581 for (i
= 0, j
= 0; i
< a_renames
->nr
|| j
< b_renames
->nr
;) {
2582 struct string_list
*renames1
, *renames2Dst
;
2583 struct rename
*ren1
= NULL
, *ren2
= NULL
;
2584 const char *branch1
, *branch2
;
2585 const char *ren1_src
, *ren1_dst
;
2586 struct string_list_item
*lookup
;
2588 if (i
>= a_renames
->nr
) {
2589 ren2
= b_renames
->items
[j
++].util
;
2590 } else if (j
>= b_renames
->nr
) {
2591 ren1
= a_renames
->items
[i
++].util
;
2593 int compare
= strcmp(a_renames
->items
[i
].string
,
2594 b_renames
->items
[j
].string
);
2596 ren1
= a_renames
->items
[i
++].util
;
2598 ren2
= b_renames
->items
[j
++].util
;
2601 /* TODO: refactor, so that 1/2 are not needed */
2603 renames1
= a_renames
;
2604 renames2Dst
= &b_by_dst
;
2605 branch1
= o
->branch1
;
2606 branch2
= o
->branch2
;
2608 renames1
= b_renames
;
2609 renames2Dst
= &a_by_dst
;
2610 branch1
= o
->branch2
;
2611 branch2
= o
->branch1
;
2615 if (ren1
->processed
)
2617 ren1
->processed
= 1;
2618 ren1
->dst_entry
->processed
= 1;
2619 /* BUG: We should only mark src_entry as processed if we
2620 * are not dealing with a rename + add-source case.
2622 ren1
->src_entry
->processed
= 1;
2624 ren1_src
= ren1
->pair
->one
->path
;
2625 ren1_dst
= ren1
->pair
->two
->path
;
2628 /* One file renamed on both sides */
2629 const char *ren2_src
= ren2
->pair
->one
->path
;
2630 const char *ren2_dst
= ren2
->pair
->two
->path
;
2631 enum rename_type rename_type
;
2632 if (strcmp(ren1_src
, ren2_src
) != 0)
2633 BUG("ren1_src != ren2_src");
2634 ren2
->dst_entry
->processed
= 1;
2635 ren2
->processed
= 1;
2636 if (strcmp(ren1_dst
, ren2_dst
) != 0) {
2637 rename_type
= RENAME_ONE_FILE_TO_TWO
;
2640 rename_type
= RENAME_ONE_FILE_TO_ONE
;
2641 /* BUG: We should only remove ren1_src in
2642 * the base stage (think of rename +
2643 * add-source cases).
2645 remove_file(o
, 1, ren1_src
, 1);
2646 update_entry(ren1
->dst_entry
,
2651 setup_rename_conflict_info(rename_type
,
2661 } else if ((lookup
= string_list_lookup(renames2Dst
, ren1_dst
))) {
2662 /* Two different files renamed to the same thing */
2664 ren2
= lookup
->util
;
2665 ren2_dst
= ren2
->pair
->two
->path
;
2666 if (strcmp(ren1_dst
, ren2_dst
) != 0)
2667 BUG("ren1_dst != ren2_dst");
2670 ren2
->processed
= 1;
2672 * BUG: We should only mark src_entry as processed
2673 * if we are not dealing with a rename + add-source
2676 ren2
->src_entry
->processed
= 1;
2678 setup_rename_conflict_info(RENAME_TWO_FILES_TO_ONE
,
2690 /* Renamed in 1, maybe changed in 2 */
2691 /* we only use sha1 and mode of these */
2692 struct diff_filespec src_other
, dst_other
;
2696 * unpack_trees loads entries from common-commit
2697 * into stage 1, from head-commit into stage 2, and
2698 * from merge-commit into stage 3. We keep track
2699 * of which side corresponds to the rename.
2701 int renamed_stage
= a_renames
== renames1
? 2 : 3;
2702 int other_stage
= a_renames
== renames1
? 3 : 2;
2704 /* BUG: We should only remove ren1_src in the base
2705 * stage and in other_stage (think of rename +
2708 remove_file(o
, 1, ren1_src
,
2709 renamed_stage
== 2 || !was_tracked(o
, ren1_src
));
2711 oidcpy(&src_other
.oid
,
2712 &ren1
->src_entry
->stages
[other_stage
].oid
);
2713 src_other
.mode
= ren1
->src_entry
->stages
[other_stage
].mode
;
2714 oidcpy(&dst_other
.oid
,
2715 &ren1
->dst_entry
->stages
[other_stage
].oid
);
2716 dst_other
.mode
= ren1
->dst_entry
->stages
[other_stage
].mode
;
2719 if (oid_eq(&src_other
.oid
, &null_oid
) &&
2720 ren1
->add_turned_into_rename
) {
2721 setup_rename_conflict_info(RENAME_VIA_DIR
,
2731 } else if (oid_eq(&src_other
.oid
, &null_oid
)) {
2732 setup_rename_conflict_info(RENAME_DELETE
,
2742 } else if ((dst_other
.mode
== ren1
->pair
->two
->mode
) &&
2743 oid_eq(&dst_other
.oid
, &ren1
->pair
->two
->oid
)) {
2745 * Added file on the other side identical to
2746 * the file being renamed: clean merge.
2747 * Also, there is no need to overwrite the
2748 * file already in the working copy, so call
2749 * update_file_flags() instead of
2752 if (update_file_flags(o
,
2753 &ren1
->pair
->two
->oid
,
2754 ren1
->pair
->two
->mode
,
2756 1, /* update_cache */
2759 } else if (!oid_eq(&dst_other
.oid
, &null_oid
)) {
2762 output(o
, 1, _("CONFLICT (rename/add): Rename %s->%s in %s. "
2764 ren1_src
, ren1_dst
, branch1
,
2766 if (o
->call_depth
) {
2767 struct merge_file_info mfi
;
2768 if (merge_file_one(o
, ren1_dst
, &null_oid
, 0,
2769 &ren1
->pair
->two
->oid
,
2770 ren1
->pair
->two
->mode
,
2773 branch1
, branch2
, &mfi
)) {
2775 goto cleanup_and_return
;
2777 output(o
, 1, _("Adding merged %s"), ren1_dst
);
2778 if (update_file(o
, 0, &mfi
.oid
,
2779 mfi
.mode
, ren1_dst
))
2783 char *new_path
= unique_path(o
, ren1_dst
, branch2
);
2784 output(o
, 1, _("Adding as %s instead"), new_path
);
2785 if (update_file(o
, 0, &dst_other
.oid
,
2786 dst_other
.mode
, new_path
))
2793 if (clean_merge
< 0)
2794 goto cleanup_and_return
;
2796 struct diff_filespec
*one
, *a
, *b
;
2797 src_other
.path
= (char *)ren1_src
;
2799 one
= ren1
->pair
->one
;
2800 if (a_renames
== renames1
) {
2801 a
= ren1
->pair
->two
;
2804 b
= ren1
->pair
->two
;
2807 update_entry(ren1
->dst_entry
, one
, a
, b
);
2808 setup_rename_conflict_info(RENAME_NORMAL
,
2822 string_list_clear(&a_by_dst
, 0);
2823 string_list_clear(&b_by_dst
, 0);
2828 struct rename_info
{
2829 struct string_list
*head_renames
;
2830 struct string_list
*merge_renames
;
2833 static void initial_cleanup_rename(struct diff_queue_struct
*pairs
,
2834 struct hashmap
*dir_renames
)
2836 struct hashmap_iter iter
;
2837 struct dir_rename_entry
*e
;
2839 hashmap_iter_init(dir_renames
, &iter
);
2840 while ((e
= hashmap_iter_next(&iter
))) {
2842 strbuf_release(&e
->new_dir
);
2843 /* possible_new_dirs already cleared in get_directory_renames */
2845 hashmap_free(dir_renames
, 1);
2852 static int detect_and_process_renames(struct merge_options
*o
,
2853 struct tree
*common
,
2856 struct string_list
*entries
,
2857 struct rename_info
*ri
)
2859 struct diff_queue_struct
*head_pairs
, *merge_pairs
;
2860 struct hashmap
*dir_re_head
, *dir_re_merge
;
2863 ri
->head_renames
= NULL
;
2864 ri
->merge_renames
= NULL
;
2866 if (!merge_detect_rename(o
))
2869 head_pairs
= get_diffpairs(o
, common
, head
);
2870 merge_pairs
= get_diffpairs(o
, common
, merge
);
2872 dir_re_head
= get_directory_renames(head_pairs
, head
);
2873 dir_re_merge
= get_directory_renames(merge_pairs
, merge
);
2875 handle_directory_level_conflicts(o
,
2877 dir_re_merge
, merge
);
2879 ri
->head_renames
= get_renames(o
, head_pairs
,
2880 dir_re_merge
, dir_re_head
, head
,
2881 common
, head
, merge
, entries
,
2885 ri
->merge_renames
= get_renames(o
, merge_pairs
,
2886 dir_re_head
, dir_re_merge
, merge
,
2887 common
, head
, merge
, entries
,
2891 clean
&= process_renames(o
, ri
->head_renames
, ri
->merge_renames
);
2895 * Some cleanup is deferred until cleanup_renames() because the
2896 * data structures are still needed and referenced in
2897 * process_entry(). But there are a few things we can free now.
2899 initial_cleanup_rename(head_pairs
, dir_re_head
);
2900 initial_cleanup_rename(merge_pairs
, dir_re_merge
);
2905 static void final_cleanup_rename(struct string_list
*rename
)
2907 const struct rename
*re
;
2913 for (i
= 0; i
< rename
->nr
; i
++) {
2914 re
= rename
->items
[i
].util
;
2915 diff_free_filepair(re
->pair
);
2917 string_list_clear(rename
, 1);
2921 static void final_cleanup_renames(struct rename_info
*re_info
)
2923 final_cleanup_rename(re_info
->head_renames
);
2924 final_cleanup_rename(re_info
->merge_renames
);
2927 static struct object_id
*stage_oid(const struct object_id
*oid
, unsigned mode
)
2929 return (is_null_oid(oid
) || mode
== 0) ? NULL
: (struct object_id
*)oid
;
2932 static int read_oid_strbuf(struct merge_options
*o
,
2933 const struct object_id
*oid
,
2937 enum object_type type
;
2939 buf
= read_object_file(oid
, &type
, &size
);
2941 return err(o
, _("cannot read object %s"), oid_to_hex(oid
));
2942 if (type
!= OBJ_BLOB
) {
2944 return err(o
, _("object %s is not a blob"), oid_to_hex(oid
));
2946 strbuf_attach(dst
, buf
, size
, size
+ 1);
2950 static int blob_unchanged(struct merge_options
*opt
,
2951 const struct object_id
*o_oid
,
2953 const struct object_id
*a_oid
,
2955 int renormalize
, const char *path
)
2957 struct strbuf o
= STRBUF_INIT
;
2958 struct strbuf a
= STRBUF_INIT
;
2959 int ret
= 0; /* assume changed for safety */
2961 if (a_mode
!= o_mode
)
2963 if (oid_eq(o_oid
, a_oid
))
2968 assert(o_oid
&& a_oid
);
2969 if (read_oid_strbuf(opt
, o_oid
, &o
) || read_oid_strbuf(opt
, a_oid
, &a
))
2972 * Note: binary | is used so that both renormalizations are
2973 * performed. Comparison can be skipped if both files are
2974 * unchanged since their sha1s have already been compared.
2976 if (renormalize_buffer(&the_index
, path
, o
.buf
, o
.len
, &o
) |
2977 renormalize_buffer(&the_index
, path
, a
.buf
, a
.len
, &a
))
2978 ret
= (o
.len
== a
.len
&& !memcmp(o
.buf
, a
.buf
, o
.len
));
2986 static int handle_modify_delete(struct merge_options
*o
,
2988 struct object_id
*o_oid
, int o_mode
,
2989 struct object_id
*a_oid
, int a_mode
,
2990 struct object_id
*b_oid
, int b_mode
)
2992 const char *modify_branch
, *delete_branch
;
2993 struct object_id
*changed_oid
;
2997 modify_branch
= o
->branch1
;
2998 delete_branch
= o
->branch2
;
2999 changed_oid
= a_oid
;
3000 changed_mode
= a_mode
;
3002 modify_branch
= o
->branch2
;
3003 delete_branch
= o
->branch1
;
3004 changed_oid
= b_oid
;
3005 changed_mode
= b_mode
;
3008 return handle_change_delete(o
,
3011 changed_oid
, changed_mode
,
3012 modify_branch
, delete_branch
,
3013 _("modify"), _("modified"));
3016 static int merge_content(struct merge_options
*o
,
3019 struct object_id
*o_oid
, int o_mode
,
3020 struct object_id
*a_oid
, int a_mode
,
3021 struct object_id
*b_oid
, int b_mode
,
3022 struct rename_conflict_info
*rename_conflict_info
)
3024 const char *reason
= _("content");
3025 const char *path1
= NULL
, *path2
= NULL
;
3026 struct merge_file_info mfi
;
3027 struct diff_filespec one
, a
, b
;
3028 unsigned df_conflict_remains
= 0;
3031 reason
= _("add/add");
3032 o_oid
= (struct object_id
*)&null_oid
;
3034 one
.path
= a
.path
= b
.path
= (char *)path
;
3035 oidcpy(&one
.oid
, o_oid
);
3037 oidcpy(&a
.oid
, a_oid
);
3039 oidcpy(&b
.oid
, b_oid
);
3042 if (rename_conflict_info
) {
3043 struct diff_filepair
*pair1
= rename_conflict_info
->pair1
;
3045 path1
= (o
->branch1
== rename_conflict_info
->branch1
) ?
3046 pair1
->two
->path
: pair1
->one
->path
;
3047 /* If rename_conflict_info->pair2 != NULL, we are in
3048 * RENAME_ONE_FILE_TO_ONE case. Otherwise, we have a
3051 path2
= (rename_conflict_info
->pair2
||
3052 o
->branch2
== rename_conflict_info
->branch1
) ?
3053 pair1
->two
->path
: pair1
->one
->path
;
3055 if (dir_in_way(path
, !o
->call_depth
,
3056 S_ISGITLINK(pair1
->two
->mode
)))
3057 df_conflict_remains
= 1;
3059 if (merge_file_special_markers(o
, &one
, &a
, &b
, path
,
3061 o
->branch2
, path2
, &mfi
))
3065 * We can skip updating the working tree file iff:
3066 * a) The merge is clean
3067 * b) The merge matches what was in HEAD (content, mode, pathname)
3068 * c) The target path is usable (i.e. not involved in D/F conflict)
3071 was_tracked_and_matches(o
, path
, &mfi
.oid
, mfi
.mode
) &&
3072 !df_conflict_remains
) {
3074 struct cache_entry
*ce
;
3076 output(o
, 3, _("Skipped %s (merged same as existing)"), path
);
3077 if (add_cacheinfo(o
, mfi
.mode
, &mfi
.oid
, path
,
3078 0, (!o
->call_depth
&& !is_dirty
), 0))
3081 * However, add_cacheinfo() will delete the old cache entry
3082 * and add a new one. We need to copy over any skip_worktree
3083 * flag to avoid making the file appear as if it were
3084 * deleted by the user.
3086 pos
= index_name_pos(&o
->orig_index
, path
, strlen(path
));
3087 ce
= o
->orig_index
.cache
[pos
];
3088 if (ce_skip_worktree(ce
)) {
3089 pos
= index_name_pos(&the_index
, path
, strlen(path
));
3090 ce
= the_index
.cache
[pos
];
3091 ce
->ce_flags
|= CE_SKIP_WORKTREE
;
3097 if (S_ISGITLINK(mfi
.mode
))
3098 reason
= _("submodule");
3099 output(o
, 1, _("CONFLICT (%s): Merge conflict in %s"),
3101 if (rename_conflict_info
&& !df_conflict_remains
)
3102 if (update_stages(o
, path
, &one
, &a
, &b
))
3106 if (df_conflict_remains
|| is_dirty
) {
3108 if (o
->call_depth
) {
3109 remove_file_from_cache(path
);
3112 if (update_stages(o
, path
, &one
, &a
, &b
))
3115 int file_from_stage2
= was_tracked(o
, path
);
3116 struct diff_filespec merged
;
3117 oidcpy(&merged
.oid
, &mfi
.oid
);
3118 merged
.mode
= mfi
.mode
;
3120 if (update_stages(o
, path
, NULL
,
3121 file_from_stage2
? &merged
: NULL
,
3122 file_from_stage2
? NULL
: &merged
))
3127 new_path
= unique_path(o
, path
, rename_conflict_info
->branch1
);
3129 output(o
, 1, _("Refusing to lose dirty file at %s"),
3132 output(o
, 1, _("Adding as %s instead"), new_path
);
3133 if (update_file(o
, 0, &mfi
.oid
, mfi
.mode
, new_path
)) {
3139 } else if (update_file(o
, mfi
.clean
, &mfi
.oid
, mfi
.mode
, path
))
3141 return !is_dirty
&& mfi
.clean
;
3144 static int handle_rename_normal(struct merge_options
*o
,
3146 struct object_id
*o_oid
, unsigned int o_mode
,
3147 struct object_id
*a_oid
, unsigned int a_mode
,
3148 struct object_id
*b_oid
, unsigned int b_mode
,
3149 struct rename_conflict_info
*ci
)
3151 /* Merge the content and write it out */
3152 return merge_content(o
, path
, was_dirty(o
, path
),
3153 o_oid
, o_mode
, a_oid
, a_mode
, b_oid
, b_mode
,
3157 /* Per entry merge function */
3158 static int process_entry(struct merge_options
*o
,
3159 const char *path
, struct stage_data
*entry
)
3161 int clean_merge
= 1;
3162 int normalize
= o
->renormalize
;
3163 unsigned o_mode
= entry
->stages
[1].mode
;
3164 unsigned a_mode
= entry
->stages
[2].mode
;
3165 unsigned b_mode
= entry
->stages
[3].mode
;
3166 struct object_id
*o_oid
= stage_oid(&entry
->stages
[1].oid
, o_mode
);
3167 struct object_id
*a_oid
= stage_oid(&entry
->stages
[2].oid
, a_mode
);
3168 struct object_id
*b_oid
= stage_oid(&entry
->stages
[3].oid
, b_mode
);
3170 entry
->processed
= 1;
3171 if (entry
->rename_conflict_info
) {
3172 struct rename_conflict_info
*conflict_info
= entry
->rename_conflict_info
;
3173 switch (conflict_info
->rename_type
) {
3175 case RENAME_ONE_FILE_TO_ONE
:
3176 clean_merge
= handle_rename_normal(o
,
3183 case RENAME_VIA_DIR
:
3185 if (handle_rename_via_dir(o
,
3186 conflict_info
->pair1
,
3187 conflict_info
->branch1
,
3188 conflict_info
->branch2
))
3193 if (handle_rename_delete(o
,
3194 conflict_info
->pair1
,
3195 conflict_info
->branch1
,
3196 conflict_info
->branch2
))
3199 case RENAME_ONE_FILE_TO_TWO
:
3201 if (handle_rename_rename_1to2(o
, conflict_info
))
3204 case RENAME_TWO_FILES_TO_ONE
:
3206 if (handle_rename_rename_2to1(o
, conflict_info
))
3210 entry
->processed
= 0;
3213 } else if (o_oid
&& (!a_oid
|| !b_oid
)) {
3214 /* Case A: Deleted in one */
3215 if ((!a_oid
&& !b_oid
) ||
3216 (!b_oid
&& blob_unchanged(o
, o_oid
, o_mode
, a_oid
, a_mode
, normalize
, path
)) ||
3217 (!a_oid
&& blob_unchanged(o
, o_oid
, o_mode
, b_oid
, b_mode
, normalize
, path
))) {
3218 /* Deleted in both or deleted in one and
3219 * unchanged in the other */
3221 output(o
, 2, _("Removing %s"), path
);
3222 /* do not touch working file if it did not exist */
3223 remove_file(o
, 1, path
, !a_oid
);
3225 /* Modify/delete; deleted side may have put a directory in the way */
3227 if (handle_modify_delete(o
, path
, o_oid
, o_mode
,
3228 a_oid
, a_mode
, b_oid
, b_mode
))
3231 } else if ((!o_oid
&& a_oid
&& !b_oid
) ||
3232 (!o_oid
&& !a_oid
&& b_oid
)) {
3233 /* Case B: Added in one. */
3234 /* [nothing|directory] -> ([nothing|directory], file) */
3236 const char *add_branch
;
3237 const char *other_branch
;
3239 const struct object_id
*oid
;
3243 add_branch
= o
->branch1
;
3244 other_branch
= o
->branch2
;
3247 conf
= _("file/directory");
3249 add_branch
= o
->branch2
;
3250 other_branch
= o
->branch1
;
3253 conf
= _("directory/file");
3255 if (dir_in_way(path
,
3256 !o
->call_depth
&& !S_ISGITLINK(a_mode
),
3258 char *new_path
= unique_path(o
, path
, add_branch
);
3260 output(o
, 1, _("CONFLICT (%s): There is a directory with name %s in %s. "
3262 conf
, path
, other_branch
, path
, new_path
);
3263 if (update_file(o
, 0, oid
, mode
, new_path
))
3265 else if (o
->call_depth
)
3266 remove_file_from_cache(path
);
3269 output(o
, 2, _("Adding %s"), path
);
3270 /* do not overwrite file if already present */
3271 if (update_file_flags(o
, oid
, mode
, path
, 1, !a_oid
))
3274 } else if (a_oid
&& b_oid
) {
3275 /* Case C: Added in both (check for same permissions) and */
3276 /* case D: Modified in both, but differently. */
3277 int is_dirty
= 0; /* unpack_trees would have bailed if dirty */
3278 clean_merge
= merge_content(o
, path
, is_dirty
,
3279 o_oid
, o_mode
, a_oid
, a_mode
, b_oid
, b_mode
,
3281 } else if (!o_oid
&& !a_oid
&& !b_oid
) {
3283 * this entry was deleted altogether. a_mode == 0 means
3284 * we had that path and want to actively remove it.
3286 remove_file(o
, 1, path
, !a_mode
);
3288 BUG("fatal merge failure, shouldn't happen.");
3293 int merge_trees(struct merge_options
*o
,
3296 struct tree
*common
,
3297 struct tree
**result
)
3300 struct strbuf sb
= STRBUF_INIT
;
3302 if (!o
->call_depth
&& index_has_changes(&the_index
, head
, &sb
)) {
3303 err(o
, _("Your local changes to the following files would be overwritten by merge:\n %s"),
3308 if (o
->subtree_shift
) {
3309 merge
= shift_tree_object(head
, merge
, o
->subtree_shift
);
3310 common
= shift_tree_object(head
, common
, o
->subtree_shift
);
3313 if (oid_eq(&common
->object
.oid
, &merge
->object
.oid
)) {
3314 output(o
, 0, _("Already up to date!"));
3319 code
= unpack_trees_start(o
, common
, head
, merge
);
3322 if (show(o
, 4) || o
->call_depth
)
3323 err(o
, _("merging of trees %s and %s failed"),
3324 oid_to_hex(&head
->object
.oid
),
3325 oid_to_hex(&merge
->object
.oid
));
3326 unpack_trees_finish(o
);
3330 if (unmerged_cache()) {
3331 struct string_list
*entries
;
3332 struct rename_info re_info
;
3335 * Only need the hashmap while processing entries, so
3336 * initialize it here and free it when we are done running
3337 * through the entries. Keeping it in the merge_options as
3338 * opposed to decaring a local hashmap is for convenience
3339 * so that we don't have to pass it to around.
3341 hashmap_init(&o
->current_file_dir_set
, path_hashmap_cmp
, NULL
, 512);
3342 get_files_dirs(o
, head
);
3343 get_files_dirs(o
, merge
);
3345 entries
= get_unmerged();
3346 clean
= detect_and_process_renames(o
, common
, head
, merge
,
3348 record_df_conflict_files(o
, entries
);
3351 for (i
= entries
->nr
-1; 0 <= i
; i
--) {
3352 const char *path
= entries
->items
[i
].string
;
3353 struct stage_data
*e
= entries
->items
[i
].util
;
3354 if (!e
->processed
) {
3355 int ret
= process_entry(o
, path
, e
);
3364 for (i
= 0; i
< entries
->nr
; i
++) {
3365 struct stage_data
*e
= entries
->items
[i
].util
;
3367 BUG("unprocessed path??? %s",
3368 entries
->items
[i
].string
);
3372 final_cleanup_renames(&re_info
);
3374 string_list_clear(entries
, 1);
3377 hashmap_free(&o
->current_file_dir_set
, 1);
3380 unpack_trees_finish(o
);
3387 unpack_trees_finish(o
);
3389 if (o
->call_depth
&& !(*result
= write_tree_from_memory(o
)))
3395 static struct commit_list
*reverse_commit_list(struct commit_list
*list
)
3397 struct commit_list
*next
= NULL
, *current
, *backup
;
3398 for (current
= list
; current
; current
= backup
) {
3399 backup
= current
->next
;
3400 current
->next
= next
;
3407 * Merge the commits h1 and h2, return the resulting virtual
3408 * commit object and a flag indicating the cleanness of the merge.
3410 int merge_recursive(struct merge_options
*o
,
3413 struct commit_list
*ca
,
3414 struct commit
**result
)
3416 struct commit_list
*iter
;
3417 struct commit
*merged_common_ancestors
;
3418 struct tree
*mrtree
;
3422 output(o
, 4, _("Merging:"));
3423 output_commit_title(o
, h1
);
3424 output_commit_title(o
, h2
);
3428 ca
= get_merge_bases(h1
, h2
);
3429 ca
= reverse_commit_list(ca
);
3433 unsigned cnt
= commit_list_count(ca
);
3435 output(o
, 5, Q_("found %u common ancestor:",
3436 "found %u common ancestors:", cnt
), cnt
);
3437 for (iter
= ca
; iter
; iter
= iter
->next
)
3438 output_commit_title(o
, iter
->item
);
3441 merged_common_ancestors
= pop_commit(&ca
);
3442 if (merged_common_ancestors
== NULL
) {
3443 /* if there is no common ancestor, use an empty tree */
3446 tree
= lookup_tree(the_repository
, the_repository
->hash_algo
->empty_tree
);
3447 merged_common_ancestors
= make_virtual_commit(tree
, "ancestor");
3450 for (iter
= ca
; iter
; iter
= iter
->next
) {
3451 const char *saved_b1
, *saved_b2
;
3454 * When the merge fails, the result contains files
3455 * with conflict markers. The cleanness flag is
3456 * ignored (unless indicating an error), it was never
3457 * actually used, as result of merge_trees has always
3458 * overwritten it: the committed "conflicts" were
3462 saved_b1
= o
->branch1
;
3463 saved_b2
= o
->branch2
;
3464 o
->branch1
= "Temporary merge branch 1";
3465 o
->branch2
= "Temporary merge branch 2";
3466 if (merge_recursive(o
, merged_common_ancestors
, iter
->item
,
3467 NULL
, &merged_common_ancestors
) < 0)
3469 o
->branch1
= saved_b1
;
3470 o
->branch2
= saved_b2
;
3473 if (!merged_common_ancestors
)
3474 return err(o
, _("merge returned no commit"));
3481 o
->ancestor
= "merged common ancestors";
3482 clean
= merge_trees(o
, get_commit_tree(h1
), get_commit_tree(h2
),
3483 get_commit_tree(merged_common_ancestors
),
3490 if (o
->call_depth
) {
3491 *result
= make_virtual_commit(mrtree
, "merged tree");
3492 commit_list_insert(h1
, &(*result
)->parents
);
3493 commit_list_insert(h2
, &(*result
)->parents
->next
);
3496 if (!o
->call_depth
&& o
->buffer_output
< 2)
3497 strbuf_release(&o
->obuf
);
3499 diff_warn_rename_limit("merge.renamelimit",
3500 o
->needed_rename_limit
, 0);
3504 static struct commit
*get_ref(const struct object_id
*oid
, const char *name
)
3506 struct object
*object
;
3508 object
= deref_tag(the_repository
, parse_object(the_repository
, oid
),
3513 if (object
->type
== OBJ_TREE
)
3514 return make_virtual_commit((struct tree
*)object
, name
);
3515 if (object
->type
!= OBJ_COMMIT
)
3517 if (parse_commit((struct commit
*)object
))
3519 return (struct commit
*)object
;
3522 int merge_recursive_generic(struct merge_options
*o
,
3523 const struct object_id
*head
,
3524 const struct object_id
*merge
,
3526 const struct object_id
**base_list
,
3527 struct commit
**result
)
3530 struct lock_file lock
= LOCK_INIT
;
3531 struct commit
*head_commit
= get_ref(head
, o
->branch1
);
3532 struct commit
*next_commit
= get_ref(merge
, o
->branch2
);
3533 struct commit_list
*ca
= NULL
;
3537 for (i
= 0; i
< num_base_list
; ++i
) {
3538 struct commit
*base
;
3539 if (!(base
= get_ref(base_list
[i
], oid_to_hex(base_list
[i
]))))
3540 return err(o
, _("Could not parse object '%s'"),
3541 oid_to_hex(base_list
[i
]));
3542 commit_list_insert(base
, &ca
);
3546 hold_locked_index(&lock
, LOCK_DIE_ON_ERROR
);
3547 clean
= merge_recursive(o
, head_commit
, next_commit
, ca
,
3550 rollback_lock_file(&lock
);
3554 if (write_locked_index(&the_index
, &lock
,
3555 COMMIT_LOCK
| SKIP_IF_UNCHANGED
))
3556 return err(o
, _("Unable to write index."));
3558 return clean
? 0 : 1;
3561 static void merge_recursive_config(struct merge_options
*o
)
3564 git_config_get_int("merge.verbosity", &o
->verbosity
);
3565 git_config_get_int("diff.renamelimit", &o
->diff_rename_limit
);
3566 git_config_get_int("merge.renamelimit", &o
->merge_rename_limit
);
3567 if (!git_config_get_string("diff.renames", &value
)) {
3568 o
->diff_detect_rename
= git_config_rename("diff.renames", value
);
3571 if (!git_config_get_string("merge.renames", &value
)) {
3572 o
->merge_detect_rename
= git_config_rename("merge.renames", value
);
3575 git_config(git_xmerge_config
, NULL
);
3578 void init_merge_options(struct merge_options
*o
)
3580 const char *merge_verbosity
;
3581 memset(o
, 0, sizeof(struct merge_options
));
3583 o
->buffer_output
= 1;
3584 o
->diff_rename_limit
= -1;
3585 o
->merge_rename_limit
= -1;
3587 o
->diff_detect_rename
= -1;
3588 o
->merge_detect_rename
= -1;
3589 merge_recursive_config(o
);
3590 merge_verbosity
= getenv("GIT_MERGE_VERBOSITY");
3591 if (merge_verbosity
)
3592 o
->verbosity
= strtol(merge_verbosity
, NULL
, 10);
3593 if (o
->verbosity
>= 5)
3594 o
->buffer_output
= 0;
3595 strbuf_init(&o
->obuf
, 0);
3596 string_list_init(&o
->df_conflict_file_set
, 1);
3599 int parse_merge_opt(struct merge_options
*o
, const char *s
)
3605 if (!strcmp(s
, "ours"))
3606 o
->recursive_variant
= MERGE_RECURSIVE_OURS
;
3607 else if (!strcmp(s
, "theirs"))
3608 o
->recursive_variant
= MERGE_RECURSIVE_THEIRS
;
3609 else if (!strcmp(s
, "subtree"))
3610 o
->subtree_shift
= "";
3611 else if (skip_prefix(s
, "subtree=", &arg
))
3612 o
->subtree_shift
= arg
;
3613 else if (!strcmp(s
, "patience"))
3614 o
->xdl_opts
= DIFF_WITH_ALG(o
, PATIENCE_DIFF
);
3615 else if (!strcmp(s
, "histogram"))
3616 o
->xdl_opts
= DIFF_WITH_ALG(o
, HISTOGRAM_DIFF
);
3617 else if (skip_prefix(s
, "diff-algorithm=", &arg
)) {
3618 long value
= parse_algorithm_value(arg
);
3621 /* clear out previous settings */
3622 DIFF_XDL_CLR(o
, NEED_MINIMAL
);
3623 o
->xdl_opts
&= ~XDF_DIFF_ALGORITHM_MASK
;
3624 o
->xdl_opts
|= value
;
3626 else if (!strcmp(s
, "ignore-space-change"))
3627 DIFF_XDL_SET(o
, IGNORE_WHITESPACE_CHANGE
);
3628 else if (!strcmp(s
, "ignore-all-space"))
3629 DIFF_XDL_SET(o
, IGNORE_WHITESPACE
);
3630 else if (!strcmp(s
, "ignore-space-at-eol"))
3631 DIFF_XDL_SET(o
, IGNORE_WHITESPACE_AT_EOL
);
3632 else if (!strcmp(s
, "ignore-cr-at-eol"))
3633 DIFF_XDL_SET(o
, IGNORE_CR_AT_EOL
);
3634 else if (!strcmp(s
, "renormalize"))
3636 else if (!strcmp(s
, "no-renormalize"))
3638 else if (!strcmp(s
, "no-renames"))
3639 o
->merge_detect_rename
= 0;
3640 else if (!strcmp(s
, "find-renames")) {
3641 o
->merge_detect_rename
= 1;
3642 o
->rename_score
= 0;
3644 else if (skip_prefix(s
, "find-renames=", &arg
) ||
3645 skip_prefix(s
, "rename-threshold=", &arg
)) {
3646 if ((o
->rename_score
= parse_rename_score(&arg
)) == -1 || *arg
!= 0)
3648 o
->merge_detect_rename
= 1;