2 * Recursive Merge algorithm stolen from git-merge-recursive.py by
4 * The thieves were Alex Riesen and Johannes Schindelin, in June/July 2006
10 #include "cache-tree.h"
14 #include "tree-walk.h"
18 #include "unpack-trees.h"
19 #include "string-list.h"
20 #include "xdiff-interface.h"
23 #include "merge-recursive.h"
25 #include "submodule.h"
28 struct path_hashmap_entry
{
29 struct hashmap_entry e
;
30 char path
[FLEX_ARRAY
];
33 static int path_hashmap_cmp(const void *cmp_data
,
35 const void *entry_or_key
,
38 const struct path_hashmap_entry
*a
= entry
;
39 const struct path_hashmap_entry
*b
= entry_or_key
;
40 const char *key
= keydata
;
43 return strcasecmp(a
->path
, key
? key
: b
->path
);
45 return strcmp(a
->path
, key
? key
: b
->path
);
48 static unsigned int path_hash(const char *path
)
50 return ignore_case
? strihash(path
) : strhash(path
);
53 static struct dir_rename_entry
*dir_rename_find_entry(struct hashmap
*hashmap
,
56 struct dir_rename_entry key
;
60 hashmap_entry_init(&key
, strhash(dir
));
62 return hashmap_get(hashmap
, &key
, NULL
);
65 static int dir_rename_cmp(const void *unused_cmp_data
,
67 const void *entry_or_key
,
68 const void *unused_keydata
)
70 const struct dir_rename_entry
*e1
= entry
;
71 const struct dir_rename_entry
*e2
= entry_or_key
;
73 return strcmp(e1
->dir
, e2
->dir
);
76 static void dir_rename_init(struct hashmap
*map
)
78 hashmap_init(map
, dir_rename_cmp
, NULL
, 0);
81 static void dir_rename_entry_init(struct dir_rename_entry
*entry
,
84 hashmap_entry_init(entry
, strhash(directory
));
85 entry
->dir
= directory
;
86 entry
->non_unique_new_dir
= 0;
87 strbuf_init(&entry
->new_dir
, 0);
88 string_list_init(&entry
->possible_new_dirs
, 0);
91 static struct collision_entry
*collision_find_entry(struct hashmap
*hashmap
,
94 struct collision_entry key
;
96 hashmap_entry_init(&key
, strhash(target_file
));
97 key
.target_file
= target_file
;
98 return hashmap_get(hashmap
, &key
, NULL
);
101 static int collision_cmp(void *unused_cmp_data
,
102 const struct collision_entry
*e1
,
103 const struct collision_entry
*e2
,
104 const void *unused_keydata
)
106 return strcmp(e1
->target_file
, e2
->target_file
);
109 static void collision_init(struct hashmap
*map
)
111 hashmap_init(map
, (hashmap_cmp_fn
) collision_cmp
, NULL
, 0);
114 static void flush_output(struct merge_options
*o
)
116 if (o
->buffer_output
< 2 && o
->obuf
.len
) {
117 fputs(o
->obuf
.buf
, stdout
);
118 strbuf_reset(&o
->obuf
);
122 static int err(struct merge_options
*o
, const char *err
, ...)
126 if (o
->buffer_output
< 2)
129 strbuf_complete(&o
->obuf
, '\n');
130 strbuf_addstr(&o
->obuf
, "error: ");
132 va_start(params
, err
);
133 strbuf_vaddf(&o
->obuf
, err
, params
);
135 if (o
->buffer_output
> 1)
136 strbuf_addch(&o
->obuf
, '\n');
138 error("%s", o
->obuf
.buf
);
139 strbuf_reset(&o
->obuf
);
145 static struct tree
*shift_tree_object(struct tree
*one
, struct tree
*two
,
146 const char *subtree_shift
)
148 struct object_id shifted
;
150 if (!*subtree_shift
) {
151 shift_tree(&one
->object
.oid
, &two
->object
.oid
, &shifted
, 0);
153 shift_tree_by(&one
->object
.oid
, &two
->object
.oid
, &shifted
,
156 if (!oidcmp(&two
->object
.oid
, &shifted
))
158 return lookup_tree(&shifted
);
161 static struct commit
*make_virtual_commit(struct tree
*tree
, const char *comment
)
163 struct commit
*commit
= alloc_commit_node();
165 set_merge_remote_desc(commit
, comment
, (struct object
*)commit
);
166 commit
->maybe_tree
= tree
;
167 commit
->object
.parsed
= 1;
172 * Since we use get_tree_entry(), which does not put the read object into
173 * the object pool, we cannot rely on a == b.
175 static int oid_eq(const struct object_id
*a
, const struct object_id
*b
)
179 return a
&& b
&& oidcmp(a
, b
) == 0;
186 RENAME_ONE_FILE_TO_ONE
,
187 RENAME_ONE_FILE_TO_TWO
,
188 RENAME_TWO_FILES_TO_ONE
191 struct rename_conflict_info
{
192 enum rename_type rename_type
;
193 struct diff_filepair
*pair1
;
194 struct diff_filepair
*pair2
;
197 struct stage_data
*dst_entry1
;
198 struct stage_data
*dst_entry2
;
199 struct diff_filespec ren1_other
;
200 struct diff_filespec ren2_other
;
204 * Since we want to write the index eventually, we cannot reuse the index
205 * for these (temporary) data.
210 struct object_id oid
;
212 struct rename_conflict_info
*rename_conflict_info
;
213 unsigned processed
:1;
216 static inline void setup_rename_conflict_info(enum rename_type rename_type
,
217 struct diff_filepair
*pair1
,
218 struct diff_filepair
*pair2
,
221 struct stage_data
*dst_entry1
,
222 struct stage_data
*dst_entry2
,
223 struct merge_options
*o
,
224 struct stage_data
*src_entry1
,
225 struct stage_data
*src_entry2
)
227 struct rename_conflict_info
*ci
= xcalloc(1, sizeof(struct rename_conflict_info
));
228 ci
->rename_type
= rename_type
;
230 ci
->branch1
= branch1
;
231 ci
->branch2
= branch2
;
233 ci
->dst_entry1
= dst_entry1
;
234 dst_entry1
->rename_conflict_info
= ci
;
235 dst_entry1
->processed
= 0;
237 assert(!pair2
== !dst_entry2
);
239 ci
->dst_entry2
= dst_entry2
;
241 dst_entry2
->rename_conflict_info
= ci
;
244 if (rename_type
== RENAME_TWO_FILES_TO_ONE
) {
246 * For each rename, there could have been
247 * modifications on the side of history where that
248 * file was not renamed.
250 int ostage1
= o
->branch1
== branch1
? 3 : 2;
251 int ostage2
= ostage1
^ 1;
253 ci
->ren1_other
.path
= pair1
->one
->path
;
254 oidcpy(&ci
->ren1_other
.oid
, &src_entry1
->stages
[ostage1
].oid
);
255 ci
->ren1_other
.mode
= src_entry1
->stages
[ostage1
].mode
;
257 ci
->ren2_other
.path
= pair2
->one
->path
;
258 oidcpy(&ci
->ren2_other
.oid
, &src_entry2
->stages
[ostage2
].oid
);
259 ci
->ren2_other
.mode
= src_entry2
->stages
[ostage2
].mode
;
263 static int show(struct merge_options
*o
, int v
)
265 return (!o
->call_depth
&& o
->verbosity
>= v
) || o
->verbosity
>= 5;
268 __attribute__((format (printf
, 3, 4)))
269 static void output(struct merge_options
*o
, int v
, const char *fmt
, ...)
276 strbuf_addchars(&o
->obuf
, ' ', o
->call_depth
* 2);
279 strbuf_vaddf(&o
->obuf
, fmt
, ap
);
282 strbuf_addch(&o
->obuf
, '\n');
283 if (!o
->buffer_output
)
287 static void output_commit_title(struct merge_options
*o
, struct commit
*commit
)
289 strbuf_addchars(&o
->obuf
, ' ', o
->call_depth
* 2);
291 strbuf_addf(&o
->obuf
, "virtual %s\n",
292 merge_remote_util(commit
)->name
);
294 strbuf_add_unique_abbrev(&o
->obuf
, &commit
->object
.oid
,
296 strbuf_addch(&o
->obuf
, ' ');
297 if (parse_commit(commit
) != 0)
298 strbuf_addstr(&o
->obuf
, _("(bad commit)\n"));
301 const char *msg
= get_commit_buffer(commit
, NULL
);
302 int len
= find_commit_subject(msg
, &title
);
304 strbuf_addf(&o
->obuf
, "%.*s\n", len
, title
);
305 unuse_commit_buffer(commit
, msg
);
311 static int add_cacheinfo(struct merge_options
*o
,
312 unsigned int mode
, const struct object_id
*oid
,
313 const char *path
, int stage
, int refresh
, int options
)
315 struct cache_entry
*ce
;
318 ce
= make_cache_entry(mode
, oid
? oid
->hash
: null_sha1
, path
, stage
, 0);
320 return err(o
, _("add_cacheinfo failed for path '%s'; merge aborting."), path
);
322 ret
= add_cache_entry(ce
, options
);
324 struct cache_entry
*nce
;
326 nce
= refresh_cache_entry(ce
, CE_MATCH_REFRESH
| CE_MATCH_IGNORE_MISSING
);
328 return err(o
, _("add_cacheinfo failed to refresh for path '%s'; merge aborting."), path
);
330 ret
= add_cache_entry(nce
, options
);
335 static void init_tree_desc_from_tree(struct tree_desc
*desc
, struct tree
*tree
)
338 init_tree_desc(desc
, tree
->buffer
, tree
->size
);
341 static int git_merge_trees(struct merge_options
*o
,
347 struct tree_desc t
[3];
348 struct index_state tmp_index
= { NULL
};
350 memset(&o
->unpack_opts
, 0, sizeof(o
->unpack_opts
));
352 o
->unpack_opts
.index_only
= 1;
354 o
->unpack_opts
.update
= 1;
355 o
->unpack_opts
.merge
= 1;
356 o
->unpack_opts
.head_idx
= 2;
357 o
->unpack_opts
.fn
= threeway_merge
;
358 o
->unpack_opts
.src_index
= &the_index
;
359 o
->unpack_opts
.dst_index
= &tmp_index
;
360 o
->unpack_opts
.aggressive
= !merge_detect_rename(o
);
361 setup_unpack_trees_porcelain(&o
->unpack_opts
, "merge");
363 init_tree_desc_from_tree(t
+0, common
);
364 init_tree_desc_from_tree(t
+1, head
);
365 init_tree_desc_from_tree(t
+2, merge
);
367 rc
= unpack_trees(3, t
, &o
->unpack_opts
);
368 cache_tree_free(&active_cache_tree
);
371 * Update the_index to match the new results, AFTER saving a copy
372 * in o->orig_index. Update src_index to point to the saved copy.
373 * (verify_uptodate() checks src_index, and the original index is
374 * the one that had the necessary modification timestamps.)
376 o
->orig_index
= the_index
;
377 the_index
= tmp_index
;
378 o
->unpack_opts
.src_index
= &o
->orig_index
;
383 struct tree
*write_tree_from_memory(struct merge_options
*o
)
385 struct tree
*result
= NULL
;
387 if (unmerged_cache()) {
389 fprintf(stderr
, "BUG: There are unmerged index entries:\n");
390 for (i
= 0; i
< active_nr
; i
++) {
391 const struct cache_entry
*ce
= active_cache
[i
];
393 fprintf(stderr
, "BUG: %d %.*s\n", ce_stage(ce
),
394 (int)ce_namelen(ce
), ce
->name
);
396 BUG("unmerged index entries in merge-recursive.c");
399 if (!active_cache_tree
)
400 active_cache_tree
= cache_tree();
402 if (!cache_tree_fully_valid(active_cache_tree
) &&
403 cache_tree_update(&the_index
, 0) < 0) {
404 err(o
, _("error building trees"));
408 result
= lookup_tree(&active_cache_tree
->oid
);
413 static int save_files_dirs(const struct object_id
*oid
,
414 struct strbuf
*base
, const char *path
,
415 unsigned int mode
, int stage
, void *context
)
417 struct path_hashmap_entry
*entry
;
418 int baselen
= base
->len
;
419 struct merge_options
*o
= context
;
421 strbuf_addstr(base
, path
);
423 FLEX_ALLOC_MEM(entry
, path
, base
->buf
, base
->len
);
424 hashmap_entry_init(entry
, path_hash(entry
->path
));
425 hashmap_add(&o
->current_file_dir_set
, entry
);
427 strbuf_setlen(base
, baselen
);
428 return (S_ISDIR(mode
) ? READ_TREE_RECURSIVE
: 0);
431 static void get_files_dirs(struct merge_options
*o
, struct tree
*tree
)
433 struct pathspec match_all
;
434 memset(&match_all
, 0, sizeof(match_all
));
435 read_tree_recursive(tree
, "", 0, 0, &match_all
, save_files_dirs
, o
);
438 static int get_tree_entry_if_blob(const struct object_id
*tree
,
440 struct object_id
*hashy
,
441 unsigned int *mode_o
)
445 ret
= get_tree_entry(tree
, path
, hashy
, mode_o
);
446 if (S_ISDIR(*mode_o
)) {
447 oidcpy(hashy
, &null_oid
);
454 * Returns an index_entry instance which doesn't have to correspond to
455 * a real cache entry in Git's index.
457 static struct stage_data
*insert_stage_data(const char *path
,
458 struct tree
*o
, struct tree
*a
, struct tree
*b
,
459 struct string_list
*entries
)
461 struct string_list_item
*item
;
462 struct stage_data
*e
= xcalloc(1, sizeof(struct stage_data
));
463 get_tree_entry_if_blob(&o
->object
.oid
, path
,
464 &e
->stages
[1].oid
, &e
->stages
[1].mode
);
465 get_tree_entry_if_blob(&a
->object
.oid
, path
,
466 &e
->stages
[2].oid
, &e
->stages
[2].mode
);
467 get_tree_entry_if_blob(&b
->object
.oid
, path
,
468 &e
->stages
[3].oid
, &e
->stages
[3].mode
);
469 item
= string_list_insert(entries
, path
);
475 * Create a dictionary mapping file names to stage_data objects. The
476 * dictionary contains one entry for every path with a non-zero stage entry.
478 static struct string_list
*get_unmerged(void)
480 struct string_list
*unmerged
= xcalloc(1, sizeof(struct string_list
));
483 unmerged
->strdup_strings
= 1;
485 for (i
= 0; i
< active_nr
; i
++) {
486 struct string_list_item
*item
;
487 struct stage_data
*e
;
488 const struct cache_entry
*ce
= active_cache
[i
];
492 item
= string_list_lookup(unmerged
, ce
->name
);
494 item
= string_list_insert(unmerged
, ce
->name
);
495 item
->util
= xcalloc(1, sizeof(struct stage_data
));
498 e
->stages
[ce_stage(ce
)].mode
= ce
->ce_mode
;
499 oidcpy(&e
->stages
[ce_stage(ce
)].oid
, &ce
->oid
);
505 static int string_list_df_name_compare(const char *one
, const char *two
)
507 int onelen
= strlen(one
);
508 int twolen
= strlen(two
);
510 * Here we only care that entries for D/F conflicts are
511 * adjacent, in particular with the file of the D/F conflict
512 * appearing before files below the corresponding directory.
513 * The order of the rest of the list is irrelevant for us.
515 * To achieve this, we sort with df_name_compare and provide
516 * the mode S_IFDIR so that D/F conflicts will sort correctly.
517 * We use the mode S_IFDIR for everything else for simplicity,
518 * since in other cases any changes in their order due to
519 * sorting cause no problems for us.
521 int cmp
= df_name_compare(one
, onelen
, S_IFDIR
,
522 two
, twolen
, S_IFDIR
);
524 * Now that 'foo' and 'foo/bar' compare equal, we have to make sure
525 * that 'foo' comes before 'foo/bar'.
529 return onelen
- twolen
;
532 static void record_df_conflict_files(struct merge_options
*o
,
533 struct string_list
*entries
)
535 /* If there is a D/F conflict and the file for such a conflict
536 * currently exist in the working tree, we want to allow it to be
537 * removed to make room for the corresponding directory if needed.
538 * The files underneath the directories of such D/F conflicts will
539 * be processed before the corresponding file involved in the D/F
540 * conflict. If the D/F directory ends up being removed by the
541 * merge, then we won't have to touch the D/F file. If the D/F
542 * directory needs to be written to the working copy, then the D/F
543 * file will simply be removed (in make_room_for_path()) to make
544 * room for the necessary paths. Note that if both the directory
545 * and the file need to be present, then the D/F file will be
546 * reinstated with a new unique name at the time it is processed.
548 struct string_list df_sorted_entries
= STRING_LIST_INIT_NODUP
;
549 const char *last_file
= NULL
;
554 * If we're merging merge-bases, we don't want to bother with
555 * any working directory changes.
560 /* Ensure D/F conflicts are adjacent in the entries list. */
561 for (i
= 0; i
< entries
->nr
; i
++) {
562 struct string_list_item
*next
= &entries
->items
[i
];
563 string_list_append(&df_sorted_entries
, next
->string
)->util
=
566 df_sorted_entries
.cmp
= string_list_df_name_compare
;
567 string_list_sort(&df_sorted_entries
);
569 string_list_clear(&o
->df_conflict_file_set
, 1);
570 for (i
= 0; i
< df_sorted_entries
.nr
; i
++) {
571 const char *path
= df_sorted_entries
.items
[i
].string
;
572 int len
= strlen(path
);
573 struct stage_data
*e
= df_sorted_entries
.items
[i
].util
;
576 * Check if last_file & path correspond to a D/F conflict;
577 * i.e. whether path is last_file+'/'+<something>.
578 * If so, record that it's okay to remove last_file to make
579 * room for path and friends if needed.
583 memcmp(path
, last_file
, last_len
) == 0 &&
584 path
[last_len
] == '/') {
585 string_list_insert(&o
->df_conflict_file_set
, last_file
);
589 * Determine whether path could exist as a file in the
590 * working directory as a possible D/F conflict. This
591 * will only occur when it exists in stage 2 as a
594 if (S_ISREG(e
->stages
[2].mode
) || S_ISLNK(e
->stages
[2].mode
)) {
601 string_list_clear(&df_sorted_entries
, 0);
605 struct diff_filepair
*pair
;
607 * Purpose of src_entry and dst_entry:
609 * If 'before' is renamed to 'after' then src_entry will contain
610 * the versions of 'before' from the merge_base, HEAD, and MERGE in
611 * stages 1, 2, and 3; dst_entry will contain the respective
612 * versions of 'after' in corresponding locations. Thus, we have a
613 * total of six modes and oids, though some will be null. (Stage 0
614 * is ignored; we're interested in handling conflicts.)
616 * Since we don't turn on break-rewrites by default, neither
617 * src_entry nor dst_entry can have all three of their stages have
618 * non-null oids, meaning at most four of the six will be non-null.
619 * Also, since this is a rename, both src_entry and dst_entry will
620 * have at least one non-null oid, meaning at least two will be
621 * non-null. Of the six oids, a typical rename will have three be
622 * non-null. Only two implies a rename/delete, and four implies a
625 struct stage_data
*src_entry
;
626 struct stage_data
*dst_entry
;
627 unsigned add_turned_into_rename
:1;
628 unsigned processed
:1;
631 static int update_stages(struct merge_options
*opt
, const char *path
,
632 const struct diff_filespec
*o
,
633 const struct diff_filespec
*a
,
634 const struct diff_filespec
*b
)
638 * NOTE: It is usually a bad idea to call update_stages on a path
639 * before calling update_file on that same path, since it can
640 * sometimes lead to spurious "refusing to lose untracked file..."
641 * messages from update_file (via make_room_for path via
642 * would_lose_untracked). Instead, reverse the order of the calls
643 * (executing update_file first and then update_stages).
646 int options
= ADD_CACHE_OK_TO_ADD
| ADD_CACHE_SKIP_DFCHECK
;
648 if (remove_file_from_cache(path
))
651 if (add_cacheinfo(opt
, o
->mode
, &o
->oid
, path
, 1, 0, options
))
654 if (add_cacheinfo(opt
, a
->mode
, &a
->oid
, path
, 2, 0, options
))
657 if (add_cacheinfo(opt
, b
->mode
, &b
->oid
, path
, 3, 0, options
))
662 static int update_stages_for_stage_data(struct merge_options
*opt
,
664 const struct stage_data
*stage_data
)
666 struct diff_filespec o
, a
, b
;
668 o
.mode
= stage_data
->stages
[1].mode
;
669 oidcpy(&o
.oid
, &stage_data
->stages
[1].oid
);
671 a
.mode
= stage_data
->stages
[2].mode
;
672 oidcpy(&a
.oid
, &stage_data
->stages
[2].oid
);
674 b
.mode
= stage_data
->stages
[3].mode
;
675 oidcpy(&b
.oid
, &stage_data
->stages
[3].oid
);
677 return update_stages(opt
, path
,
678 is_null_oid(&o
.oid
) ? NULL
: &o
,
679 is_null_oid(&a
.oid
) ? NULL
: &a
,
680 is_null_oid(&b
.oid
) ? NULL
: &b
);
683 static void update_entry(struct stage_data
*entry
,
684 struct diff_filespec
*o
,
685 struct diff_filespec
*a
,
686 struct diff_filespec
*b
)
688 entry
->processed
= 0;
689 entry
->stages
[1].mode
= o
->mode
;
690 entry
->stages
[2].mode
= a
->mode
;
691 entry
->stages
[3].mode
= b
->mode
;
692 oidcpy(&entry
->stages
[1].oid
, &o
->oid
);
693 oidcpy(&entry
->stages
[2].oid
, &a
->oid
);
694 oidcpy(&entry
->stages
[3].oid
, &b
->oid
);
697 static int remove_file(struct merge_options
*o
, int clean
,
698 const char *path
, int no_wd
)
700 int update_cache
= o
->call_depth
|| clean
;
701 int update_working_directory
= !o
->call_depth
&& !no_wd
;
704 if (remove_file_from_cache(path
))
707 if (update_working_directory
) {
709 struct cache_entry
*ce
;
710 ce
= cache_file_exists(path
, strlen(path
), ignore_case
);
711 if (ce
&& ce_stage(ce
) == 0 && strcmp(path
, ce
->name
))
714 if (remove_path(path
))
720 /* add a string to a strbuf, but converting "/" to "_" */
721 static void add_flattened_path(struct strbuf
*out
, const char *s
)
724 strbuf_addstr(out
, s
);
725 for (; i
< out
->len
; i
++)
726 if (out
->buf
[i
] == '/')
730 static char *unique_path(struct merge_options
*o
, const char *path
, const char *branch
)
732 struct path_hashmap_entry
*entry
;
733 struct strbuf newpath
= STRBUF_INIT
;
737 strbuf_addf(&newpath
, "%s~", path
);
738 add_flattened_path(&newpath
, branch
);
740 base_len
= newpath
.len
;
741 while (hashmap_get_from_hash(&o
->current_file_dir_set
,
742 path_hash(newpath
.buf
), newpath
.buf
) ||
743 (!o
->call_depth
&& file_exists(newpath
.buf
))) {
744 strbuf_setlen(&newpath
, base_len
);
745 strbuf_addf(&newpath
, "_%d", suffix
++);
748 FLEX_ALLOC_MEM(entry
, path
, newpath
.buf
, newpath
.len
);
749 hashmap_entry_init(entry
, path_hash(entry
->path
));
750 hashmap_add(&o
->current_file_dir_set
, entry
);
751 return strbuf_detach(&newpath
, NULL
);
755 * Check whether a directory in the index is in the way of an incoming
756 * file. Return 1 if so. If check_working_copy is non-zero, also
757 * check the working directory. If empty_ok is non-zero, also return
758 * 0 in the case where the working-tree dir exists but is empty.
760 static int dir_in_way(const char *path
, int check_working_copy
, int empty_ok
)
763 struct strbuf dirpath
= STRBUF_INIT
;
766 strbuf_addstr(&dirpath
, path
);
767 strbuf_addch(&dirpath
, '/');
769 pos
= cache_name_pos(dirpath
.buf
, dirpath
.len
);
773 if (pos
< active_nr
&&
774 !strncmp(dirpath
.buf
, active_cache
[pos
]->name
, dirpath
.len
)) {
775 strbuf_release(&dirpath
);
779 strbuf_release(&dirpath
);
780 return check_working_copy
&& !lstat(path
, &st
) && S_ISDIR(st
.st_mode
) &&
781 !(empty_ok
&& is_empty_dir(path
));
785 * Returns whether path was tracked in the index before the merge started,
786 * and its oid and mode match the specified values
788 static int was_tracked_and_matches(struct merge_options
*o
, const char *path
,
789 const struct object_id
*oid
, unsigned mode
)
791 int pos
= index_name_pos(&o
->orig_index
, path
, strlen(path
));
792 struct cache_entry
*ce
;
795 /* we were not tracking this path before the merge */
798 /* See if the file we were tracking before matches */
799 ce
= o
->orig_index
.cache
[pos
];
800 return (oid_eq(&ce
->oid
, oid
) && ce
->ce_mode
== mode
);
804 * Returns whether path was tracked in the index before the merge started
806 static int was_tracked(struct merge_options
*o
, const char *path
)
808 int pos
= index_name_pos(&o
->orig_index
, path
, strlen(path
));
811 /* we were tracking this path before the merge */
817 static int would_lose_untracked(const char *path
)
820 * This may look like it can be simplified to:
821 * return !was_tracked(o, path) && file_exists(path)
822 * but it can't. This function needs to know whether path was in
823 * the working tree due to EITHER having been tracked in the index
824 * before the merge OR having been put into the working copy and
825 * index by unpack_trees(). Due to that either-or requirement, we
826 * check the current index instead of the original one.
828 * Note that we do not need to worry about merge-recursive itself
829 * updating the index after unpack_trees() and before calling this
830 * function, because we strictly require all code paths in
831 * merge-recursive to update the working tree first and the index
832 * second. Doing otherwise would break
833 * update_file()/would_lose_untracked(); see every comment in this
834 * file which mentions "update_stages".
836 int pos
= cache_name_pos(path
, strlen(path
));
840 while (pos
< active_nr
&&
841 !strcmp(path
, active_cache
[pos
]->name
)) {
843 * If stage #0, it is definitely tracked.
844 * If it has stage #2 then it was tracked
845 * before this merge started. All other
846 * cases the path was not tracked.
848 switch (ce_stage(active_cache
[pos
])) {
855 return file_exists(path
);
858 static int was_dirty(struct merge_options
*o
, const char *path
)
860 struct cache_entry
*ce
;
863 if (o
->call_depth
|| !was_tracked(o
, path
))
866 ce
= index_file_exists(o
->unpack_opts
.src_index
,
867 path
, strlen(path
), ignore_case
);
868 dirty
= verify_uptodate(ce
, &o
->unpack_opts
) != 0;
872 static int make_room_for_path(struct merge_options
*o
, const char *path
)
875 const char *msg
= _("failed to create path '%s'%s");
877 /* Unlink any D/F conflict files that are in the way */
878 for (i
= 0; i
< o
->df_conflict_file_set
.nr
; i
++) {
879 const char *df_path
= o
->df_conflict_file_set
.items
[i
].string
;
880 size_t pathlen
= strlen(path
);
881 size_t df_pathlen
= strlen(df_path
);
882 if (df_pathlen
< pathlen
&&
883 path
[df_pathlen
] == '/' &&
884 strncmp(path
, df_path
, df_pathlen
) == 0) {
886 _("Removing %s to make room for subdirectory\n"),
889 unsorted_string_list_delete_item(&o
->df_conflict_file_set
,
895 /* Make sure leading directories are created */
896 status
= safe_create_leading_directories_const(path
);
898 if (status
== SCLD_EXISTS
)
899 /* something else exists */
900 return err(o
, msg
, path
, _(": perhaps a D/F conflict?"));
901 return err(o
, msg
, path
, "");
905 * Do not unlink a file in the work tree if we are not
908 if (would_lose_untracked(path
))
909 return err(o
, _("refusing to lose untracked file at '%s'"),
912 /* Successful unlink is good.. */
915 /* .. and so is no existing file */
918 /* .. but not some other error (who really cares what?) */
919 return err(o
, msg
, path
, _(": perhaps a D/F conflict?"));
922 static int update_file_flags(struct merge_options
*o
,
923 const struct object_id
*oid
,
935 enum object_type type
;
939 if (S_ISGITLINK(mode
)) {
941 * We may later decide to recursively descend into
942 * the submodule directory and update its index
943 * and/or work tree, but we do not do that now.
949 buf
= read_object_file(oid
, &type
, &size
);
951 return err(o
, _("cannot read object %s '%s'"), oid_to_hex(oid
), path
);
952 if (type
!= OBJ_BLOB
) {
953 ret
= err(o
, _("blob expected for %s '%s'"), oid_to_hex(oid
), path
);
957 struct strbuf strbuf
= STRBUF_INIT
;
958 if (convert_to_working_tree(path
, buf
, size
, &strbuf
)) {
961 buf
= strbuf_detach(&strbuf
, NULL
);
965 if (make_room_for_path(o
, path
) < 0) {
969 if (S_ISREG(mode
) || (!has_symlinks
&& S_ISLNK(mode
))) {
975 fd
= open(path
, O_WRONLY
| O_TRUNC
| O_CREAT
, mode
);
977 ret
= err(o
, _("failed to open '%s': %s"),
978 path
, strerror(errno
));
981 write_in_full(fd
, buf
, size
);
983 } else if (S_ISLNK(mode
)) {
984 char *lnk
= xmemdupz(buf
, size
);
985 safe_create_leading_directories_const(path
);
987 if (symlink(lnk
, path
))
988 ret
= err(o
, _("failed to symlink '%s': %s"),
989 path
, strerror(errno
));
993 _("do not know what to do with %06o %s '%s'"),
994 mode
, oid_to_hex(oid
), path
);
999 if (!ret
&& update_cache
)
1000 if (add_cacheinfo(o
, mode
, oid
, path
, 0, update_wd
,
1001 ADD_CACHE_OK_TO_ADD
))
1006 static int update_file(struct merge_options
*o
,
1008 const struct object_id
*oid
,
1012 return update_file_flags(o
, oid
, mode
, path
, o
->call_depth
|| clean
, !o
->call_depth
);
1015 /* Low level file merging, update and removal */
1017 struct merge_file_info
{
1018 struct object_id oid
;
1024 static int merge_3way(struct merge_options
*o
,
1025 mmbuffer_t
*result_buf
,
1026 const struct diff_filespec
*one
,
1027 const struct diff_filespec
*a
,
1028 const struct diff_filespec
*b
,
1029 const char *branch1
,
1030 const char *branch2
)
1032 mmfile_t orig
, src1
, src2
;
1033 struct ll_merge_options ll_opts
= {0};
1034 char *base_name
, *name1
, *name2
;
1037 ll_opts
.renormalize
= o
->renormalize
;
1038 ll_opts
.xdl_opts
= o
->xdl_opts
;
1040 if (o
->call_depth
) {
1041 ll_opts
.virtual_ancestor
= 1;
1042 ll_opts
.variant
= 0;
1044 switch (o
->recursive_variant
) {
1045 case MERGE_RECURSIVE_OURS
:
1046 ll_opts
.variant
= XDL_MERGE_FAVOR_OURS
;
1048 case MERGE_RECURSIVE_THEIRS
:
1049 ll_opts
.variant
= XDL_MERGE_FAVOR_THEIRS
;
1052 ll_opts
.variant
= 0;
1057 if (strcmp(a
->path
, b
->path
) ||
1058 (o
->ancestor
!= NULL
&& strcmp(a
->path
, one
->path
) != 0)) {
1059 base_name
= o
->ancestor
== NULL
? NULL
:
1060 mkpathdup("%s:%s", o
->ancestor
, one
->path
);
1061 name1
= mkpathdup("%s:%s", branch1
, a
->path
);
1062 name2
= mkpathdup("%s:%s", branch2
, b
->path
);
1064 base_name
= o
->ancestor
== NULL
? NULL
:
1065 mkpathdup("%s", o
->ancestor
);
1066 name1
= mkpathdup("%s", branch1
);
1067 name2
= mkpathdup("%s", branch2
);
1070 read_mmblob(&orig
, &one
->oid
);
1071 read_mmblob(&src1
, &a
->oid
);
1072 read_mmblob(&src2
, &b
->oid
);
1074 merge_status
= ll_merge(result_buf
, a
->path
, &orig
, base_name
,
1075 &src1
, name1
, &src2
, name2
, &ll_opts
);
1083 return merge_status
;
1086 static int find_first_merges(struct object_array
*result
, const char *path
,
1087 struct commit
*a
, struct commit
*b
)
1090 struct object_array merges
= OBJECT_ARRAY_INIT
;
1091 struct commit
*commit
;
1092 int contains_another
;
1094 char merged_revision
[42];
1095 const char *rev_args
[] = { "rev-list", "--merges", "--ancestry-path",
1096 "--all", merged_revision
, NULL
};
1097 struct rev_info revs
;
1098 struct setup_revision_opt rev_opts
;
1100 memset(result
, 0, sizeof(struct object_array
));
1101 memset(&rev_opts
, 0, sizeof(rev_opts
));
1103 /* get all revisions that merge commit a */
1104 xsnprintf(merged_revision
, sizeof(merged_revision
), "^%s",
1105 oid_to_hex(&a
->object
.oid
));
1106 init_revisions(&revs
, NULL
);
1107 rev_opts
.submodule
= path
;
1108 /* FIXME: can't handle linked worktrees in submodules yet */
1109 revs
.single_worktree
= path
!= NULL
;
1110 setup_revisions(ARRAY_SIZE(rev_args
)-1, rev_args
, &revs
, &rev_opts
);
1112 /* save all revisions from the above list that contain b */
1113 if (prepare_revision_walk(&revs
))
1114 die("revision walk setup failed");
1115 while ((commit
= get_revision(&revs
)) != NULL
) {
1116 struct object
*o
= &(commit
->object
);
1117 if (in_merge_bases(b
, commit
))
1118 add_object_array(o
, NULL
, &merges
);
1120 reset_revision_walk();
1122 /* Now we've got all merges that contain a and b. Prune all
1123 * merges that contain another found merge and save them in
1126 for (i
= 0; i
< merges
.nr
; i
++) {
1127 struct commit
*m1
= (struct commit
*) merges
.objects
[i
].item
;
1129 contains_another
= 0;
1130 for (j
= 0; j
< merges
.nr
; j
++) {
1131 struct commit
*m2
= (struct commit
*) merges
.objects
[j
].item
;
1132 if (i
!= j
&& in_merge_bases(m2
, m1
)) {
1133 contains_another
= 1;
1138 if (!contains_another
)
1139 add_object_array(merges
.objects
[i
].item
, NULL
, result
);
1142 object_array_clear(&merges
);
1146 static void print_commit(struct commit
*commit
)
1148 struct strbuf sb
= STRBUF_INIT
;
1149 struct pretty_print_context ctx
= {0};
1150 ctx
.date_mode
.type
= DATE_NORMAL
;
1151 format_commit_message(commit
, " %h: %m %s", &sb
, &ctx
);
1152 fprintf(stderr
, "%s\n", sb
.buf
);
1153 strbuf_release(&sb
);
1156 static int merge_submodule(struct merge_options
*o
,
1157 struct object_id
*result
, const char *path
,
1158 const struct object_id
*base
, const struct object_id
*a
,
1159 const struct object_id
*b
)
1161 struct commit
*commit_base
, *commit_a
, *commit_b
;
1163 struct object_array merges
;
1166 int search
= !o
->call_depth
;
1168 /* store a in result in case we fail */
1171 /* we can not handle deletion conflicts */
1172 if (is_null_oid(base
))
1179 if (add_submodule_odb(path
)) {
1180 output(o
, 1, _("Failed to merge submodule %s (not checked out)"), path
);
1184 if (!(commit_base
= lookup_commit_reference(base
)) ||
1185 !(commit_a
= lookup_commit_reference(a
)) ||
1186 !(commit_b
= lookup_commit_reference(b
))) {
1187 output(o
, 1, _("Failed to merge submodule %s (commits not present)"), path
);
1191 /* check whether both changes are forward */
1192 if (!in_merge_bases(commit_base
, commit_a
) ||
1193 !in_merge_bases(commit_base
, commit_b
)) {
1194 output(o
, 1, _("Failed to merge submodule %s (commits don't follow merge-base)"), path
);
1198 /* Case #1: a is contained in b or vice versa */
1199 if (in_merge_bases(commit_a
, commit_b
)) {
1202 output(o
, 3, _("Fast-forwarding submodule %s to the following commit:"), path
);
1203 output_commit_title(o
, commit_b
);
1204 } else if (show(o
, 2))
1205 output(o
, 2, _("Fast-forwarding submodule %s to %s"), path
, oid_to_hex(b
));
1211 if (in_merge_bases(commit_b
, commit_a
)) {
1214 output(o
, 3, _("Fast-forwarding submodule %s to the following commit:"), path
);
1215 output_commit_title(o
, commit_a
);
1216 } else if (show(o
, 2))
1217 output(o
, 2, _("Fast-forwarding submodule %s to %s"), path
, oid_to_hex(a
));
1225 * Case #2: There are one or more merges that contain a and b in
1226 * the submodule. If there is only one, then present it as a
1227 * suggestion to the user, but leave it marked unmerged so the
1228 * user needs to confirm the resolution.
1231 /* Skip the search if makes no sense to the calling context. */
1235 /* find commit which merges them */
1236 parent_count
= find_first_merges(&merges
, path
, commit_a
, commit_b
);
1237 switch (parent_count
) {
1239 output(o
, 1, _("Failed to merge submodule %s (merge following commits not found)"), path
);
1243 output(o
, 1, _("Failed to merge submodule %s (not fast-forward)"), path
);
1244 output(o
, 2, _("Found a possible merge resolution for the submodule:\n"));
1245 print_commit((struct commit
*) merges
.objects
[0].item
);
1247 "If this is correct simply add it to the index "
1250 " git update-index --cacheinfo 160000 %s \"%s\"\n\n"
1251 "which will accept this suggestion.\n"),
1252 oid_to_hex(&merges
.objects
[0].item
->oid
), path
);
1256 output(o
, 1, _("Failed to merge submodule %s (multiple merges found)"), path
);
1257 for (i
= 0; i
< merges
.nr
; i
++)
1258 print_commit((struct commit
*) merges
.objects
[i
].item
);
1261 object_array_clear(&merges
);
1265 static int merge_file_1(struct merge_options
*o
,
1266 const struct diff_filespec
*one
,
1267 const struct diff_filespec
*a
,
1268 const struct diff_filespec
*b
,
1269 const char *filename
,
1270 const char *branch1
,
1271 const char *branch2
,
1272 struct merge_file_info
*result
)
1277 if ((S_IFMT
& a
->mode
) != (S_IFMT
& b
->mode
)) {
1279 if (S_ISREG(a
->mode
)) {
1280 result
->mode
= a
->mode
;
1281 oidcpy(&result
->oid
, &a
->oid
);
1283 result
->mode
= b
->mode
;
1284 oidcpy(&result
->oid
, &b
->oid
);
1287 if (!oid_eq(&a
->oid
, &one
->oid
) && !oid_eq(&b
->oid
, &one
->oid
))
1293 if (a
->mode
== b
->mode
|| a
->mode
== one
->mode
)
1294 result
->mode
= b
->mode
;
1296 result
->mode
= a
->mode
;
1297 if (b
->mode
!= one
->mode
) {
1303 if (oid_eq(&a
->oid
, &b
->oid
) || oid_eq(&a
->oid
, &one
->oid
))
1304 oidcpy(&result
->oid
, &b
->oid
);
1305 else if (oid_eq(&b
->oid
, &one
->oid
))
1306 oidcpy(&result
->oid
, &a
->oid
);
1307 else if (S_ISREG(a
->mode
)) {
1308 mmbuffer_t result_buf
;
1309 int ret
= 0, merge_status
;
1311 merge_status
= merge_3way(o
, &result_buf
, one
, a
, b
,
1314 if ((merge_status
< 0) || !result_buf
.ptr
)
1315 ret
= err(o
, _("Failed to execute internal merge"));
1318 write_object_file(result_buf
.ptr
, result_buf
.size
,
1319 blob_type
, &result
->oid
))
1320 ret
= err(o
, _("Unable to add %s to database"),
1323 free(result_buf
.ptr
);
1326 result
->clean
= (merge_status
== 0);
1327 } else if (S_ISGITLINK(a
->mode
)) {
1328 result
->clean
= merge_submodule(o
, &result
->oid
,
1333 } else if (S_ISLNK(a
->mode
)) {
1334 switch (o
->recursive_variant
) {
1335 case MERGE_RECURSIVE_NORMAL
:
1336 oidcpy(&result
->oid
, &a
->oid
);
1337 if (!oid_eq(&a
->oid
, &b
->oid
))
1340 case MERGE_RECURSIVE_OURS
:
1341 oidcpy(&result
->oid
, &a
->oid
);
1343 case MERGE_RECURSIVE_THEIRS
:
1344 oidcpy(&result
->oid
, &b
->oid
);
1348 BUG("unsupported object type in the tree");
1352 output(o
, 2, _("Auto-merging %s"), filename
);
1357 static int merge_file_special_markers(struct merge_options
*o
,
1358 const struct diff_filespec
*one
,
1359 const struct diff_filespec
*a
,
1360 const struct diff_filespec
*b
,
1361 const char *target_filename
,
1362 const char *branch1
,
1363 const char *filename1
,
1364 const char *branch2
,
1365 const char *filename2
,
1366 struct merge_file_info
*mfi
)
1373 side1
= xstrfmt("%s:%s", branch1
, filename1
);
1375 side2
= xstrfmt("%s:%s", branch2
, filename2
);
1377 ret
= merge_file_1(o
, one
, a
, b
, target_filename
,
1378 side1
? side1
: branch1
,
1379 side2
? side2
: branch2
, mfi
);
1386 static int merge_file_one(struct merge_options
*o
,
1388 const struct object_id
*o_oid
, int o_mode
,
1389 const struct object_id
*a_oid
, int a_mode
,
1390 const struct object_id
*b_oid
, int b_mode
,
1391 const char *branch1
,
1392 const char *branch2
,
1393 struct merge_file_info
*mfi
)
1395 struct diff_filespec one
, a
, b
;
1397 one
.path
= a
.path
= b
.path
= (char *)path
;
1398 oidcpy(&one
.oid
, o_oid
);
1400 oidcpy(&a
.oid
, a_oid
);
1402 oidcpy(&b
.oid
, b_oid
);
1404 return merge_file_1(o
, &one
, &a
, &b
, path
, branch1
, branch2
, mfi
);
1407 static int conflict_rename_dir(struct merge_options
*o
,
1408 struct diff_filepair
*pair
,
1409 const char *rename_branch
,
1410 const char *other_branch
)
1412 const struct diff_filespec
*dest
= pair
->two
;
1414 if (!o
->call_depth
&& would_lose_untracked(dest
->path
)) {
1415 char *alt_path
= unique_path(o
, dest
->path
, rename_branch
);
1417 output(o
, 1, _("Error: Refusing to lose untracked file at %s; "
1418 "writing to %s instead."),
1419 dest
->path
, alt_path
);
1421 * Write the file in worktree at alt_path, but not in the
1422 * index. Instead, write to dest->path for the index but
1423 * only at the higher appropriate stage.
1425 if (update_file(o
, 0, &dest
->oid
, dest
->mode
, alt_path
))
1428 return update_stages(o
, dest
->path
, NULL
,
1429 rename_branch
== o
->branch1
? dest
: NULL
,
1430 rename_branch
== o
->branch1
? NULL
: dest
);
1433 /* Update dest->path both in index and in worktree */
1434 if (update_file(o
, 1, &dest
->oid
, dest
->mode
, dest
->path
))
1439 static int handle_change_delete(struct merge_options
*o
,
1440 const char *path
, const char *old_path
,
1441 const struct object_id
*o_oid
, int o_mode
,
1442 const struct object_id
*changed_oid
,
1444 const char *change_branch
,
1445 const char *delete_branch
,
1446 const char *change
, const char *change_past
)
1448 char *alt_path
= NULL
;
1449 const char *update_path
= path
;
1452 if (dir_in_way(path
, !o
->call_depth
, 0) ||
1453 (!o
->call_depth
&& would_lose_untracked(path
))) {
1454 update_path
= alt_path
= unique_path(o
, path
, change_branch
);
1457 if (o
->call_depth
) {
1459 * We cannot arbitrarily accept either a_sha or b_sha as
1460 * correct; since there is no true "middle point" between
1461 * them, simply reuse the base version for virtual merge base.
1463 ret
= remove_file_from_cache(path
);
1465 ret
= update_file(o
, 0, o_oid
, o_mode
, update_path
);
1469 output(o
, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1470 "and %s in %s. Version %s of %s left in tree."),
1471 change
, path
, delete_branch
, change_past
,
1472 change_branch
, change_branch
, path
);
1474 output(o
, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1475 "and %s to %s in %s. Version %s of %s left in tree."),
1476 change
, old_path
, delete_branch
, change_past
, path
,
1477 change_branch
, change_branch
, path
);
1481 output(o
, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1482 "and %s in %s. Version %s of %s left in tree at %s."),
1483 change
, path
, delete_branch
, change_past
,
1484 change_branch
, change_branch
, path
, alt_path
);
1486 output(o
, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1487 "and %s to %s in %s. Version %s of %s left in tree at %s."),
1488 change
, old_path
, delete_branch
, change_past
, path
,
1489 change_branch
, change_branch
, path
, alt_path
);
1493 * No need to call update_file() on path when change_branch ==
1494 * o->branch1 && !alt_path, since that would needlessly touch
1495 * path. We could call update_file_flags() with update_cache=0
1496 * and update_wd=0, but that's a no-op.
1498 if (change_branch
!= o
->branch1
|| alt_path
)
1499 ret
= update_file(o
, 0, changed_oid
, changed_mode
, update_path
);
1506 static int conflict_rename_delete(struct merge_options
*o
,
1507 struct diff_filepair
*pair
,
1508 const char *rename_branch
,
1509 const char *delete_branch
)
1511 const struct diff_filespec
*orig
= pair
->one
;
1512 const struct diff_filespec
*dest
= pair
->two
;
1514 if (handle_change_delete(o
,
1515 o
->call_depth
? orig
->path
: dest
->path
,
1516 o
->call_depth
? NULL
: orig
->path
,
1517 &orig
->oid
, orig
->mode
,
1518 &dest
->oid
, dest
->mode
,
1519 rename_branch
, delete_branch
,
1520 _("rename"), _("renamed")))
1524 return remove_file_from_cache(dest
->path
);
1526 return update_stages(o
, dest
->path
, NULL
,
1527 rename_branch
== o
->branch1
? dest
: NULL
,
1528 rename_branch
== o
->branch1
? NULL
: dest
);
1531 static struct diff_filespec
*filespec_from_entry(struct diff_filespec
*target
,
1532 struct stage_data
*entry
,
1535 struct object_id
*oid
= &entry
->stages
[stage
].oid
;
1536 unsigned mode
= entry
->stages
[stage
].mode
;
1537 if (mode
== 0 || is_null_oid(oid
))
1539 oidcpy(&target
->oid
, oid
);
1540 target
->mode
= mode
;
1544 static int handle_file(struct merge_options
*o
,
1545 struct diff_filespec
*rename
,
1547 struct rename_conflict_info
*ci
)
1549 char *dst_name
= rename
->path
;
1550 struct stage_data
*dst_entry
;
1551 const char *cur_branch
, *other_branch
;
1552 struct diff_filespec other
;
1553 struct diff_filespec
*add
;
1557 dst_entry
= ci
->dst_entry1
;
1558 cur_branch
= ci
->branch1
;
1559 other_branch
= ci
->branch2
;
1561 dst_entry
= ci
->dst_entry2
;
1562 cur_branch
= ci
->branch2
;
1563 other_branch
= ci
->branch1
;
1566 add
= filespec_from_entry(&other
, dst_entry
, stage
^ 1);
1568 int ren_src_was_dirty
= was_dirty(o
, rename
->path
);
1569 char *add_name
= unique_path(o
, rename
->path
, other_branch
);
1570 if (update_file(o
, 0, &add
->oid
, add
->mode
, add_name
))
1573 if (ren_src_was_dirty
) {
1574 output(o
, 1, _("Refusing to lose dirty file at %s"),
1578 * Because the double negatives somehow keep confusing me...
1579 * 1) update_wd iff !ren_src_was_dirty.
1580 * 2) no_wd iff !update_wd
1581 * 3) so, no_wd == !!ren_src_was_dirty == ren_src_was_dirty
1583 remove_file(o
, 0, rename
->path
, ren_src_was_dirty
);
1584 dst_name
= unique_path(o
, rename
->path
, cur_branch
);
1586 if (dir_in_way(rename
->path
, !o
->call_depth
, 0)) {
1587 dst_name
= unique_path(o
, rename
->path
, cur_branch
);
1588 output(o
, 1, _("%s is a directory in %s adding as %s instead"),
1589 rename
->path
, other_branch
, dst_name
);
1590 } else if (!o
->call_depth
&&
1591 would_lose_untracked(rename
->path
)) {
1592 dst_name
= unique_path(o
, rename
->path
, cur_branch
);
1593 output(o
, 1, _("Refusing to lose untracked file at %s; "
1594 "adding as %s instead"),
1595 rename
->path
, dst_name
);
1598 if ((ret
= update_file(o
, 0, &rename
->oid
, rename
->mode
, dst_name
)))
1599 ; /* fall through, do allow dst_name to be released */
1600 else if (stage
== 2)
1601 ret
= update_stages(o
, rename
->path
, NULL
, rename
, add
);
1603 ret
= update_stages(o
, rename
->path
, NULL
, add
, rename
);
1605 if (dst_name
!= rename
->path
)
1611 static int conflict_rename_rename_1to2(struct merge_options
*o
,
1612 struct rename_conflict_info
*ci
)
1614 /* One file was renamed in both branches, but to different names. */
1615 struct diff_filespec
*one
= ci
->pair1
->one
;
1616 struct diff_filespec
*a
= ci
->pair1
->two
;
1617 struct diff_filespec
*b
= ci
->pair2
->two
;
1619 output(o
, 1, _("CONFLICT (rename/rename): "
1620 "Rename \"%s\"->\"%s\" in branch \"%s\" "
1621 "rename \"%s\"->\"%s\" in \"%s\"%s"),
1622 one
->path
, a
->path
, ci
->branch1
,
1623 one
->path
, b
->path
, ci
->branch2
,
1624 o
->call_depth
? _(" (left unresolved)") : "");
1625 if (o
->call_depth
) {
1626 struct merge_file_info mfi
;
1627 struct diff_filespec other
;
1628 struct diff_filespec
*add
;
1629 if (merge_file_one(o
, one
->path
,
1630 &one
->oid
, one
->mode
,
1633 ci
->branch1
, ci
->branch2
, &mfi
))
1637 * FIXME: For rename/add-source conflicts (if we could detect
1638 * such), this is wrong. We should instead find a unique
1639 * pathname and then either rename the add-source file to that
1640 * unique path, or use that unique path instead of src here.
1642 if (update_file(o
, 0, &mfi
.oid
, mfi
.mode
, one
->path
))
1646 * Above, we put the merged content at the merge-base's
1647 * path. Now we usually need to delete both a->path and
1648 * b->path. However, the rename on each side of the merge
1649 * could also be involved in a rename/add conflict. In
1650 * such cases, we should keep the added file around,
1651 * resolving the conflict at that path in its favor.
1653 add
= filespec_from_entry(&other
, ci
->dst_entry1
, 2 ^ 1);
1655 if (update_file(o
, 0, &add
->oid
, add
->mode
, a
->path
))
1659 remove_file_from_cache(a
->path
);
1660 add
= filespec_from_entry(&other
, ci
->dst_entry2
, 3 ^ 1);
1662 if (update_file(o
, 0, &add
->oid
, add
->mode
, b
->path
))
1666 remove_file_from_cache(b
->path
);
1667 } else if (handle_file(o
, a
, 2, ci
) || handle_file(o
, b
, 3, ci
))
1673 static int conflict_rename_rename_2to1(struct merge_options
*o
,
1674 struct rename_conflict_info
*ci
)
1676 /* Two files, a & b, were renamed to the same thing, c. */
1677 struct diff_filespec
*a
= ci
->pair1
->one
;
1678 struct diff_filespec
*b
= ci
->pair2
->one
;
1679 struct diff_filespec
*c1
= ci
->pair1
->two
;
1680 struct diff_filespec
*c2
= ci
->pair2
->two
;
1681 char *path
= c1
->path
; /* == c2->path */
1682 char *path_side_1_desc
;
1683 char *path_side_2_desc
;
1684 struct merge_file_info mfi_c1
;
1685 struct merge_file_info mfi_c2
;
1688 output(o
, 1, _("CONFLICT (rename/rename): "
1689 "Rename %s->%s in %s. "
1690 "Rename %s->%s in %s"),
1691 a
->path
, c1
->path
, ci
->branch1
,
1692 b
->path
, c2
->path
, ci
->branch2
);
1694 remove_file(o
, 1, a
->path
, o
->call_depth
|| would_lose_untracked(a
->path
));
1695 remove_file(o
, 1, b
->path
, o
->call_depth
|| would_lose_untracked(b
->path
));
1697 path_side_1_desc
= xstrfmt("%s (was %s)", path
, a
->path
);
1698 path_side_2_desc
= xstrfmt("%s (was %s)", path
, b
->path
);
1699 if (merge_file_special_markers(o
, a
, c1
, &ci
->ren1_other
,
1701 o
->branch1
, c1
->path
,
1702 o
->branch2
, ci
->ren1_other
.path
, &mfi_c1
) ||
1703 merge_file_special_markers(o
, b
, &ci
->ren2_other
, c2
,
1705 o
->branch1
, ci
->ren2_other
.path
,
1706 o
->branch2
, c2
->path
, &mfi_c2
))
1708 free(path_side_1_desc
);
1709 free(path_side_2_desc
);
1711 if (o
->call_depth
) {
1713 * If mfi_c1.clean && mfi_c2.clean, then it might make
1714 * sense to do a two-way merge of those results. But, I
1715 * think in all cases, it makes sense to have the virtual
1716 * merge base just undo the renames; they can be detected
1717 * again later for the non-recursive merge.
1719 remove_file(o
, 0, path
, 0);
1720 ret
= update_file(o
, 0, &mfi_c1
.oid
, mfi_c1
.mode
, a
->path
);
1722 ret
= update_file(o
, 0, &mfi_c2
.oid
, mfi_c2
.mode
,
1725 char *new_path1
= unique_path(o
, path
, ci
->branch1
);
1726 char *new_path2
= unique_path(o
, path
, ci
->branch2
);
1727 output(o
, 1, _("Renaming %s to %s and %s to %s instead"),
1728 a
->path
, new_path1
, b
->path
, new_path2
);
1729 if (was_dirty(o
, path
))
1730 output(o
, 1, _("Refusing to lose dirty file at %s"),
1732 else if (would_lose_untracked(path
))
1734 * Only way we get here is if both renames were from
1735 * a directory rename AND user had an untracked file
1736 * at the location where both files end up after the
1737 * two directory renames. See testcase 10d of t6043.
1739 output(o
, 1, _("Refusing to lose untracked file at "
1740 "%s, even though it's in the way."),
1743 remove_file(o
, 0, path
, 0);
1744 ret
= update_file(o
, 0, &mfi_c1
.oid
, mfi_c1
.mode
, new_path1
);
1746 ret
= update_file(o
, 0, &mfi_c2
.oid
, mfi_c2
.mode
,
1749 * unpack_trees() actually populates the index for us for
1750 * "normal" rename/rename(2to1) situtations so that the
1751 * correct entries are at the higher stages, which would
1752 * make the call below to update_stages_for_stage_data
1753 * unnecessary. However, if either of the renames came
1754 * from a directory rename, then unpack_trees() will not
1755 * have gotten the right data loaded into the index, so we
1756 * need to do so now. (While it'd be tempting to move this
1757 * call to update_stages_for_stage_data() to
1758 * apply_directory_rename_modifications(), that would break
1759 * our intermediate calls to would_lose_untracked() since
1760 * those rely on the current in-memory index. See also the
1761 * big "NOTE" in update_stages()).
1763 if (update_stages_for_stage_data(o
, path
, ci
->dst_entry1
))
1774 * Get the diff_filepairs changed between o_tree and tree.
1776 static struct diff_queue_struct
*get_diffpairs(struct merge_options
*o
,
1777 struct tree
*o_tree
,
1780 struct diff_queue_struct
*ret
;
1781 struct diff_options opts
;
1784 opts
.flags
.recursive
= 1;
1785 opts
.flags
.rename_empty
= 0;
1786 opts
.detect_rename
= merge_detect_rename(o
);
1788 * We do not have logic to handle the detection of copies. In
1789 * fact, it may not even make sense to add such logic: would we
1790 * really want a change to a base file to be propagated through
1791 * multiple other files by a merge?
1793 if (opts
.detect_rename
> DIFF_DETECT_RENAME
)
1794 opts
.detect_rename
= DIFF_DETECT_RENAME
;
1795 opts
.rename_limit
= o
->merge_rename_limit
>= 0 ? o
->merge_rename_limit
:
1796 o
->diff_rename_limit
>= 0 ? o
->diff_rename_limit
:
1798 opts
.rename_score
= o
->rename_score
;
1799 opts
.show_rename_progress
= o
->show_rename_progress
;
1800 opts
.output_format
= DIFF_FORMAT_NO_OUTPUT
;
1801 diff_setup_done(&opts
);
1802 diff_tree_oid(&o_tree
->object
.oid
, &tree
->object
.oid
, "", &opts
);
1803 diffcore_std(&opts
);
1804 if (opts
.needed_rename_limit
> o
->needed_rename_limit
)
1805 o
->needed_rename_limit
= opts
.needed_rename_limit
;
1807 ret
= xmalloc(sizeof(*ret
));
1808 *ret
= diff_queued_diff
;
1810 opts
.output_format
= DIFF_FORMAT_NO_OUTPUT
;
1811 diff_queued_diff
.nr
= 0;
1812 diff_queued_diff
.queue
= NULL
;
1817 static int tree_has_path(struct tree
*tree
, const char *path
)
1819 struct object_id hashy
;
1820 unsigned int mode_o
;
1822 return !get_tree_entry(&tree
->object
.oid
, path
,
1827 * Return a new string that replaces the beginning portion (which matches
1828 * entry->dir), with entry->new_dir. In perl-speak:
1829 * new_path_name = (old_path =~ s/entry->dir/entry->new_dir/);
1831 * Caller must ensure that old_path starts with entry->dir + '/'.
1833 static char *apply_dir_rename(struct dir_rename_entry
*entry
,
1834 const char *old_path
)
1836 struct strbuf new_path
= STRBUF_INIT
;
1839 if (entry
->non_unique_new_dir
)
1842 oldlen
= strlen(entry
->dir
);
1843 newlen
= entry
->new_dir
.len
+ (strlen(old_path
) - oldlen
) + 1;
1844 strbuf_grow(&new_path
, newlen
);
1845 strbuf_addbuf(&new_path
, &entry
->new_dir
);
1846 strbuf_addstr(&new_path
, &old_path
[oldlen
]);
1848 return strbuf_detach(&new_path
, NULL
);
1851 static void get_renamed_dir_portion(const char *old_path
, const char *new_path
,
1852 char **old_dir
, char **new_dir
)
1854 char *end_of_old
, *end_of_new
;
1855 int old_len
, new_len
;
1862 * "a/b/c/d/e/foo.c" -> "a/b/some/thing/else/e/foo.c"
1863 * the "e/foo.c" part is the same, we just want to know that
1864 * "a/b/c/d" was renamed to "a/b/some/thing/else"
1865 * so, for this example, this function returns "a/b/c/d" in
1866 * *old_dir and "a/b/some/thing/else" in *new_dir.
1868 * Also, if the basename of the file changed, we don't care. We
1869 * want to know which portion of the directory, if any, changed.
1871 end_of_old
= strrchr(old_path
, '/');
1872 end_of_new
= strrchr(new_path
, '/');
1874 if (end_of_old
== NULL
|| end_of_new
== NULL
)
1876 while (*--end_of_new
== *--end_of_old
&&
1877 end_of_old
!= old_path
&&
1878 end_of_new
!= new_path
)
1879 ; /* Do nothing; all in the while loop */
1881 * We've found the first non-matching character in the directory
1882 * paths. That means the current directory we were comparing
1883 * represents the rename. Move end_of_old and end_of_new back
1884 * to the full directory name.
1886 if (*end_of_old
== '/')
1888 if (*end_of_old
!= '/')
1890 end_of_old
= strchr(end_of_old
, '/');
1891 end_of_new
= strchr(end_of_new
, '/');
1894 * It may have been the case that old_path and new_path were the same
1895 * directory all along. Don't claim a rename if they're the same.
1897 old_len
= end_of_old
- old_path
;
1898 new_len
= end_of_new
- new_path
;
1900 if (old_len
!= new_len
|| strncmp(old_path
, new_path
, old_len
)) {
1901 *old_dir
= xstrndup(old_path
, old_len
);
1902 *new_dir
= xstrndup(new_path
, new_len
);
1906 static void remove_hashmap_entries(struct hashmap
*dir_renames
,
1907 struct string_list
*items_to_remove
)
1910 struct dir_rename_entry
*entry
;
1912 for (i
= 0; i
< items_to_remove
->nr
; i
++) {
1913 entry
= items_to_remove
->items
[i
].util
;
1914 hashmap_remove(dir_renames
, entry
, NULL
);
1916 string_list_clear(items_to_remove
, 0);
1920 * See if there is a directory rename for path, and if there are any file
1921 * level conflicts for the renamed location. If there is a rename and
1922 * there are no conflicts, return the new name. Otherwise, return NULL.
1924 static char *handle_path_level_conflicts(struct merge_options
*o
,
1926 struct dir_rename_entry
*entry
,
1927 struct hashmap
*collisions
,
1930 char *new_path
= NULL
;
1931 struct collision_entry
*collision_ent
;
1933 struct strbuf collision_paths
= STRBUF_INIT
;
1936 * entry has the mapping of old directory name to new directory name
1937 * that we want to apply to path.
1939 new_path
= apply_dir_rename(entry
, path
);
1942 /* This should only happen when entry->non_unique_new_dir set */
1943 if (!entry
->non_unique_new_dir
)
1944 BUG("entry->non_unqiue_dir not set and !new_path");
1945 output(o
, 1, _("CONFLICT (directory rename split): "
1946 "Unclear where to place %s because directory "
1947 "%s was renamed to multiple other directories, "
1948 "with no destination getting a majority of the "
1956 * The caller needs to have ensured that it has pre-populated
1957 * collisions with all paths that map to new_path. Do a quick check
1958 * to ensure that's the case.
1960 collision_ent
= collision_find_entry(collisions
, new_path
);
1961 if (collision_ent
== NULL
)
1962 BUG("collision_ent is NULL");
1965 * Check for one-sided add/add/.../add conflicts, i.e.
1966 * where implicit renames from the other side doing
1967 * directory rename(s) can affect this side of history
1968 * to put multiple paths into the same location. Warn
1969 * and bail on directory renames for such paths.
1971 if (collision_ent
->reported_already
) {
1973 } else if (tree_has_path(tree
, new_path
)) {
1974 collision_ent
->reported_already
= 1;
1975 strbuf_add_separated_string_list(&collision_paths
, ", ",
1976 &collision_ent
->source_files
);
1977 output(o
, 1, _("CONFLICT (implicit dir rename): Existing "
1978 "file/dir at %s in the way of implicit "
1979 "directory rename(s) putting the following "
1980 "path(s) there: %s."),
1981 new_path
, collision_paths
.buf
);
1983 } else if (collision_ent
->source_files
.nr
> 1) {
1984 collision_ent
->reported_already
= 1;
1985 strbuf_add_separated_string_list(&collision_paths
, ", ",
1986 &collision_ent
->source_files
);
1987 output(o
, 1, _("CONFLICT (implicit dir rename): Cannot map "
1988 "more than one path to %s; implicit directory "
1989 "renames tried to put these paths there: %s"),
1990 new_path
, collision_paths
.buf
);
1994 /* Free memory we no longer need */
1995 strbuf_release(&collision_paths
);
1996 if (!clean
&& new_path
) {
2005 * There are a couple things we want to do at the directory level:
2006 * 1. Check for both sides renaming to the same thing, in order to avoid
2007 * implicit renaming of files that should be left in place. (See
2008 * testcase 6b in t6043 for details.)
2009 * 2. Prune directory renames if there are still files left in the
2010 * the original directory. These represent a partial directory rename,
2011 * i.e. a rename where only some of the files within the directory
2012 * were renamed elsewhere. (Technically, this could be done earlier
2013 * in get_directory_renames(), except that would prevent us from
2014 * doing the previous check and thus failing testcase 6b.)
2015 * 3. Check for rename/rename(1to2) conflicts (at the directory level).
2016 * In the future, we could potentially record this info as well and
2017 * omit reporting rename/rename(1to2) conflicts for each path within
2018 * the affected directories, thus cleaning up the merge output.
2019 * NOTE: We do NOT check for rename/rename(2to1) conflicts at the
2020 * directory level, because merging directories is fine. If it
2021 * causes conflicts for files within those merged directories, then
2022 * that should be detected at the individual path level.
2024 static void handle_directory_level_conflicts(struct merge_options
*o
,
2025 struct hashmap
*dir_re_head
,
2027 struct hashmap
*dir_re_merge
,
2030 struct hashmap_iter iter
;
2031 struct dir_rename_entry
*head_ent
;
2032 struct dir_rename_entry
*merge_ent
;
2034 struct string_list remove_from_head
= STRING_LIST_INIT_NODUP
;
2035 struct string_list remove_from_merge
= STRING_LIST_INIT_NODUP
;
2037 hashmap_iter_init(dir_re_head
, &iter
);
2038 while ((head_ent
= hashmap_iter_next(&iter
))) {
2039 merge_ent
= dir_rename_find_entry(dir_re_merge
, head_ent
->dir
);
2041 !head_ent
->non_unique_new_dir
&&
2042 !merge_ent
->non_unique_new_dir
&&
2043 !strbuf_cmp(&head_ent
->new_dir
, &merge_ent
->new_dir
)) {
2044 /* 1. Renamed identically; remove it from both sides */
2045 string_list_append(&remove_from_head
,
2046 head_ent
->dir
)->util
= head_ent
;
2047 strbuf_release(&head_ent
->new_dir
);
2048 string_list_append(&remove_from_merge
,
2049 merge_ent
->dir
)->util
= merge_ent
;
2050 strbuf_release(&merge_ent
->new_dir
);
2051 } else if (tree_has_path(head
, head_ent
->dir
)) {
2052 /* 2. This wasn't a directory rename after all */
2053 string_list_append(&remove_from_head
,
2054 head_ent
->dir
)->util
= head_ent
;
2055 strbuf_release(&head_ent
->new_dir
);
2059 remove_hashmap_entries(dir_re_head
, &remove_from_head
);
2060 remove_hashmap_entries(dir_re_merge
, &remove_from_merge
);
2062 hashmap_iter_init(dir_re_merge
, &iter
);
2063 while ((merge_ent
= hashmap_iter_next(&iter
))) {
2064 head_ent
= dir_rename_find_entry(dir_re_head
, merge_ent
->dir
);
2065 if (tree_has_path(merge
, merge_ent
->dir
)) {
2066 /* 2. This wasn't a directory rename after all */
2067 string_list_append(&remove_from_merge
,
2068 merge_ent
->dir
)->util
= merge_ent
;
2069 } else if (head_ent
&&
2070 !head_ent
->non_unique_new_dir
&&
2071 !merge_ent
->non_unique_new_dir
) {
2072 /* 3. rename/rename(1to2) */
2074 * We can assume it's not rename/rename(1to1) because
2075 * that was case (1), already checked above. So we
2076 * know that head_ent->new_dir and merge_ent->new_dir
2077 * are different strings.
2079 output(o
, 1, _("CONFLICT (rename/rename): "
2080 "Rename directory %s->%s in %s. "
2081 "Rename directory %s->%s in %s"),
2082 head_ent
->dir
, head_ent
->new_dir
.buf
, o
->branch1
,
2083 head_ent
->dir
, merge_ent
->new_dir
.buf
, o
->branch2
);
2084 string_list_append(&remove_from_head
,
2085 head_ent
->dir
)->util
= head_ent
;
2086 strbuf_release(&head_ent
->new_dir
);
2087 string_list_append(&remove_from_merge
,
2088 merge_ent
->dir
)->util
= merge_ent
;
2089 strbuf_release(&merge_ent
->new_dir
);
2093 remove_hashmap_entries(dir_re_head
, &remove_from_head
);
2094 remove_hashmap_entries(dir_re_merge
, &remove_from_merge
);
2097 static struct hashmap
*get_directory_renames(struct diff_queue_struct
*pairs
,
2100 struct hashmap
*dir_renames
;
2101 struct hashmap_iter iter
;
2102 struct dir_rename_entry
*entry
;
2106 * Typically, we think of a directory rename as all files from a
2107 * certain directory being moved to a target directory. However,
2108 * what if someone first moved two files from the original
2109 * directory in one commit, and then renamed the directory
2110 * somewhere else in a later commit? At merge time, we just know
2111 * that files from the original directory went to two different
2112 * places, and that the bulk of them ended up in the same place.
2113 * We want each directory rename to represent where the bulk of the
2114 * files from that directory end up; this function exists to find
2115 * where the bulk of the files went.
2117 * The first loop below simply iterates through the list of file
2118 * renames, finding out how often each directory rename pair
2119 * possibility occurs.
2121 dir_renames
= xmalloc(sizeof(*dir_renames
));
2122 dir_rename_init(dir_renames
);
2123 for (i
= 0; i
< pairs
->nr
; ++i
) {
2124 struct string_list_item
*item
;
2126 struct diff_filepair
*pair
= pairs
->queue
[i
];
2127 char *old_dir
, *new_dir
;
2129 /* File not part of directory rename if it wasn't renamed */
2130 if (pair
->status
!= 'R')
2133 get_renamed_dir_portion(pair
->one
->path
, pair
->two
->path
,
2134 &old_dir
, &new_dir
);
2136 /* Directory didn't change at all; ignore this one. */
2139 entry
= dir_rename_find_entry(dir_renames
, old_dir
);
2141 entry
= xmalloc(sizeof(*entry
));
2142 dir_rename_entry_init(entry
, old_dir
);
2143 hashmap_put(dir_renames
, entry
);
2147 item
= string_list_lookup(&entry
->possible_new_dirs
, new_dir
);
2149 item
= string_list_insert(&entry
->possible_new_dirs
,
2151 item
->util
= xcalloc(1, sizeof(int));
2160 * For each directory with files moved out of it, we find out which
2161 * target directory received the most files so we can declare it to
2162 * be the "winning" target location for the directory rename. This
2163 * winner gets recorded in new_dir. If there is no winner
2164 * (multiple target directories received the same number of files),
2165 * we set non_unique_new_dir. Once we've determined the winner (or
2166 * that there is no winner), we no longer need possible_new_dirs.
2168 hashmap_iter_init(dir_renames
, &iter
);
2169 while ((entry
= hashmap_iter_next(&iter
))) {
2174 for (i
= 0; i
< entry
->possible_new_dirs
.nr
; i
++) {
2175 int *count
= entry
->possible_new_dirs
.items
[i
].util
;
2179 else if (*count
> max
) {
2181 best
= entry
->possible_new_dirs
.items
[i
].string
;
2185 entry
->non_unique_new_dir
= 1;
2187 assert(entry
->new_dir
.len
== 0);
2188 strbuf_addstr(&entry
->new_dir
, best
);
2191 * The relevant directory sub-portion of the original full
2192 * filepaths were xstrndup'ed before inserting into
2193 * possible_new_dirs, and instead of manually iterating the
2194 * list and free'ing each, just lie and tell
2195 * possible_new_dirs that it did the strdup'ing so that it
2196 * will free them for us.
2198 entry
->possible_new_dirs
.strdup_strings
= 1;
2199 string_list_clear(&entry
->possible_new_dirs
, 1);
2205 static struct dir_rename_entry
*check_dir_renamed(const char *path
,
2206 struct hashmap
*dir_renames
)
2208 char temp
[PATH_MAX
];
2210 struct dir_rename_entry
*entry
;
2213 while ((end
= strrchr(temp
, '/'))) {
2215 entry
= dir_rename_find_entry(dir_renames
, temp
);
2222 static void compute_collisions(struct hashmap
*collisions
,
2223 struct hashmap
*dir_renames
,
2224 struct diff_queue_struct
*pairs
)
2229 * Multiple files can be mapped to the same path due to directory
2230 * renames done by the other side of history. Since that other
2231 * side of history could have merged multiple directories into one,
2232 * if our side of history added the same file basename to each of
2233 * those directories, then all N of them would get implicitly
2234 * renamed by the directory rename detection into the same path,
2235 * and we'd get an add/add/.../add conflict, and all those adds
2236 * from *this* side of history. This is not representable in the
2237 * index, and users aren't going to easily be able to make sense of
2238 * it. So we need to provide a good warning about what's
2239 * happening, and fall back to no-directory-rename detection
2240 * behavior for those paths.
2242 * See testcases 9e and all of section 5 from t6043 for examples.
2244 collision_init(collisions
);
2246 for (i
= 0; i
< pairs
->nr
; ++i
) {
2247 struct dir_rename_entry
*dir_rename_ent
;
2248 struct collision_entry
*collision_ent
;
2250 struct diff_filepair
*pair
= pairs
->queue
[i
];
2252 if (pair
->status
!= 'A' && pair
->status
!= 'R')
2254 dir_rename_ent
= check_dir_renamed(pair
->two
->path
,
2256 if (!dir_rename_ent
)
2259 new_path
= apply_dir_rename(dir_rename_ent
, pair
->two
->path
);
2262 * dir_rename_ent->non_unique_new_path is true, which
2263 * means there is no directory rename for us to use,
2264 * which means it won't cause us any additional
2268 collision_ent
= collision_find_entry(collisions
, new_path
);
2269 if (!collision_ent
) {
2270 collision_ent
= xcalloc(1,
2271 sizeof(struct collision_entry
));
2272 hashmap_entry_init(collision_ent
, strhash(new_path
));
2273 hashmap_put(collisions
, collision_ent
);
2274 collision_ent
->target_file
= new_path
;
2278 string_list_insert(&collision_ent
->source_files
,
2283 static char *check_for_directory_rename(struct merge_options
*o
,
2286 struct hashmap
*dir_renames
,
2287 struct hashmap
*dir_rename_exclusions
,
2288 struct hashmap
*collisions
,
2291 char *new_path
= NULL
;
2292 struct dir_rename_entry
*entry
= check_dir_renamed(path
, dir_renames
);
2293 struct dir_rename_entry
*oentry
= NULL
;
2299 * This next part is a little weird. We do not want to do an
2300 * implicit rename into a directory we renamed on our side, because
2301 * that will result in a spurious rename/rename(1to2) conflict. An
2303 * Base commit: dumbdir/afile, otherdir/bfile
2304 * Side 1: smrtdir/afile, otherdir/bfile
2305 * Side 2: dumbdir/afile, dumbdir/bfile
2306 * Here, while working on Side 1, we could notice that otherdir was
2307 * renamed/merged to dumbdir, and change the diff_filepair for
2308 * otherdir/bfile into a rename into dumbdir/bfile. However, Side
2309 * 2 will notice the rename from dumbdir to smrtdir, and do the
2310 * transitive rename to move it from dumbdir/bfile to
2311 * smrtdir/bfile. That gives us bfile in dumbdir vs being in
2312 * smrtdir, a rename/rename(1to2) conflict. We really just want
2313 * the file to end up in smrtdir. And the way to achieve that is
2314 * to not let Side1 do the rename to dumbdir, since we know that is
2315 * the source of one of our directory renames.
2317 * That's why oentry and dir_rename_exclusions is here.
2319 * As it turns out, this also prevents N-way transient rename
2320 * confusion; See testcases 9c and 9d of t6043.
2322 oentry
= dir_rename_find_entry(dir_rename_exclusions
, entry
->new_dir
.buf
);
2324 output(o
, 1, _("WARNING: Avoiding applying %s -> %s rename "
2325 "to %s, because %s itself was renamed."),
2326 entry
->dir
, entry
->new_dir
.buf
, path
, entry
->new_dir
.buf
);
2328 new_path
= handle_path_level_conflicts(o
, path
, entry
,
2330 *clean_merge
&= (new_path
!= NULL
);
2336 static void apply_directory_rename_modifications(struct merge_options
*o
,
2337 struct diff_filepair
*pair
,
2341 struct tree
*o_tree
,
2342 struct tree
*a_tree
,
2343 struct tree
*b_tree
,
2344 struct string_list
*entries
,
2347 struct string_list_item
*item
;
2348 int stage
= (tree
== a_tree
? 2 : 3);
2352 * In all cases where we can do directory rename detection,
2353 * unpack_trees() will have read pair->two->path into the
2354 * index and the working copy. We need to remove it so that
2355 * we can instead place it at new_path. It is guaranteed to
2356 * not be untracked (unpack_trees() would have errored out
2357 * saying the file would have been overwritten), but it might
2360 update_wd
= !was_dirty(o
, pair
->two
->path
);
2362 output(o
, 1, _("Refusing to lose dirty file at %s"),
2364 remove_file(o
, 1, pair
->two
->path
, !update_wd
);
2366 /* Find or create a new re->dst_entry */
2367 item
= string_list_lookup(entries
, new_path
);
2370 * Since we're renaming on this side of history, and it's
2371 * due to a directory rename on the other side of history
2372 * (which we only allow when the directory in question no
2373 * longer exists on the other side of history), the
2374 * original entry for re->dst_entry is no longer
2377 re
->dst_entry
->processed
= 1;
2380 * ...because we'll be using this new one.
2382 re
->dst_entry
= item
->util
;
2385 * re->dst_entry is for the before-dir-rename path, and we
2386 * need it to hold information for the after-dir-rename
2387 * path. Before creating a new entry, we need to mark the
2388 * old one as unnecessary (...unless it is shared by
2389 * src_entry, i.e. this didn't use to be a rename, in which
2390 * case we can just allow the normal processing to happen
2393 if (pair
->status
== 'R')
2394 re
->dst_entry
->processed
= 1;
2396 re
->dst_entry
= insert_stage_data(new_path
,
2397 o_tree
, a_tree
, b_tree
,
2399 item
= string_list_insert(entries
, new_path
);
2400 item
->util
= re
->dst_entry
;
2404 * Update the stage_data with the information about the path we are
2405 * moving into place. That slot will be empty and available for us
2406 * to write to because of the collision checks in
2407 * handle_path_level_conflicts(). In other words,
2408 * re->dst_entry->stages[stage].oid will be the null_oid, so it's
2409 * open for us to write to.
2411 * It may be tempting to actually update the index at this point as
2412 * well, using update_stages_for_stage_data(), but as per the big
2413 * "NOTE" in update_stages(), doing so will modify the current
2414 * in-memory index which will break calls to would_lose_untracked()
2415 * that we need to make. Instead, we need to just make sure that
2416 * the various conflict_rename_*() functions update the index
2417 * explicitly rather than relying on unpack_trees() to have done it.
2419 get_tree_entry(&tree
->object
.oid
,
2421 &re
->dst_entry
->stages
[stage
].oid
,
2422 &re
->dst_entry
->stages
[stage
].mode
);
2424 /* Update pair status */
2425 if (pair
->status
== 'A') {
2427 * Recording rename information for this add makes it look
2428 * like a rename/delete conflict. Make sure we can
2429 * correctly handle this as an add that was moved to a new
2430 * directory instead of reporting a rename/delete conflict.
2432 re
->add_turned_into_rename
= 1;
2435 * We don't actually look at pair->status again, but it seems
2436 * pedagogically correct to adjust it.
2441 * Finally, record the new location.
2443 pair
->two
->path
= new_path
;
2447 * Get information of all renames which occurred in 'pairs', making use of
2448 * any implicit directory renames inferred from the other side of history.
2449 * We need the three trees in the merge ('o_tree', 'a_tree' and 'b_tree')
2450 * to be able to associate the correct cache entries with the rename
2451 * information; tree is always equal to either a_tree or b_tree.
2453 static struct string_list
*get_renames(struct merge_options
*o
,
2454 struct diff_queue_struct
*pairs
,
2455 struct hashmap
*dir_renames
,
2456 struct hashmap
*dir_rename_exclusions
,
2458 struct tree
*o_tree
,
2459 struct tree
*a_tree
,
2460 struct tree
*b_tree
,
2461 struct string_list
*entries
,
2465 struct hashmap collisions
;
2466 struct hashmap_iter iter
;
2467 struct collision_entry
*e
;
2468 struct string_list
*renames
;
2470 compute_collisions(&collisions
, dir_renames
, pairs
);
2471 renames
= xcalloc(1, sizeof(struct string_list
));
2473 for (i
= 0; i
< pairs
->nr
; ++i
) {
2474 struct string_list_item
*item
;
2476 struct diff_filepair
*pair
= pairs
->queue
[i
];
2477 char *new_path
; /* non-NULL only with directory renames */
2479 if (pair
->status
!= 'A' && pair
->status
!= 'R') {
2480 diff_free_filepair(pair
);
2483 new_path
= check_for_directory_rename(o
, pair
->two
->path
, tree
,
2485 dir_rename_exclusions
,
2488 if (pair
->status
!= 'R' && !new_path
) {
2489 diff_free_filepair(pair
);
2493 re
= xmalloc(sizeof(*re
));
2495 re
->add_turned_into_rename
= 0;
2497 item
= string_list_lookup(entries
, re
->pair
->one
->path
);
2499 re
->src_entry
= insert_stage_data(re
->pair
->one
->path
,
2500 o_tree
, a_tree
, b_tree
, entries
);
2502 re
->src_entry
= item
->util
;
2504 item
= string_list_lookup(entries
, re
->pair
->two
->path
);
2506 re
->dst_entry
= insert_stage_data(re
->pair
->two
->path
,
2507 o_tree
, a_tree
, b_tree
, entries
);
2509 re
->dst_entry
= item
->util
;
2510 item
= string_list_insert(renames
, pair
->one
->path
);
2513 apply_directory_rename_modifications(o
, pair
, new_path
,
2520 hashmap_iter_init(&collisions
, &iter
);
2521 while ((e
= hashmap_iter_next(&iter
))) {
2522 free(e
->target_file
);
2523 string_list_clear(&e
->source_files
, 0);
2525 hashmap_free(&collisions
, 1);
2529 static int process_renames(struct merge_options
*o
,
2530 struct string_list
*a_renames
,
2531 struct string_list
*b_renames
)
2533 int clean_merge
= 1, i
, j
;
2534 struct string_list a_by_dst
= STRING_LIST_INIT_NODUP
;
2535 struct string_list b_by_dst
= STRING_LIST_INIT_NODUP
;
2536 const struct rename
*sre
;
2538 for (i
= 0; i
< a_renames
->nr
; i
++) {
2539 sre
= a_renames
->items
[i
].util
;
2540 string_list_insert(&a_by_dst
, sre
->pair
->two
->path
)->util
2543 for (i
= 0; i
< b_renames
->nr
; i
++) {
2544 sre
= b_renames
->items
[i
].util
;
2545 string_list_insert(&b_by_dst
, sre
->pair
->two
->path
)->util
2549 for (i
= 0, j
= 0; i
< a_renames
->nr
|| j
< b_renames
->nr
;) {
2550 struct string_list
*renames1
, *renames2Dst
;
2551 struct rename
*ren1
= NULL
, *ren2
= NULL
;
2552 const char *branch1
, *branch2
;
2553 const char *ren1_src
, *ren1_dst
;
2554 struct string_list_item
*lookup
;
2556 if (i
>= a_renames
->nr
) {
2557 ren2
= b_renames
->items
[j
++].util
;
2558 } else if (j
>= b_renames
->nr
) {
2559 ren1
= a_renames
->items
[i
++].util
;
2561 int compare
= strcmp(a_renames
->items
[i
].string
,
2562 b_renames
->items
[j
].string
);
2564 ren1
= a_renames
->items
[i
++].util
;
2566 ren2
= b_renames
->items
[j
++].util
;
2569 /* TODO: refactor, so that 1/2 are not needed */
2571 renames1
= a_renames
;
2572 renames2Dst
= &b_by_dst
;
2573 branch1
= o
->branch1
;
2574 branch2
= o
->branch2
;
2576 renames1
= b_renames
;
2577 renames2Dst
= &a_by_dst
;
2578 branch1
= o
->branch2
;
2579 branch2
= o
->branch1
;
2583 if (ren1
->processed
)
2585 ren1
->processed
= 1;
2586 ren1
->dst_entry
->processed
= 1;
2587 /* BUG: We should only mark src_entry as processed if we
2588 * are not dealing with a rename + add-source case.
2590 ren1
->src_entry
->processed
= 1;
2592 ren1_src
= ren1
->pair
->one
->path
;
2593 ren1_dst
= ren1
->pair
->two
->path
;
2596 /* One file renamed on both sides */
2597 const char *ren2_src
= ren2
->pair
->one
->path
;
2598 const char *ren2_dst
= ren2
->pair
->two
->path
;
2599 enum rename_type rename_type
;
2600 if (strcmp(ren1_src
, ren2_src
) != 0)
2601 BUG("ren1_src != ren2_src");
2602 ren2
->dst_entry
->processed
= 1;
2603 ren2
->processed
= 1;
2604 if (strcmp(ren1_dst
, ren2_dst
) != 0) {
2605 rename_type
= RENAME_ONE_FILE_TO_TWO
;
2608 rename_type
= RENAME_ONE_FILE_TO_ONE
;
2609 /* BUG: We should only remove ren1_src in
2610 * the base stage (think of rename +
2611 * add-source cases).
2613 remove_file(o
, 1, ren1_src
, 1);
2614 update_entry(ren1
->dst_entry
,
2619 setup_rename_conflict_info(rename_type
,
2629 } else if ((lookup
= string_list_lookup(renames2Dst
, ren1_dst
))) {
2630 /* Two different files renamed to the same thing */
2632 ren2
= lookup
->util
;
2633 ren2_dst
= ren2
->pair
->two
->path
;
2634 if (strcmp(ren1_dst
, ren2_dst
) != 0)
2635 BUG("ren1_dst != ren2_dst");
2638 ren2
->processed
= 1;
2640 * BUG: We should only mark src_entry as processed
2641 * if we are not dealing with a rename + add-source
2644 ren2
->src_entry
->processed
= 1;
2646 setup_rename_conflict_info(RENAME_TWO_FILES_TO_ONE
,
2658 /* Renamed in 1, maybe changed in 2 */
2659 /* we only use sha1 and mode of these */
2660 struct diff_filespec src_other
, dst_other
;
2664 * unpack_trees loads entries from common-commit
2665 * into stage 1, from head-commit into stage 2, and
2666 * from merge-commit into stage 3. We keep track
2667 * of which side corresponds to the rename.
2669 int renamed_stage
= a_renames
== renames1
? 2 : 3;
2670 int other_stage
= a_renames
== renames1
? 3 : 2;
2672 /* BUG: We should only remove ren1_src in the base
2673 * stage and in other_stage (think of rename +
2676 remove_file(o
, 1, ren1_src
,
2677 renamed_stage
== 2 || !was_tracked(o
, ren1_src
));
2679 oidcpy(&src_other
.oid
,
2680 &ren1
->src_entry
->stages
[other_stage
].oid
);
2681 src_other
.mode
= ren1
->src_entry
->stages
[other_stage
].mode
;
2682 oidcpy(&dst_other
.oid
,
2683 &ren1
->dst_entry
->stages
[other_stage
].oid
);
2684 dst_other
.mode
= ren1
->dst_entry
->stages
[other_stage
].mode
;
2687 if (oid_eq(&src_other
.oid
, &null_oid
) &&
2688 ren1
->add_turned_into_rename
) {
2689 setup_rename_conflict_info(RENAME_DIR
,
2699 } else if (oid_eq(&src_other
.oid
, &null_oid
)) {
2700 setup_rename_conflict_info(RENAME_DELETE
,
2710 } else if ((dst_other
.mode
== ren1
->pair
->two
->mode
) &&
2711 oid_eq(&dst_other
.oid
, &ren1
->pair
->two
->oid
)) {
2713 * Added file on the other side identical to
2714 * the file being renamed: clean merge.
2715 * Also, there is no need to overwrite the
2716 * file already in the working copy, so call
2717 * update_file_flags() instead of
2720 if (update_file_flags(o
,
2721 &ren1
->pair
->two
->oid
,
2722 ren1
->pair
->two
->mode
,
2724 1, /* update_cache */
2727 } else if (!oid_eq(&dst_other
.oid
, &null_oid
)) {
2730 output(o
, 1, _("CONFLICT (rename/add): Rename %s->%s in %s. "
2732 ren1_src
, ren1_dst
, branch1
,
2734 if (o
->call_depth
) {
2735 struct merge_file_info mfi
;
2736 if (merge_file_one(o
, ren1_dst
, &null_oid
, 0,
2737 &ren1
->pair
->two
->oid
,
2738 ren1
->pair
->two
->mode
,
2741 branch1
, branch2
, &mfi
)) {
2743 goto cleanup_and_return
;
2745 output(o
, 1, _("Adding merged %s"), ren1_dst
);
2746 if (update_file(o
, 0, &mfi
.oid
,
2747 mfi
.mode
, ren1_dst
))
2751 char *new_path
= unique_path(o
, ren1_dst
, branch2
);
2752 output(o
, 1, _("Adding as %s instead"), new_path
);
2753 if (update_file(o
, 0, &dst_other
.oid
,
2754 dst_other
.mode
, new_path
))
2761 if (clean_merge
< 0)
2762 goto cleanup_and_return
;
2764 struct diff_filespec
*one
, *a
, *b
;
2765 src_other
.path
= (char *)ren1_src
;
2767 one
= ren1
->pair
->one
;
2768 if (a_renames
== renames1
) {
2769 a
= ren1
->pair
->two
;
2772 b
= ren1
->pair
->two
;
2775 update_entry(ren1
->dst_entry
, one
, a
, b
);
2776 setup_rename_conflict_info(RENAME_NORMAL
,
2790 string_list_clear(&a_by_dst
, 0);
2791 string_list_clear(&b_by_dst
, 0);
2796 struct rename_info
{
2797 struct string_list
*head_renames
;
2798 struct string_list
*merge_renames
;
2801 static void initial_cleanup_rename(struct diff_queue_struct
*pairs
,
2802 struct hashmap
*dir_renames
)
2804 struct hashmap_iter iter
;
2805 struct dir_rename_entry
*e
;
2807 hashmap_iter_init(dir_renames
, &iter
);
2808 while ((e
= hashmap_iter_next(&iter
))) {
2810 strbuf_release(&e
->new_dir
);
2811 /* possible_new_dirs already cleared in get_directory_renames */
2813 hashmap_free(dir_renames
, 1);
2820 static int handle_renames(struct merge_options
*o
,
2821 struct tree
*common
,
2824 struct string_list
*entries
,
2825 struct rename_info
*ri
)
2827 struct diff_queue_struct
*head_pairs
, *merge_pairs
;
2828 struct hashmap
*dir_re_head
, *dir_re_merge
;
2831 ri
->head_renames
= NULL
;
2832 ri
->merge_renames
= NULL
;
2834 if (!merge_detect_rename(o
))
2837 head_pairs
= get_diffpairs(o
, common
, head
);
2838 merge_pairs
= get_diffpairs(o
, common
, merge
);
2840 dir_re_head
= get_directory_renames(head_pairs
, head
);
2841 dir_re_merge
= get_directory_renames(merge_pairs
, merge
);
2843 handle_directory_level_conflicts(o
,
2845 dir_re_merge
, merge
);
2847 ri
->head_renames
= get_renames(o
, head_pairs
,
2848 dir_re_merge
, dir_re_head
, head
,
2849 common
, head
, merge
, entries
,
2853 ri
->merge_renames
= get_renames(o
, merge_pairs
,
2854 dir_re_head
, dir_re_merge
, merge
,
2855 common
, head
, merge
, entries
,
2859 clean
&= process_renames(o
, ri
->head_renames
, ri
->merge_renames
);
2863 * Some cleanup is deferred until cleanup_renames() because the
2864 * data structures are still needed and referenced in
2865 * process_entry(). But there are a few things we can free now.
2867 initial_cleanup_rename(head_pairs
, dir_re_head
);
2868 initial_cleanup_rename(merge_pairs
, dir_re_merge
);
2873 static void final_cleanup_rename(struct string_list
*rename
)
2875 const struct rename
*re
;
2881 for (i
= 0; i
< rename
->nr
; i
++) {
2882 re
= rename
->items
[i
].util
;
2883 diff_free_filepair(re
->pair
);
2885 string_list_clear(rename
, 1);
2889 static void final_cleanup_renames(struct rename_info
*re_info
)
2891 final_cleanup_rename(re_info
->head_renames
);
2892 final_cleanup_rename(re_info
->merge_renames
);
2895 static struct object_id
*stage_oid(const struct object_id
*oid
, unsigned mode
)
2897 return (is_null_oid(oid
) || mode
== 0) ? NULL
: (struct object_id
*)oid
;
2900 static int read_oid_strbuf(struct merge_options
*o
,
2901 const struct object_id
*oid
, struct strbuf
*dst
)
2904 enum object_type type
;
2906 buf
= read_object_file(oid
, &type
, &size
);
2908 return err(o
, _("cannot read object %s"), oid_to_hex(oid
));
2909 if (type
!= OBJ_BLOB
) {
2911 return err(o
, _("object %s is not a blob"), oid_to_hex(oid
));
2913 strbuf_attach(dst
, buf
, size
, size
+ 1);
2917 static int blob_unchanged(struct merge_options
*opt
,
2918 const struct object_id
*o_oid
,
2920 const struct object_id
*a_oid
,
2922 int renormalize
, const char *path
)
2924 struct strbuf o
= STRBUF_INIT
;
2925 struct strbuf a
= STRBUF_INIT
;
2926 int ret
= 0; /* assume changed for safety */
2928 if (a_mode
!= o_mode
)
2930 if (oid_eq(o_oid
, a_oid
))
2935 assert(o_oid
&& a_oid
);
2936 if (read_oid_strbuf(opt
, o_oid
, &o
) || read_oid_strbuf(opt
, a_oid
, &a
))
2939 * Note: binary | is used so that both renormalizations are
2940 * performed. Comparison can be skipped if both files are
2941 * unchanged since their sha1s have already been compared.
2943 if (renormalize_buffer(&the_index
, path
, o
.buf
, o
.len
, &o
) |
2944 renormalize_buffer(&the_index
, path
, a
.buf
, a
.len
, &a
))
2945 ret
= (o
.len
== a
.len
&& !memcmp(o
.buf
, a
.buf
, o
.len
));
2953 static int handle_modify_delete(struct merge_options
*o
,
2955 struct object_id
*o_oid
, int o_mode
,
2956 struct object_id
*a_oid
, int a_mode
,
2957 struct object_id
*b_oid
, int b_mode
)
2959 const char *modify_branch
, *delete_branch
;
2960 struct object_id
*changed_oid
;
2964 modify_branch
= o
->branch1
;
2965 delete_branch
= o
->branch2
;
2966 changed_oid
= a_oid
;
2967 changed_mode
= a_mode
;
2969 modify_branch
= o
->branch2
;
2970 delete_branch
= o
->branch1
;
2971 changed_oid
= b_oid
;
2972 changed_mode
= b_mode
;
2975 return handle_change_delete(o
,
2978 changed_oid
, changed_mode
,
2979 modify_branch
, delete_branch
,
2980 _("modify"), _("modified"));
2983 static int merge_content(struct merge_options
*o
,
2986 struct object_id
*o_oid
, int o_mode
,
2987 struct object_id
*a_oid
, int a_mode
,
2988 struct object_id
*b_oid
, int b_mode
,
2989 struct rename_conflict_info
*rename_conflict_info
)
2991 const char *reason
= _("content");
2992 const char *path1
= NULL
, *path2
= NULL
;
2993 struct merge_file_info mfi
;
2994 struct diff_filespec one
, a
, b
;
2995 unsigned df_conflict_remains
= 0;
2998 reason
= _("add/add");
2999 o_oid
= (struct object_id
*)&null_oid
;
3001 one
.path
= a
.path
= b
.path
= (char *)path
;
3002 oidcpy(&one
.oid
, o_oid
);
3004 oidcpy(&a
.oid
, a_oid
);
3006 oidcpy(&b
.oid
, b_oid
);
3009 if (rename_conflict_info
) {
3010 struct diff_filepair
*pair1
= rename_conflict_info
->pair1
;
3012 path1
= (o
->branch1
== rename_conflict_info
->branch1
) ?
3013 pair1
->two
->path
: pair1
->one
->path
;
3014 /* If rename_conflict_info->pair2 != NULL, we are in
3015 * RENAME_ONE_FILE_TO_ONE case. Otherwise, we have a
3018 path2
= (rename_conflict_info
->pair2
||
3019 o
->branch2
== rename_conflict_info
->branch1
) ?
3020 pair1
->two
->path
: pair1
->one
->path
;
3022 if (dir_in_way(path
, !o
->call_depth
,
3023 S_ISGITLINK(pair1
->two
->mode
)))
3024 df_conflict_remains
= 1;
3026 if (merge_file_special_markers(o
, &one
, &a
, &b
, path
,
3028 o
->branch2
, path2
, &mfi
))
3032 * We can skip updating the working tree file iff:
3033 * a) The merge is clean
3034 * b) The merge matches what was in HEAD (content, mode, pathname)
3035 * c) The target path is usable (i.e. not involved in D/F conflict)
3038 was_tracked_and_matches(o
, path
, &mfi
.oid
, mfi
.mode
) &&
3039 !df_conflict_remains
) {
3040 output(o
, 3, _("Skipped %s (merged same as existing)"), path
);
3041 if (add_cacheinfo(o
, mfi
.mode
, &mfi
.oid
, path
,
3042 0, (!o
->call_depth
&& !is_dirty
), 0))
3048 if (S_ISGITLINK(mfi
.mode
))
3049 reason
= _("submodule");
3050 output(o
, 1, _("CONFLICT (%s): Merge conflict in %s"),
3052 if (rename_conflict_info
&& !df_conflict_remains
)
3053 if (update_stages(o
, path
, &one
, &a
, &b
))
3057 if (df_conflict_remains
|| is_dirty
) {
3059 if (o
->call_depth
) {
3060 remove_file_from_cache(path
);
3063 if (update_stages(o
, path
, &one
, &a
, &b
))
3066 int file_from_stage2
= was_tracked(o
, path
);
3067 struct diff_filespec merged
;
3068 oidcpy(&merged
.oid
, &mfi
.oid
);
3069 merged
.mode
= mfi
.mode
;
3071 if (update_stages(o
, path
, NULL
,
3072 file_from_stage2
? &merged
: NULL
,
3073 file_from_stage2
? NULL
: &merged
))
3078 new_path
= unique_path(o
, path
, rename_conflict_info
->branch1
);
3080 output(o
, 1, _("Refusing to lose dirty file at %s"),
3083 output(o
, 1, _("Adding as %s instead"), new_path
);
3084 if (update_file(o
, 0, &mfi
.oid
, mfi
.mode
, new_path
)) {
3090 } else if (update_file(o
, mfi
.clean
, &mfi
.oid
, mfi
.mode
, path
))
3092 return !is_dirty
&& mfi
.clean
;
3095 static int conflict_rename_normal(struct merge_options
*o
,
3097 struct object_id
*o_oid
, unsigned int o_mode
,
3098 struct object_id
*a_oid
, unsigned int a_mode
,
3099 struct object_id
*b_oid
, unsigned int b_mode
,
3100 struct rename_conflict_info
*ci
)
3102 /* Merge the content and write it out */
3103 return merge_content(o
, path
, was_dirty(o
, path
),
3104 o_oid
, o_mode
, a_oid
, a_mode
, b_oid
, b_mode
,
3108 /* Per entry merge function */
3109 static int process_entry(struct merge_options
*o
,
3110 const char *path
, struct stage_data
*entry
)
3112 int clean_merge
= 1;
3113 int normalize
= o
->renormalize
;
3114 unsigned o_mode
= entry
->stages
[1].mode
;
3115 unsigned a_mode
= entry
->stages
[2].mode
;
3116 unsigned b_mode
= entry
->stages
[3].mode
;
3117 struct object_id
*o_oid
= stage_oid(&entry
->stages
[1].oid
, o_mode
);
3118 struct object_id
*a_oid
= stage_oid(&entry
->stages
[2].oid
, a_mode
);
3119 struct object_id
*b_oid
= stage_oid(&entry
->stages
[3].oid
, b_mode
);
3121 entry
->processed
= 1;
3122 if (entry
->rename_conflict_info
) {
3123 struct rename_conflict_info
*conflict_info
= entry
->rename_conflict_info
;
3124 switch (conflict_info
->rename_type
) {
3126 case RENAME_ONE_FILE_TO_ONE
:
3127 clean_merge
= conflict_rename_normal(o
,
3136 if (conflict_rename_dir(o
,
3137 conflict_info
->pair1
,
3138 conflict_info
->branch1
,
3139 conflict_info
->branch2
))
3144 if (conflict_rename_delete(o
,
3145 conflict_info
->pair1
,
3146 conflict_info
->branch1
,
3147 conflict_info
->branch2
))
3150 case RENAME_ONE_FILE_TO_TWO
:
3152 if (conflict_rename_rename_1to2(o
, conflict_info
))
3155 case RENAME_TWO_FILES_TO_ONE
:
3157 if (conflict_rename_rename_2to1(o
, conflict_info
))
3161 entry
->processed
= 0;
3164 } else if (o_oid
&& (!a_oid
|| !b_oid
)) {
3165 /* Case A: Deleted in one */
3166 if ((!a_oid
&& !b_oid
) ||
3167 (!b_oid
&& blob_unchanged(o
, o_oid
, o_mode
, a_oid
, a_mode
, normalize
, path
)) ||
3168 (!a_oid
&& blob_unchanged(o
, o_oid
, o_mode
, b_oid
, b_mode
, normalize
, path
))) {
3169 /* Deleted in both or deleted in one and
3170 * unchanged in the other */
3172 output(o
, 2, _("Removing %s"), path
);
3173 /* do not touch working file if it did not exist */
3174 remove_file(o
, 1, path
, !a_oid
);
3176 /* Modify/delete; deleted side may have put a directory in the way */
3178 if (handle_modify_delete(o
, path
, o_oid
, o_mode
,
3179 a_oid
, a_mode
, b_oid
, b_mode
))
3182 } else if ((!o_oid
&& a_oid
&& !b_oid
) ||
3183 (!o_oid
&& !a_oid
&& b_oid
)) {
3184 /* Case B: Added in one. */
3185 /* [nothing|directory] -> ([nothing|directory], file) */
3187 const char *add_branch
;
3188 const char *other_branch
;
3190 const struct object_id
*oid
;
3194 add_branch
= o
->branch1
;
3195 other_branch
= o
->branch2
;
3198 conf
= _("file/directory");
3200 add_branch
= o
->branch2
;
3201 other_branch
= o
->branch1
;
3204 conf
= _("directory/file");
3206 if (dir_in_way(path
,
3207 !o
->call_depth
&& !S_ISGITLINK(a_mode
),
3209 char *new_path
= unique_path(o
, path
, add_branch
);
3211 output(o
, 1, _("CONFLICT (%s): There is a directory with name %s in %s. "
3213 conf
, path
, other_branch
, path
, new_path
);
3214 if (update_file(o
, 0, oid
, mode
, new_path
))
3216 else if (o
->call_depth
)
3217 remove_file_from_cache(path
);
3220 output(o
, 2, _("Adding %s"), path
);
3221 /* do not overwrite file if already present */
3222 if (update_file_flags(o
, oid
, mode
, path
, 1, !a_oid
))
3225 } else if (a_oid
&& b_oid
) {
3226 /* Case C: Added in both (check for same permissions) and */
3227 /* case D: Modified in both, but differently. */
3228 int is_dirty
= 0; /* unpack_trees would have bailed if dirty */
3229 clean_merge
= merge_content(o
, path
, is_dirty
,
3230 o_oid
, o_mode
, a_oid
, a_mode
, b_oid
, b_mode
,
3232 } else if (!o_oid
&& !a_oid
&& !b_oid
) {
3234 * this entry was deleted altogether. a_mode == 0 means
3235 * we had that path and want to actively remove it.
3237 remove_file(o
, 1, path
, !a_mode
);
3239 BUG("fatal merge failure, shouldn't happen.");
3244 int merge_trees(struct merge_options
*o
,
3247 struct tree
*common
,
3248 struct tree
**result
)
3252 if (o
->subtree_shift
) {
3253 merge
= shift_tree_object(head
, merge
, o
->subtree_shift
);
3254 common
= shift_tree_object(head
, common
, o
->subtree_shift
);
3257 if (oid_eq(&common
->object
.oid
, &merge
->object
.oid
)) {
3258 struct strbuf sb
= STRBUF_INIT
;
3260 if (!o
->call_depth
&& index_has_changes(&sb
)) {
3261 err(o
, _("Dirty index: cannot merge (dirty: %s)"),
3265 output(o
, 0, _("Already up to date!"));
3270 code
= git_merge_trees(o
, common
, head
, merge
);
3273 if (show(o
, 4) || o
->call_depth
)
3274 err(o
, _("merging of trees %s and %s failed"),
3275 oid_to_hex(&head
->object
.oid
),
3276 oid_to_hex(&merge
->object
.oid
));
3280 if (unmerged_cache()) {
3281 struct string_list
*entries
;
3282 struct rename_info re_info
;
3285 * Only need the hashmap while processing entries, so
3286 * initialize it here and free it when we are done running
3287 * through the entries. Keeping it in the merge_options as
3288 * opposed to decaring a local hashmap is for convenience
3289 * so that we don't have to pass it to around.
3291 hashmap_init(&o
->current_file_dir_set
, path_hashmap_cmp
, NULL
, 512);
3292 get_files_dirs(o
, head
);
3293 get_files_dirs(o
, merge
);
3295 entries
= get_unmerged();
3296 clean
= handle_renames(o
, common
, head
, merge
, entries
,
3298 record_df_conflict_files(o
, entries
);
3301 for (i
= entries
->nr
-1; 0 <= i
; i
--) {
3302 const char *path
= entries
->items
[i
].string
;
3303 struct stage_data
*e
= entries
->items
[i
].util
;
3304 if (!e
->processed
) {
3305 int ret
= process_entry(o
, path
, e
);
3314 for (i
= 0; i
< entries
->nr
; i
++) {
3315 struct stage_data
*e
= entries
->items
[i
].util
;
3317 BUG("unprocessed path??? %s",
3318 entries
->items
[i
].string
);
3322 final_cleanup_renames(&re_info
);
3324 string_list_clear(entries
, 1);
3327 hashmap_free(&o
->current_file_dir_set
, 1);
3335 /* Free the extra index left from git_merge_trees() */
3337 * FIXME: Need to also free data allocated by
3338 * setup_unpack_trees_porcelain() tucked away in o->unpack_opts.msgs,
3339 * but the problem is that only half of it refers to dynamically
3340 * allocated data, while the other half points at static strings.
3342 discard_index(&o
->orig_index
);
3344 if (o
->call_depth
&& !(*result
= write_tree_from_memory(o
)))
3350 static struct commit_list
*reverse_commit_list(struct commit_list
*list
)
3352 struct commit_list
*next
= NULL
, *current
, *backup
;
3353 for (current
= list
; current
; current
= backup
) {
3354 backup
= current
->next
;
3355 current
->next
= next
;
3362 * Merge the commits h1 and h2, return the resulting virtual
3363 * commit object and a flag indicating the cleanness of the merge.
3365 int merge_recursive(struct merge_options
*o
,
3368 struct commit_list
*ca
,
3369 struct commit
**result
)
3371 struct commit_list
*iter
;
3372 struct commit
*merged_common_ancestors
;
3373 struct tree
*mrtree
;
3377 output(o
, 4, _("Merging:"));
3378 output_commit_title(o
, h1
);
3379 output_commit_title(o
, h2
);
3383 ca
= get_merge_bases(h1
, h2
);
3384 ca
= reverse_commit_list(ca
);
3388 unsigned cnt
= commit_list_count(ca
);
3390 output(o
, 5, Q_("found %u common ancestor:",
3391 "found %u common ancestors:", cnt
), cnt
);
3392 for (iter
= ca
; iter
; iter
= iter
->next
)
3393 output_commit_title(o
, iter
->item
);
3396 merged_common_ancestors
= pop_commit(&ca
);
3397 if (merged_common_ancestors
== NULL
) {
3398 /* if there is no common ancestor, use an empty tree */
3401 tree
= lookup_tree(the_hash_algo
->empty_tree
);
3402 merged_common_ancestors
= make_virtual_commit(tree
, "ancestor");
3405 for (iter
= ca
; iter
; iter
= iter
->next
) {
3406 const char *saved_b1
, *saved_b2
;
3409 * When the merge fails, the result contains files
3410 * with conflict markers. The cleanness flag is
3411 * ignored (unless indicating an error), it was never
3412 * actually used, as result of merge_trees has always
3413 * overwritten it: the committed "conflicts" were
3417 saved_b1
= o
->branch1
;
3418 saved_b2
= o
->branch2
;
3419 o
->branch1
= "Temporary merge branch 1";
3420 o
->branch2
= "Temporary merge branch 2";
3421 if (merge_recursive(o
, merged_common_ancestors
, iter
->item
,
3422 NULL
, &merged_common_ancestors
) < 0)
3424 o
->branch1
= saved_b1
;
3425 o
->branch2
= saved_b2
;
3428 if (!merged_common_ancestors
)
3429 return err(o
, _("merge returned no commit"));
3436 o
->ancestor
= "merged common ancestors";
3437 clean
= merge_trees(o
, get_commit_tree(h1
), get_commit_tree(h2
),
3438 get_commit_tree(merged_common_ancestors
),
3445 if (o
->call_depth
) {
3446 *result
= make_virtual_commit(mrtree
, "merged tree");
3447 commit_list_insert(h1
, &(*result
)->parents
);
3448 commit_list_insert(h2
, &(*result
)->parents
->next
);
3451 if (!o
->call_depth
&& o
->buffer_output
< 2)
3452 strbuf_release(&o
->obuf
);
3454 diff_warn_rename_limit("merge.renamelimit",
3455 o
->needed_rename_limit
, 0);
3459 static struct commit
*get_ref(const struct object_id
*oid
, const char *name
)
3461 struct object
*object
;
3463 object
= deref_tag(parse_object(oid
), name
, strlen(name
));
3466 if (object
->type
== OBJ_TREE
)
3467 return make_virtual_commit((struct tree
*)object
, name
);
3468 if (object
->type
!= OBJ_COMMIT
)
3470 if (parse_commit((struct commit
*)object
))
3472 return (struct commit
*)object
;
3475 int merge_recursive_generic(struct merge_options
*o
,
3476 const struct object_id
*head
,
3477 const struct object_id
*merge
,
3479 const struct object_id
**base_list
,
3480 struct commit
**result
)
3483 struct lock_file lock
= LOCK_INIT
;
3484 struct commit
*head_commit
= get_ref(head
, o
->branch1
);
3485 struct commit
*next_commit
= get_ref(merge
, o
->branch2
);
3486 struct commit_list
*ca
= NULL
;
3490 for (i
= 0; i
< num_base_list
; ++i
) {
3491 struct commit
*base
;
3492 if (!(base
= get_ref(base_list
[i
], oid_to_hex(base_list
[i
]))))
3493 return err(o
, _("Could not parse object '%s'"),
3494 oid_to_hex(base_list
[i
]));
3495 commit_list_insert(base
, &ca
);
3499 hold_locked_index(&lock
, LOCK_DIE_ON_ERROR
);
3500 clean
= merge_recursive(o
, head_commit
, next_commit
, ca
,
3503 rollback_lock_file(&lock
);
3507 if (write_locked_index(&the_index
, &lock
,
3508 COMMIT_LOCK
| SKIP_IF_UNCHANGED
))
3509 return err(o
, _("Unable to write index."));
3511 return clean
? 0 : 1;
3514 static void merge_recursive_config(struct merge_options
*o
)
3517 git_config_get_int("merge.verbosity", &o
->verbosity
);
3518 git_config_get_int("diff.renamelimit", &o
->diff_rename_limit
);
3519 git_config_get_int("merge.renamelimit", &o
->merge_rename_limit
);
3520 if (!git_config_get_string("diff.renames", &value
)) {
3521 o
->diff_detect_rename
= git_config_rename("diff.renames", value
);
3524 if (!git_config_get_string("merge.renames", &value
)) {
3525 o
->merge_detect_rename
= git_config_rename("merge.renames", value
);
3528 git_config(git_xmerge_config
, NULL
);
3531 void init_merge_options(struct merge_options
*o
)
3533 const char *merge_verbosity
;
3534 memset(o
, 0, sizeof(struct merge_options
));
3536 o
->buffer_output
= 1;
3537 o
->diff_rename_limit
= -1;
3538 o
->merge_rename_limit
= -1;
3540 o
->diff_detect_rename
= -1;
3541 o
->merge_detect_rename
= -1;
3542 merge_recursive_config(o
);
3543 merge_verbosity
= getenv("GIT_MERGE_VERBOSITY");
3544 if (merge_verbosity
)
3545 o
->verbosity
= strtol(merge_verbosity
, NULL
, 10);
3546 if (o
->verbosity
>= 5)
3547 o
->buffer_output
= 0;
3548 strbuf_init(&o
->obuf
, 0);
3549 string_list_init(&o
->df_conflict_file_set
, 1);
3552 int parse_merge_opt(struct merge_options
*o
, const char *s
)
3558 if (!strcmp(s
, "ours"))
3559 o
->recursive_variant
= MERGE_RECURSIVE_OURS
;
3560 else if (!strcmp(s
, "theirs"))
3561 o
->recursive_variant
= MERGE_RECURSIVE_THEIRS
;
3562 else if (!strcmp(s
, "subtree"))
3563 o
->subtree_shift
= "";
3564 else if (skip_prefix(s
, "subtree=", &arg
))
3565 o
->subtree_shift
= arg
;
3566 else if (!strcmp(s
, "patience"))
3567 o
->xdl_opts
= DIFF_WITH_ALG(o
, PATIENCE_DIFF
);
3568 else if (!strcmp(s
, "histogram"))
3569 o
->xdl_opts
= DIFF_WITH_ALG(o
, HISTOGRAM_DIFF
);
3570 else if (skip_prefix(s
, "diff-algorithm=", &arg
)) {
3571 long value
= parse_algorithm_value(arg
);
3574 /* clear out previous settings */
3575 DIFF_XDL_CLR(o
, NEED_MINIMAL
);
3576 o
->xdl_opts
&= ~XDF_DIFF_ALGORITHM_MASK
;
3577 o
->xdl_opts
|= value
;
3579 else if (!strcmp(s
, "ignore-space-change"))
3580 DIFF_XDL_SET(o
, IGNORE_WHITESPACE_CHANGE
);
3581 else if (!strcmp(s
, "ignore-all-space"))
3582 DIFF_XDL_SET(o
, IGNORE_WHITESPACE
);
3583 else if (!strcmp(s
, "ignore-space-at-eol"))
3584 DIFF_XDL_SET(o
, IGNORE_WHITESPACE_AT_EOL
);
3585 else if (!strcmp(s
, "ignore-cr-at-eol"))
3586 DIFF_XDL_SET(o
, IGNORE_CR_AT_EOL
);
3587 else if (!strcmp(s
, "renormalize"))
3589 else if (!strcmp(s
, "no-renormalize"))
3591 else if (!strcmp(s
, "no-renames"))
3592 o
->merge_detect_rename
= 0;
3593 else if (!strcmp(s
, "find-renames")) {
3594 o
->merge_detect_rename
= 1;
3595 o
->rename_score
= 0;
3597 else if (skip_prefix(s
, "find-renames=", &arg
) ||
3598 skip_prefix(s
, "rename-threshold=", &arg
)) {
3599 if ((o
->rename_score
= parse_rename_score(&arg
)) == -1 || *arg
!= 0)
3601 o
->merge_detect_rename
= 1;