2 * Recursive Merge algorithm stolen from git-merge-recursive.py by
4 * The thieves were Alex Riesen and Johannes Schindelin, in June/July 2006
10 #include "cache-tree.h"
11 #include "object-store.h"
15 #include "tree-walk.h"
20 #include "unpack-trees.h"
21 #include "string-list.h"
22 #include "xdiff-interface.h"
25 #include "merge-recursive.h"
27 #include "submodule.h"
30 struct path_hashmap_entry
{
31 struct hashmap_entry e
;
32 char path
[FLEX_ARRAY
];
35 static int path_hashmap_cmp(const void *cmp_data
,
37 const void *entry_or_key
,
40 const struct path_hashmap_entry
*a
= entry
;
41 const struct path_hashmap_entry
*b
= entry_or_key
;
42 const char *key
= keydata
;
45 return strcasecmp(a
->path
, key
? key
: b
->path
);
47 return strcmp(a
->path
, key
? key
: b
->path
);
50 static unsigned int path_hash(const char *path
)
52 return ignore_case
? strihash(path
) : strhash(path
);
55 static struct dir_rename_entry
*dir_rename_find_entry(struct hashmap
*hashmap
,
58 struct dir_rename_entry key
;
62 hashmap_entry_init(&key
, strhash(dir
));
64 return hashmap_get(hashmap
, &key
, NULL
);
67 static int dir_rename_cmp(const void *unused_cmp_data
,
69 const void *entry_or_key
,
70 const void *unused_keydata
)
72 const struct dir_rename_entry
*e1
= entry
;
73 const struct dir_rename_entry
*e2
= entry_or_key
;
75 return strcmp(e1
->dir
, e2
->dir
);
78 static void dir_rename_init(struct hashmap
*map
)
80 hashmap_init(map
, dir_rename_cmp
, NULL
, 0);
83 static void dir_rename_entry_init(struct dir_rename_entry
*entry
,
86 hashmap_entry_init(entry
, strhash(directory
));
87 entry
->dir
= directory
;
88 entry
->non_unique_new_dir
= 0;
89 strbuf_init(&entry
->new_dir
, 0);
90 string_list_init(&entry
->possible_new_dirs
, 0);
93 static struct collision_entry
*collision_find_entry(struct hashmap
*hashmap
,
96 struct collision_entry key
;
98 hashmap_entry_init(&key
, strhash(target_file
));
99 key
.target_file
= target_file
;
100 return hashmap_get(hashmap
, &key
, NULL
);
103 static int collision_cmp(void *unused_cmp_data
,
104 const struct collision_entry
*e1
,
105 const struct collision_entry
*e2
,
106 const void *unused_keydata
)
108 return strcmp(e1
->target_file
, e2
->target_file
);
111 static void collision_init(struct hashmap
*map
)
113 hashmap_init(map
, (hashmap_cmp_fn
) collision_cmp
, NULL
, 0);
116 static void flush_output(struct merge_options
*o
)
118 if (o
->buffer_output
< 2 && o
->obuf
.len
) {
119 fputs(o
->obuf
.buf
, stdout
);
120 strbuf_reset(&o
->obuf
);
124 static int err(struct merge_options
*o
, const char *err
, ...)
128 if (o
->buffer_output
< 2)
131 strbuf_complete(&o
->obuf
, '\n');
132 strbuf_addstr(&o
->obuf
, "error: ");
134 va_start(params
, err
);
135 strbuf_vaddf(&o
->obuf
, err
, params
);
137 if (o
->buffer_output
> 1)
138 strbuf_addch(&o
->obuf
, '\n');
140 error("%s", o
->obuf
.buf
);
141 strbuf_reset(&o
->obuf
);
147 static struct tree
*shift_tree_object(struct tree
*one
, struct tree
*two
,
148 const char *subtree_shift
)
150 struct object_id shifted
;
152 if (!*subtree_shift
) {
153 shift_tree(&one
->object
.oid
, &two
->object
.oid
, &shifted
, 0);
155 shift_tree_by(&one
->object
.oid
, &two
->object
.oid
, &shifted
,
158 if (!oidcmp(&two
->object
.oid
, &shifted
))
160 return lookup_tree(&shifted
);
163 static struct commit
*make_virtual_commit(struct tree
*tree
, const char *comment
)
165 struct commit
*commit
= alloc_commit_node(the_repository
);
167 set_merge_remote_desc(commit
, comment
, (struct object
*)commit
);
168 commit
->maybe_tree
= tree
;
169 commit
->object
.parsed
= 1;
174 * Since we use get_tree_entry(), which does not put the read object into
175 * the object pool, we cannot rely on a == b.
177 static int oid_eq(const struct object_id
*a
, const struct object_id
*b
)
181 return a
&& b
&& oidcmp(a
, b
) == 0;
188 RENAME_ONE_FILE_TO_ONE
,
189 RENAME_ONE_FILE_TO_TWO
,
190 RENAME_TWO_FILES_TO_ONE
193 struct rename_conflict_info
{
194 enum rename_type rename_type
;
195 struct diff_filepair
*pair1
;
196 struct diff_filepair
*pair2
;
199 struct stage_data
*dst_entry1
;
200 struct stage_data
*dst_entry2
;
201 struct diff_filespec ren1_other
;
202 struct diff_filespec ren2_other
;
206 * Since we want to write the index eventually, we cannot reuse the index
207 * for these (temporary) data.
212 struct object_id oid
;
214 struct rename_conflict_info
*rename_conflict_info
;
215 unsigned processed
:1;
218 static inline void setup_rename_conflict_info(enum rename_type rename_type
,
219 struct diff_filepair
*pair1
,
220 struct diff_filepair
*pair2
,
223 struct stage_data
*dst_entry1
,
224 struct stage_data
*dst_entry2
,
225 struct merge_options
*o
,
226 struct stage_data
*src_entry1
,
227 struct stage_data
*src_entry2
)
229 struct rename_conflict_info
*ci
= xcalloc(1, sizeof(struct rename_conflict_info
));
230 ci
->rename_type
= rename_type
;
232 ci
->branch1
= branch1
;
233 ci
->branch2
= branch2
;
235 ci
->dst_entry1
= dst_entry1
;
236 dst_entry1
->rename_conflict_info
= ci
;
237 dst_entry1
->processed
= 0;
239 assert(!pair2
== !dst_entry2
);
241 ci
->dst_entry2
= dst_entry2
;
243 dst_entry2
->rename_conflict_info
= ci
;
246 if (rename_type
== RENAME_TWO_FILES_TO_ONE
) {
248 * For each rename, there could have been
249 * modifications on the side of history where that
250 * file was not renamed.
252 int ostage1
= o
->branch1
== branch1
? 3 : 2;
253 int ostage2
= ostage1
^ 1;
255 ci
->ren1_other
.path
= pair1
->one
->path
;
256 oidcpy(&ci
->ren1_other
.oid
, &src_entry1
->stages
[ostage1
].oid
);
257 ci
->ren1_other
.mode
= src_entry1
->stages
[ostage1
].mode
;
259 ci
->ren2_other
.path
= pair2
->one
->path
;
260 oidcpy(&ci
->ren2_other
.oid
, &src_entry2
->stages
[ostage2
].oid
);
261 ci
->ren2_other
.mode
= src_entry2
->stages
[ostage2
].mode
;
265 static int show(struct merge_options
*o
, int v
)
267 return (!o
->call_depth
&& o
->verbosity
>= v
) || o
->verbosity
>= 5;
270 __attribute__((format (printf
, 3, 4)))
271 static void output(struct merge_options
*o
, int v
, const char *fmt
, ...)
278 strbuf_addchars(&o
->obuf
, ' ', o
->call_depth
* 2);
281 strbuf_vaddf(&o
->obuf
, fmt
, ap
);
284 strbuf_addch(&o
->obuf
, '\n');
285 if (!o
->buffer_output
)
289 static void output_commit_title(struct merge_options
*o
, struct commit
*commit
)
291 struct merge_remote_desc
*desc
;
293 strbuf_addchars(&o
->obuf
, ' ', o
->call_depth
* 2);
294 desc
= merge_remote_util(commit
);
296 strbuf_addf(&o
->obuf
, "virtual %s\n", desc
->name
);
298 strbuf_add_unique_abbrev(&o
->obuf
, &commit
->object
.oid
,
300 strbuf_addch(&o
->obuf
, ' ');
301 if (parse_commit(commit
) != 0)
302 strbuf_addstr(&o
->obuf
, _("(bad commit)\n"));
305 const char *msg
= get_commit_buffer(commit
, NULL
);
306 int len
= find_commit_subject(msg
, &title
);
308 strbuf_addf(&o
->obuf
, "%.*s\n", len
, title
);
309 unuse_commit_buffer(commit
, msg
);
315 static int add_cacheinfo(struct merge_options
*o
,
316 unsigned int mode
, const struct object_id
*oid
,
317 const char *path
, int stage
, int refresh
, int options
)
319 struct cache_entry
*ce
;
322 ce
= make_cache_entry(mode
, oid
? oid
->hash
: null_sha1
, path
, stage
, 0);
324 return err(o
, _("add_cacheinfo failed for path '%s'; merge aborting."), path
);
326 ret
= add_cache_entry(ce
, options
);
328 struct cache_entry
*nce
;
330 nce
= refresh_cache_entry(ce
, CE_MATCH_REFRESH
| CE_MATCH_IGNORE_MISSING
);
332 return err(o
, _("add_cacheinfo failed to refresh for path '%s'; merge aborting."), path
);
334 ret
= add_cache_entry(nce
, options
);
339 static void init_tree_desc_from_tree(struct tree_desc
*desc
, struct tree
*tree
)
342 init_tree_desc(desc
, tree
->buffer
, tree
->size
);
345 static int unpack_trees_start(struct merge_options
*o
,
351 struct tree_desc t
[3];
352 struct index_state tmp_index
= { NULL
};
354 memset(&o
->unpack_opts
, 0, sizeof(o
->unpack_opts
));
356 o
->unpack_opts
.index_only
= 1;
358 o
->unpack_opts
.update
= 1;
359 o
->unpack_opts
.merge
= 1;
360 o
->unpack_opts
.head_idx
= 2;
361 o
->unpack_opts
.fn
= threeway_merge
;
362 o
->unpack_opts
.src_index
= &the_index
;
363 o
->unpack_opts
.dst_index
= &tmp_index
;
364 o
->unpack_opts
.aggressive
= !merge_detect_rename(o
);
365 setup_unpack_trees_porcelain(&o
->unpack_opts
, "merge");
367 init_tree_desc_from_tree(t
+0, common
);
368 init_tree_desc_from_tree(t
+1, head
);
369 init_tree_desc_from_tree(t
+2, merge
);
371 rc
= unpack_trees(3, t
, &o
->unpack_opts
);
372 cache_tree_free(&active_cache_tree
);
375 * Update the_index to match the new results, AFTER saving a copy
376 * in o->orig_index. Update src_index to point to the saved copy.
377 * (verify_uptodate() checks src_index, and the original index is
378 * the one that had the necessary modification timestamps.)
380 o
->orig_index
= the_index
;
381 the_index
= tmp_index
;
382 o
->unpack_opts
.src_index
= &o
->orig_index
;
387 static void unpack_trees_finish(struct merge_options
*o
)
389 discard_index(&o
->orig_index
);
390 clear_unpack_trees_porcelain(&o
->unpack_opts
);
393 struct tree
*write_tree_from_memory(struct merge_options
*o
)
395 struct tree
*result
= NULL
;
397 if (unmerged_cache()) {
399 fprintf(stderr
, "BUG: There are unmerged index entries:\n");
400 for (i
= 0; i
< active_nr
; i
++) {
401 const struct cache_entry
*ce
= active_cache
[i
];
403 fprintf(stderr
, "BUG: %d %.*s\n", ce_stage(ce
),
404 (int)ce_namelen(ce
), ce
->name
);
406 BUG("unmerged index entries in merge-recursive.c");
409 if (!active_cache_tree
)
410 active_cache_tree
= cache_tree();
412 if (!cache_tree_fully_valid(active_cache_tree
) &&
413 cache_tree_update(&the_index
, 0) < 0) {
414 err(o
, _("error building trees"));
418 result
= lookup_tree(&active_cache_tree
->oid
);
423 static int save_files_dirs(const struct object_id
*oid
,
424 struct strbuf
*base
, const char *path
,
425 unsigned int mode
, int stage
, void *context
)
427 struct path_hashmap_entry
*entry
;
428 int baselen
= base
->len
;
429 struct merge_options
*o
= context
;
431 strbuf_addstr(base
, path
);
433 FLEX_ALLOC_MEM(entry
, path
, base
->buf
, base
->len
);
434 hashmap_entry_init(entry
, path_hash(entry
->path
));
435 hashmap_add(&o
->current_file_dir_set
, entry
);
437 strbuf_setlen(base
, baselen
);
438 return (S_ISDIR(mode
) ? READ_TREE_RECURSIVE
: 0);
441 static void get_files_dirs(struct merge_options
*o
, struct tree
*tree
)
443 struct pathspec match_all
;
444 memset(&match_all
, 0, sizeof(match_all
));
445 read_tree_recursive(tree
, "", 0, 0, &match_all
, save_files_dirs
, o
);
448 static int get_tree_entry_if_blob(const struct object_id
*tree
,
450 struct object_id
*hashy
,
451 unsigned int *mode_o
)
455 ret
= get_tree_entry(tree
, path
, hashy
, mode_o
);
456 if (S_ISDIR(*mode_o
)) {
457 oidcpy(hashy
, &null_oid
);
464 * Returns an index_entry instance which doesn't have to correspond to
465 * a real cache entry in Git's index.
467 static struct stage_data
*insert_stage_data(const char *path
,
468 struct tree
*o
, struct tree
*a
, struct tree
*b
,
469 struct string_list
*entries
)
471 struct string_list_item
*item
;
472 struct stage_data
*e
= xcalloc(1, sizeof(struct stage_data
));
473 get_tree_entry_if_blob(&o
->object
.oid
, path
,
474 &e
->stages
[1].oid
, &e
->stages
[1].mode
);
475 get_tree_entry_if_blob(&a
->object
.oid
, path
,
476 &e
->stages
[2].oid
, &e
->stages
[2].mode
);
477 get_tree_entry_if_blob(&b
->object
.oid
, path
,
478 &e
->stages
[3].oid
, &e
->stages
[3].mode
);
479 item
= string_list_insert(entries
, path
);
485 * Create a dictionary mapping file names to stage_data objects. The
486 * dictionary contains one entry for every path with a non-zero stage entry.
488 static struct string_list
*get_unmerged(void)
490 struct string_list
*unmerged
= xcalloc(1, sizeof(struct string_list
));
493 unmerged
->strdup_strings
= 1;
495 for (i
= 0; i
< active_nr
; i
++) {
496 struct string_list_item
*item
;
497 struct stage_data
*e
;
498 const struct cache_entry
*ce
= active_cache
[i
];
502 item
= string_list_lookup(unmerged
, ce
->name
);
504 item
= string_list_insert(unmerged
, ce
->name
);
505 item
->util
= xcalloc(1, sizeof(struct stage_data
));
508 e
->stages
[ce_stage(ce
)].mode
= ce
->ce_mode
;
509 oidcpy(&e
->stages
[ce_stage(ce
)].oid
, &ce
->oid
);
515 static int string_list_df_name_compare(const char *one
, const char *two
)
517 int onelen
= strlen(one
);
518 int twolen
= strlen(two
);
520 * Here we only care that entries for D/F conflicts are
521 * adjacent, in particular with the file of the D/F conflict
522 * appearing before files below the corresponding directory.
523 * The order of the rest of the list is irrelevant for us.
525 * To achieve this, we sort with df_name_compare and provide
526 * the mode S_IFDIR so that D/F conflicts will sort correctly.
527 * We use the mode S_IFDIR for everything else for simplicity,
528 * since in other cases any changes in their order due to
529 * sorting cause no problems for us.
531 int cmp
= df_name_compare(one
, onelen
, S_IFDIR
,
532 two
, twolen
, S_IFDIR
);
534 * Now that 'foo' and 'foo/bar' compare equal, we have to make sure
535 * that 'foo' comes before 'foo/bar'.
539 return onelen
- twolen
;
542 static void record_df_conflict_files(struct merge_options
*o
,
543 struct string_list
*entries
)
545 /* If there is a D/F conflict and the file for such a conflict
546 * currently exist in the working tree, we want to allow it to be
547 * removed to make room for the corresponding directory if needed.
548 * The files underneath the directories of such D/F conflicts will
549 * be processed before the corresponding file involved in the D/F
550 * conflict. If the D/F directory ends up being removed by the
551 * merge, then we won't have to touch the D/F file. If the D/F
552 * directory needs to be written to the working copy, then the D/F
553 * file will simply be removed (in make_room_for_path()) to make
554 * room for the necessary paths. Note that if both the directory
555 * and the file need to be present, then the D/F file will be
556 * reinstated with a new unique name at the time it is processed.
558 struct string_list df_sorted_entries
= STRING_LIST_INIT_NODUP
;
559 const char *last_file
= NULL
;
564 * If we're merging merge-bases, we don't want to bother with
565 * any working directory changes.
570 /* Ensure D/F conflicts are adjacent in the entries list. */
571 for (i
= 0; i
< entries
->nr
; i
++) {
572 struct string_list_item
*next
= &entries
->items
[i
];
573 string_list_append(&df_sorted_entries
, next
->string
)->util
=
576 df_sorted_entries
.cmp
= string_list_df_name_compare
;
577 string_list_sort(&df_sorted_entries
);
579 string_list_clear(&o
->df_conflict_file_set
, 1);
580 for (i
= 0; i
< df_sorted_entries
.nr
; i
++) {
581 const char *path
= df_sorted_entries
.items
[i
].string
;
582 int len
= strlen(path
);
583 struct stage_data
*e
= df_sorted_entries
.items
[i
].util
;
586 * Check if last_file & path correspond to a D/F conflict;
587 * i.e. whether path is last_file+'/'+<something>.
588 * If so, record that it's okay to remove last_file to make
589 * room for path and friends if needed.
593 memcmp(path
, last_file
, last_len
) == 0 &&
594 path
[last_len
] == '/') {
595 string_list_insert(&o
->df_conflict_file_set
, last_file
);
599 * Determine whether path could exist as a file in the
600 * working directory as a possible D/F conflict. This
601 * will only occur when it exists in stage 2 as a
604 if (S_ISREG(e
->stages
[2].mode
) || S_ISLNK(e
->stages
[2].mode
)) {
611 string_list_clear(&df_sorted_entries
, 0);
615 struct diff_filepair
*pair
;
617 * Purpose of src_entry and dst_entry:
619 * If 'before' is renamed to 'after' then src_entry will contain
620 * the versions of 'before' from the merge_base, HEAD, and MERGE in
621 * stages 1, 2, and 3; dst_entry will contain the respective
622 * versions of 'after' in corresponding locations. Thus, we have a
623 * total of six modes and oids, though some will be null. (Stage 0
624 * is ignored; we're interested in handling conflicts.)
626 * Since we don't turn on break-rewrites by default, neither
627 * src_entry nor dst_entry can have all three of their stages have
628 * non-null oids, meaning at most four of the six will be non-null.
629 * Also, since this is a rename, both src_entry and dst_entry will
630 * have at least one non-null oid, meaning at least two will be
631 * non-null. Of the six oids, a typical rename will have three be
632 * non-null. Only two implies a rename/delete, and four implies a
635 struct stage_data
*src_entry
;
636 struct stage_data
*dst_entry
;
637 unsigned add_turned_into_rename
:1;
638 unsigned processed
:1;
641 static int update_stages(struct merge_options
*opt
, const char *path
,
642 const struct diff_filespec
*o
,
643 const struct diff_filespec
*a
,
644 const struct diff_filespec
*b
)
648 * NOTE: It is usually a bad idea to call update_stages on a path
649 * before calling update_file on that same path, since it can
650 * sometimes lead to spurious "refusing to lose untracked file..."
651 * messages from update_file (via make_room_for path via
652 * would_lose_untracked). Instead, reverse the order of the calls
653 * (executing update_file first and then update_stages).
656 int options
= ADD_CACHE_OK_TO_ADD
| ADD_CACHE_SKIP_DFCHECK
;
658 if (remove_file_from_cache(path
))
661 if (add_cacheinfo(opt
, o
->mode
, &o
->oid
, path
, 1, 0, options
))
664 if (add_cacheinfo(opt
, a
->mode
, &a
->oid
, path
, 2, 0, options
))
667 if (add_cacheinfo(opt
, b
->mode
, &b
->oid
, path
, 3, 0, options
))
672 static int update_stages_for_stage_data(struct merge_options
*opt
,
674 const struct stage_data
*stage_data
)
676 struct diff_filespec o
, a
, b
;
678 o
.mode
= stage_data
->stages
[1].mode
;
679 oidcpy(&o
.oid
, &stage_data
->stages
[1].oid
);
681 a
.mode
= stage_data
->stages
[2].mode
;
682 oidcpy(&a
.oid
, &stage_data
->stages
[2].oid
);
684 b
.mode
= stage_data
->stages
[3].mode
;
685 oidcpy(&b
.oid
, &stage_data
->stages
[3].oid
);
687 return update_stages(opt
, path
,
688 is_null_oid(&o
.oid
) ? NULL
: &o
,
689 is_null_oid(&a
.oid
) ? NULL
: &a
,
690 is_null_oid(&b
.oid
) ? NULL
: &b
);
693 static void update_entry(struct stage_data
*entry
,
694 struct diff_filespec
*o
,
695 struct diff_filespec
*a
,
696 struct diff_filespec
*b
)
698 entry
->processed
= 0;
699 entry
->stages
[1].mode
= o
->mode
;
700 entry
->stages
[2].mode
= a
->mode
;
701 entry
->stages
[3].mode
= b
->mode
;
702 oidcpy(&entry
->stages
[1].oid
, &o
->oid
);
703 oidcpy(&entry
->stages
[2].oid
, &a
->oid
);
704 oidcpy(&entry
->stages
[3].oid
, &b
->oid
);
707 static int remove_file(struct merge_options
*o
, int clean
,
708 const char *path
, int no_wd
)
710 int update_cache
= o
->call_depth
|| clean
;
711 int update_working_directory
= !o
->call_depth
&& !no_wd
;
714 if (remove_file_from_cache(path
))
717 if (update_working_directory
) {
719 struct cache_entry
*ce
;
720 ce
= cache_file_exists(path
, strlen(path
), ignore_case
);
721 if (ce
&& ce_stage(ce
) == 0 && strcmp(path
, ce
->name
))
724 if (remove_path(path
))
730 /* add a string to a strbuf, but converting "/" to "_" */
731 static void add_flattened_path(struct strbuf
*out
, const char *s
)
734 strbuf_addstr(out
, s
);
735 for (; i
< out
->len
; i
++)
736 if (out
->buf
[i
] == '/')
740 static char *unique_path(struct merge_options
*o
, const char *path
, const char *branch
)
742 struct path_hashmap_entry
*entry
;
743 struct strbuf newpath
= STRBUF_INIT
;
747 strbuf_addf(&newpath
, "%s~", path
);
748 add_flattened_path(&newpath
, branch
);
750 base_len
= newpath
.len
;
751 while (hashmap_get_from_hash(&o
->current_file_dir_set
,
752 path_hash(newpath
.buf
), newpath
.buf
) ||
753 (!o
->call_depth
&& file_exists(newpath
.buf
))) {
754 strbuf_setlen(&newpath
, base_len
);
755 strbuf_addf(&newpath
, "_%d", suffix
++);
758 FLEX_ALLOC_MEM(entry
, path
, newpath
.buf
, newpath
.len
);
759 hashmap_entry_init(entry
, path_hash(entry
->path
));
760 hashmap_add(&o
->current_file_dir_set
, entry
);
761 return strbuf_detach(&newpath
, NULL
);
765 * Check whether a directory in the index is in the way of an incoming
766 * file. Return 1 if so. If check_working_copy is non-zero, also
767 * check the working directory. If empty_ok is non-zero, also return
768 * 0 in the case where the working-tree dir exists but is empty.
770 static int dir_in_way(const char *path
, int check_working_copy
, int empty_ok
)
773 struct strbuf dirpath
= STRBUF_INIT
;
776 strbuf_addstr(&dirpath
, path
);
777 strbuf_addch(&dirpath
, '/');
779 pos
= cache_name_pos(dirpath
.buf
, dirpath
.len
);
783 if (pos
< active_nr
&&
784 !strncmp(dirpath
.buf
, active_cache
[pos
]->name
, dirpath
.len
)) {
785 strbuf_release(&dirpath
);
789 strbuf_release(&dirpath
);
790 return check_working_copy
&& !lstat(path
, &st
) && S_ISDIR(st
.st_mode
) &&
791 !(empty_ok
&& is_empty_dir(path
));
795 * Returns whether path was tracked in the index before the merge started,
796 * and its oid and mode match the specified values
798 static int was_tracked_and_matches(struct merge_options
*o
, const char *path
,
799 const struct object_id
*oid
, unsigned mode
)
801 int pos
= index_name_pos(&o
->orig_index
, path
, strlen(path
));
802 struct cache_entry
*ce
;
805 /* we were not tracking this path before the merge */
808 /* See if the file we were tracking before matches */
809 ce
= o
->orig_index
.cache
[pos
];
810 return (oid_eq(&ce
->oid
, oid
) && ce
->ce_mode
== mode
);
814 * Returns whether path was tracked in the index before the merge started
816 static int was_tracked(struct merge_options
*o
, const char *path
)
818 int pos
= index_name_pos(&o
->orig_index
, path
, strlen(path
));
821 /* we were tracking this path before the merge */
827 static int would_lose_untracked(const char *path
)
830 * This may look like it can be simplified to:
831 * return !was_tracked(o, path) && file_exists(path)
832 * but it can't. This function needs to know whether path was in
833 * the working tree due to EITHER having been tracked in the index
834 * before the merge OR having been put into the working copy and
835 * index by unpack_trees(). Due to that either-or requirement, we
836 * check the current index instead of the original one.
838 * Note that we do not need to worry about merge-recursive itself
839 * updating the index after unpack_trees() and before calling this
840 * function, because we strictly require all code paths in
841 * merge-recursive to update the working tree first and the index
842 * second. Doing otherwise would break
843 * update_file()/would_lose_untracked(); see every comment in this
844 * file which mentions "update_stages".
846 int pos
= cache_name_pos(path
, strlen(path
));
850 while (pos
< active_nr
&&
851 !strcmp(path
, active_cache
[pos
]->name
)) {
853 * If stage #0, it is definitely tracked.
854 * If it has stage #2 then it was tracked
855 * before this merge started. All other
856 * cases the path was not tracked.
858 switch (ce_stage(active_cache
[pos
])) {
865 return file_exists(path
);
868 static int was_dirty(struct merge_options
*o
, const char *path
)
870 struct cache_entry
*ce
;
873 if (o
->call_depth
|| !was_tracked(o
, path
))
876 ce
= index_file_exists(o
->unpack_opts
.src_index
,
877 path
, strlen(path
), ignore_case
);
878 dirty
= verify_uptodate(ce
, &o
->unpack_opts
) != 0;
882 static int make_room_for_path(struct merge_options
*o
, const char *path
)
885 const char *msg
= _("failed to create path '%s'%s");
887 /* Unlink any D/F conflict files that are in the way */
888 for (i
= 0; i
< o
->df_conflict_file_set
.nr
; i
++) {
889 const char *df_path
= o
->df_conflict_file_set
.items
[i
].string
;
890 size_t pathlen
= strlen(path
);
891 size_t df_pathlen
= strlen(df_path
);
892 if (df_pathlen
< pathlen
&&
893 path
[df_pathlen
] == '/' &&
894 strncmp(path
, df_path
, df_pathlen
) == 0) {
896 _("Removing %s to make room for subdirectory\n"),
899 unsorted_string_list_delete_item(&o
->df_conflict_file_set
,
905 /* Make sure leading directories are created */
906 status
= safe_create_leading_directories_const(path
);
908 if (status
== SCLD_EXISTS
)
909 /* something else exists */
910 return err(o
, msg
, path
, _(": perhaps a D/F conflict?"));
911 return err(o
, msg
, path
, "");
915 * Do not unlink a file in the work tree if we are not
918 if (would_lose_untracked(path
))
919 return err(o
, _("refusing to lose untracked file at '%s'"),
922 /* Successful unlink is good.. */
925 /* .. and so is no existing file */
928 /* .. but not some other error (who really cares what?) */
929 return err(o
, msg
, path
, _(": perhaps a D/F conflict?"));
932 static int update_file_flags(struct merge_options
*o
,
933 const struct object_id
*oid
,
945 enum object_type type
;
949 if (S_ISGITLINK(mode
)) {
951 * We may later decide to recursively descend into
952 * the submodule directory and update its index
953 * and/or work tree, but we do not do that now.
959 buf
= read_object_file(oid
, &type
, &size
);
961 return err(o
, _("cannot read object %s '%s'"), oid_to_hex(oid
), path
);
962 if (type
!= OBJ_BLOB
) {
963 ret
= err(o
, _("blob expected for %s '%s'"), oid_to_hex(oid
), path
);
967 struct strbuf strbuf
= STRBUF_INIT
;
968 if (convert_to_working_tree(path
, buf
, size
, &strbuf
)) {
971 buf
= strbuf_detach(&strbuf
, NULL
);
975 if (make_room_for_path(o
, path
) < 0) {
979 if (S_ISREG(mode
) || (!has_symlinks
&& S_ISLNK(mode
))) {
985 fd
= open(path
, O_WRONLY
| O_TRUNC
| O_CREAT
, mode
);
987 ret
= err(o
, _("failed to open '%s': %s"),
988 path
, strerror(errno
));
991 write_in_full(fd
, buf
, size
);
993 } else if (S_ISLNK(mode
)) {
994 char *lnk
= xmemdupz(buf
, size
);
995 safe_create_leading_directories_const(path
);
997 if (symlink(lnk
, path
))
998 ret
= err(o
, _("failed to symlink '%s': %s"),
999 path
, strerror(errno
));
1003 _("do not know what to do with %06o %s '%s'"),
1004 mode
, oid_to_hex(oid
), path
);
1009 if (!ret
&& update_cache
)
1010 if (add_cacheinfo(o
, mode
, oid
, path
, 0, update_wd
,
1011 ADD_CACHE_OK_TO_ADD
))
1016 static int update_file(struct merge_options
*o
,
1018 const struct object_id
*oid
,
1022 return update_file_flags(o
, oid
, mode
, path
, o
->call_depth
|| clean
, !o
->call_depth
);
1025 /* Low level file merging, update and removal */
1027 struct merge_file_info
{
1028 struct object_id oid
;
1034 static int merge_3way(struct merge_options
*o
,
1035 mmbuffer_t
*result_buf
,
1036 const struct diff_filespec
*one
,
1037 const struct diff_filespec
*a
,
1038 const struct diff_filespec
*b
,
1039 const char *branch1
,
1040 const char *branch2
)
1042 mmfile_t orig
, src1
, src2
;
1043 struct ll_merge_options ll_opts
= {0};
1044 char *base_name
, *name1
, *name2
;
1047 ll_opts
.renormalize
= o
->renormalize
;
1048 ll_opts
.xdl_opts
= o
->xdl_opts
;
1050 if (o
->call_depth
) {
1051 ll_opts
.virtual_ancestor
= 1;
1052 ll_opts
.variant
= 0;
1054 switch (o
->recursive_variant
) {
1055 case MERGE_RECURSIVE_OURS
:
1056 ll_opts
.variant
= XDL_MERGE_FAVOR_OURS
;
1058 case MERGE_RECURSIVE_THEIRS
:
1059 ll_opts
.variant
= XDL_MERGE_FAVOR_THEIRS
;
1062 ll_opts
.variant
= 0;
1067 if (strcmp(a
->path
, b
->path
) ||
1068 (o
->ancestor
!= NULL
&& strcmp(a
->path
, one
->path
) != 0)) {
1069 base_name
= o
->ancestor
== NULL
? NULL
:
1070 mkpathdup("%s:%s", o
->ancestor
, one
->path
);
1071 name1
= mkpathdup("%s:%s", branch1
, a
->path
);
1072 name2
= mkpathdup("%s:%s", branch2
, b
->path
);
1074 base_name
= o
->ancestor
== NULL
? NULL
:
1075 mkpathdup("%s", o
->ancestor
);
1076 name1
= mkpathdup("%s", branch1
);
1077 name2
= mkpathdup("%s", branch2
);
1080 read_mmblob(&orig
, &one
->oid
);
1081 read_mmblob(&src1
, &a
->oid
);
1082 read_mmblob(&src2
, &b
->oid
);
1084 merge_status
= ll_merge(result_buf
, a
->path
, &orig
, base_name
,
1085 &src1
, name1
, &src2
, name2
, &ll_opts
);
1093 return merge_status
;
1096 static int find_first_merges(struct object_array
*result
, const char *path
,
1097 struct commit
*a
, struct commit
*b
)
1100 struct object_array merges
= OBJECT_ARRAY_INIT
;
1101 struct commit
*commit
;
1102 int contains_another
;
1104 char merged_revision
[42];
1105 const char *rev_args
[] = { "rev-list", "--merges", "--ancestry-path",
1106 "--all", merged_revision
, NULL
};
1107 struct rev_info revs
;
1108 struct setup_revision_opt rev_opts
;
1110 memset(result
, 0, sizeof(struct object_array
));
1111 memset(&rev_opts
, 0, sizeof(rev_opts
));
1113 /* get all revisions that merge commit a */
1114 xsnprintf(merged_revision
, sizeof(merged_revision
), "^%s",
1115 oid_to_hex(&a
->object
.oid
));
1116 init_revisions(&revs
, NULL
);
1117 rev_opts
.submodule
= path
;
1118 /* FIXME: can't handle linked worktrees in submodules yet */
1119 revs
.single_worktree
= path
!= NULL
;
1120 setup_revisions(ARRAY_SIZE(rev_args
)-1, rev_args
, &revs
, &rev_opts
);
1122 /* save all revisions from the above list that contain b */
1123 if (prepare_revision_walk(&revs
))
1124 die("revision walk setup failed");
1125 while ((commit
= get_revision(&revs
)) != NULL
) {
1126 struct object
*o
= &(commit
->object
);
1127 if (in_merge_bases(b
, commit
))
1128 add_object_array(o
, NULL
, &merges
);
1130 reset_revision_walk();
1132 /* Now we've got all merges that contain a and b. Prune all
1133 * merges that contain another found merge and save them in
1136 for (i
= 0; i
< merges
.nr
; i
++) {
1137 struct commit
*m1
= (struct commit
*) merges
.objects
[i
].item
;
1139 contains_another
= 0;
1140 for (j
= 0; j
< merges
.nr
; j
++) {
1141 struct commit
*m2
= (struct commit
*) merges
.objects
[j
].item
;
1142 if (i
!= j
&& in_merge_bases(m2
, m1
)) {
1143 contains_another
= 1;
1148 if (!contains_another
)
1149 add_object_array(merges
.objects
[i
].item
, NULL
, result
);
1152 object_array_clear(&merges
);
1156 static void print_commit(struct commit
*commit
)
1158 struct strbuf sb
= STRBUF_INIT
;
1159 struct pretty_print_context ctx
= {0};
1160 ctx
.date_mode
.type
= DATE_NORMAL
;
1161 format_commit_message(commit
, " %h: %m %s", &sb
, &ctx
);
1162 fprintf(stderr
, "%s\n", sb
.buf
);
1163 strbuf_release(&sb
);
1166 static int merge_submodule(struct merge_options
*o
,
1167 struct object_id
*result
, const char *path
,
1168 const struct object_id
*base
, const struct object_id
*a
,
1169 const struct object_id
*b
)
1171 struct commit
*commit_base
, *commit_a
, *commit_b
;
1173 struct object_array merges
;
1176 int search
= !o
->call_depth
;
1178 /* store a in result in case we fail */
1181 /* we can not handle deletion conflicts */
1182 if (is_null_oid(base
))
1189 if (add_submodule_odb(path
)) {
1190 output(o
, 1, _("Failed to merge submodule %s (not checked out)"), path
);
1194 if (!(commit_base
= lookup_commit_reference(base
)) ||
1195 !(commit_a
= lookup_commit_reference(a
)) ||
1196 !(commit_b
= lookup_commit_reference(b
))) {
1197 output(o
, 1, _("Failed to merge submodule %s (commits not present)"), path
);
1201 /* check whether both changes are forward */
1202 if (!in_merge_bases(commit_base
, commit_a
) ||
1203 !in_merge_bases(commit_base
, commit_b
)) {
1204 output(o
, 1, _("Failed to merge submodule %s (commits don't follow merge-base)"), path
);
1208 /* Case #1: a is contained in b or vice versa */
1209 if (in_merge_bases(commit_a
, commit_b
)) {
1212 output(o
, 3, _("Fast-forwarding submodule %s to the following commit:"), path
);
1213 output_commit_title(o
, commit_b
);
1214 } else if (show(o
, 2))
1215 output(o
, 2, _("Fast-forwarding submodule %s"), path
);
1221 if (in_merge_bases(commit_b
, commit_a
)) {
1224 output(o
, 3, _("Fast-forwarding submodule %s to the following commit:"), path
);
1225 output_commit_title(o
, commit_a
);
1226 } else if (show(o
, 2))
1227 output(o
, 2, _("Fast-forwarding submodule %s"), path
);
1235 * Case #2: There are one or more merges that contain a and b in
1236 * the submodule. If there is only one, then present it as a
1237 * suggestion to the user, but leave it marked unmerged so the
1238 * user needs to confirm the resolution.
1241 /* Skip the search if makes no sense to the calling context. */
1245 /* find commit which merges them */
1246 parent_count
= find_first_merges(&merges
, path
, commit_a
, commit_b
);
1247 switch (parent_count
) {
1249 output(o
, 1, _("Failed to merge submodule %s (merge following commits not found)"), path
);
1253 output(o
, 1, _("Failed to merge submodule %s (not fast-forward)"), path
);
1254 output(o
, 2, _("Found a possible merge resolution for the submodule:\n"));
1255 print_commit((struct commit
*) merges
.objects
[0].item
);
1257 "If this is correct simply add it to the index "
1260 " git update-index --cacheinfo 160000 %s \"%s\"\n\n"
1261 "which will accept this suggestion.\n"),
1262 oid_to_hex(&merges
.objects
[0].item
->oid
), path
);
1266 output(o
, 1, _("Failed to merge submodule %s (multiple merges found)"), path
);
1267 for (i
= 0; i
< merges
.nr
; i
++)
1268 print_commit((struct commit
*) merges
.objects
[i
].item
);
1271 object_array_clear(&merges
);
1275 static int merge_file_1(struct merge_options
*o
,
1276 const struct diff_filespec
*one
,
1277 const struct diff_filespec
*a
,
1278 const struct diff_filespec
*b
,
1279 const char *filename
,
1280 const char *branch1
,
1281 const char *branch2
,
1282 struct merge_file_info
*result
)
1287 if ((S_IFMT
& a
->mode
) != (S_IFMT
& b
->mode
)) {
1289 if (S_ISREG(a
->mode
)) {
1290 result
->mode
= a
->mode
;
1291 oidcpy(&result
->oid
, &a
->oid
);
1293 result
->mode
= b
->mode
;
1294 oidcpy(&result
->oid
, &b
->oid
);
1297 if (!oid_eq(&a
->oid
, &one
->oid
) && !oid_eq(&b
->oid
, &one
->oid
))
1303 if (a
->mode
== b
->mode
|| a
->mode
== one
->mode
)
1304 result
->mode
= b
->mode
;
1306 result
->mode
= a
->mode
;
1307 if (b
->mode
!= one
->mode
) {
1313 if (oid_eq(&a
->oid
, &b
->oid
) || oid_eq(&a
->oid
, &one
->oid
))
1314 oidcpy(&result
->oid
, &b
->oid
);
1315 else if (oid_eq(&b
->oid
, &one
->oid
))
1316 oidcpy(&result
->oid
, &a
->oid
);
1317 else if (S_ISREG(a
->mode
)) {
1318 mmbuffer_t result_buf
;
1319 int ret
= 0, merge_status
;
1321 merge_status
= merge_3way(o
, &result_buf
, one
, a
, b
,
1324 if ((merge_status
< 0) || !result_buf
.ptr
)
1325 ret
= err(o
, _("Failed to execute internal merge"));
1328 write_object_file(result_buf
.ptr
, result_buf
.size
,
1329 blob_type
, &result
->oid
))
1330 ret
= err(o
, _("Unable to add %s to database"),
1333 free(result_buf
.ptr
);
1336 result
->clean
= (merge_status
== 0);
1337 } else if (S_ISGITLINK(a
->mode
)) {
1338 result
->clean
= merge_submodule(o
, &result
->oid
,
1343 } else if (S_ISLNK(a
->mode
)) {
1344 switch (o
->recursive_variant
) {
1345 case MERGE_RECURSIVE_NORMAL
:
1346 oidcpy(&result
->oid
, &a
->oid
);
1347 if (!oid_eq(&a
->oid
, &b
->oid
))
1350 case MERGE_RECURSIVE_OURS
:
1351 oidcpy(&result
->oid
, &a
->oid
);
1353 case MERGE_RECURSIVE_THEIRS
:
1354 oidcpy(&result
->oid
, &b
->oid
);
1358 BUG("unsupported object type in the tree");
1362 output(o
, 2, _("Auto-merging %s"), filename
);
1367 static int merge_file_special_markers(struct merge_options
*o
,
1368 const struct diff_filespec
*one
,
1369 const struct diff_filespec
*a
,
1370 const struct diff_filespec
*b
,
1371 const char *target_filename
,
1372 const char *branch1
,
1373 const char *filename1
,
1374 const char *branch2
,
1375 const char *filename2
,
1376 struct merge_file_info
*mfi
)
1383 side1
= xstrfmt("%s:%s", branch1
, filename1
);
1385 side2
= xstrfmt("%s:%s", branch2
, filename2
);
1387 ret
= merge_file_1(o
, one
, a
, b
, target_filename
,
1388 side1
? side1
: branch1
,
1389 side2
? side2
: branch2
, mfi
);
1396 static int merge_file_one(struct merge_options
*o
,
1398 const struct object_id
*o_oid
, int o_mode
,
1399 const struct object_id
*a_oid
, int a_mode
,
1400 const struct object_id
*b_oid
, int b_mode
,
1401 const char *branch1
,
1402 const char *branch2
,
1403 struct merge_file_info
*mfi
)
1405 struct diff_filespec one
, a
, b
;
1407 one
.path
= a
.path
= b
.path
= (char *)path
;
1408 oidcpy(&one
.oid
, o_oid
);
1410 oidcpy(&a
.oid
, a_oid
);
1412 oidcpy(&b
.oid
, b_oid
);
1414 return merge_file_1(o
, &one
, &a
, &b
, path
, branch1
, branch2
, mfi
);
1417 static int conflict_rename_dir(struct merge_options
*o
,
1418 struct diff_filepair
*pair
,
1419 const char *rename_branch
,
1420 const char *other_branch
)
1422 const struct diff_filespec
*dest
= pair
->two
;
1424 if (!o
->call_depth
&& would_lose_untracked(dest
->path
)) {
1425 char *alt_path
= unique_path(o
, dest
->path
, rename_branch
);
1427 output(o
, 1, _("Error: Refusing to lose untracked file at %s; "
1428 "writing to %s instead."),
1429 dest
->path
, alt_path
);
1431 * Write the file in worktree at alt_path, but not in the
1432 * index. Instead, write to dest->path for the index but
1433 * only at the higher appropriate stage.
1435 if (update_file(o
, 0, &dest
->oid
, dest
->mode
, alt_path
))
1438 return update_stages(o
, dest
->path
, NULL
,
1439 rename_branch
== o
->branch1
? dest
: NULL
,
1440 rename_branch
== o
->branch1
? NULL
: dest
);
1443 /* Update dest->path both in index and in worktree */
1444 if (update_file(o
, 1, &dest
->oid
, dest
->mode
, dest
->path
))
1449 static int handle_change_delete(struct merge_options
*o
,
1450 const char *path
, const char *old_path
,
1451 const struct object_id
*o_oid
, int o_mode
,
1452 const struct object_id
*changed_oid
,
1454 const char *change_branch
,
1455 const char *delete_branch
,
1456 const char *change
, const char *change_past
)
1458 char *alt_path
= NULL
;
1459 const char *update_path
= path
;
1462 if (dir_in_way(path
, !o
->call_depth
, 0) ||
1463 (!o
->call_depth
&& would_lose_untracked(path
))) {
1464 update_path
= alt_path
= unique_path(o
, path
, change_branch
);
1467 if (o
->call_depth
) {
1469 * We cannot arbitrarily accept either a_sha or b_sha as
1470 * correct; since there is no true "middle point" between
1471 * them, simply reuse the base version for virtual merge base.
1473 ret
= remove_file_from_cache(path
);
1475 ret
= update_file(o
, 0, o_oid
, o_mode
, update_path
);
1479 output(o
, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1480 "and %s in %s. Version %s of %s left in tree."),
1481 change
, path
, delete_branch
, change_past
,
1482 change_branch
, change_branch
, path
);
1484 output(o
, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1485 "and %s to %s in %s. Version %s of %s left in tree."),
1486 change
, old_path
, delete_branch
, change_past
, path
,
1487 change_branch
, change_branch
, path
);
1491 output(o
, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1492 "and %s in %s. Version %s of %s left in tree at %s."),
1493 change
, path
, delete_branch
, change_past
,
1494 change_branch
, change_branch
, path
, alt_path
);
1496 output(o
, 1, _("CONFLICT (%s/delete): %s deleted in %s "
1497 "and %s to %s in %s. Version %s of %s left in tree at %s."),
1498 change
, old_path
, delete_branch
, change_past
, path
,
1499 change_branch
, change_branch
, path
, alt_path
);
1503 * No need to call update_file() on path when change_branch ==
1504 * o->branch1 && !alt_path, since that would needlessly touch
1505 * path. We could call update_file_flags() with update_cache=0
1506 * and update_wd=0, but that's a no-op.
1508 if (change_branch
!= o
->branch1
|| alt_path
)
1509 ret
= update_file(o
, 0, changed_oid
, changed_mode
, update_path
);
1516 static int conflict_rename_delete(struct merge_options
*o
,
1517 struct diff_filepair
*pair
,
1518 const char *rename_branch
,
1519 const char *delete_branch
)
1521 const struct diff_filespec
*orig
= pair
->one
;
1522 const struct diff_filespec
*dest
= pair
->two
;
1524 if (handle_change_delete(o
,
1525 o
->call_depth
? orig
->path
: dest
->path
,
1526 o
->call_depth
? NULL
: orig
->path
,
1527 &orig
->oid
, orig
->mode
,
1528 &dest
->oid
, dest
->mode
,
1529 rename_branch
, delete_branch
,
1530 _("rename"), _("renamed")))
1534 return remove_file_from_cache(dest
->path
);
1536 return update_stages(o
, dest
->path
, NULL
,
1537 rename_branch
== o
->branch1
? dest
: NULL
,
1538 rename_branch
== o
->branch1
? NULL
: dest
);
1541 static struct diff_filespec
*filespec_from_entry(struct diff_filespec
*target
,
1542 struct stage_data
*entry
,
1545 struct object_id
*oid
= &entry
->stages
[stage
].oid
;
1546 unsigned mode
= entry
->stages
[stage
].mode
;
1547 if (mode
== 0 || is_null_oid(oid
))
1549 oidcpy(&target
->oid
, oid
);
1550 target
->mode
= mode
;
1554 static int handle_file(struct merge_options
*o
,
1555 struct diff_filespec
*rename
,
1557 struct rename_conflict_info
*ci
)
1559 char *dst_name
= rename
->path
;
1560 struct stage_data
*dst_entry
;
1561 const char *cur_branch
, *other_branch
;
1562 struct diff_filespec other
;
1563 struct diff_filespec
*add
;
1567 dst_entry
= ci
->dst_entry1
;
1568 cur_branch
= ci
->branch1
;
1569 other_branch
= ci
->branch2
;
1571 dst_entry
= ci
->dst_entry2
;
1572 cur_branch
= ci
->branch2
;
1573 other_branch
= ci
->branch1
;
1576 add
= filespec_from_entry(&other
, dst_entry
, stage
^ 1);
1578 int ren_src_was_dirty
= was_dirty(o
, rename
->path
);
1579 char *add_name
= unique_path(o
, rename
->path
, other_branch
);
1580 if (update_file(o
, 0, &add
->oid
, add
->mode
, add_name
))
1583 if (ren_src_was_dirty
) {
1584 output(o
, 1, _("Refusing to lose dirty file at %s"),
1588 * Because the double negatives somehow keep confusing me...
1589 * 1) update_wd iff !ren_src_was_dirty.
1590 * 2) no_wd iff !update_wd
1591 * 3) so, no_wd == !!ren_src_was_dirty == ren_src_was_dirty
1593 remove_file(o
, 0, rename
->path
, ren_src_was_dirty
);
1594 dst_name
= unique_path(o
, rename
->path
, cur_branch
);
1596 if (dir_in_way(rename
->path
, !o
->call_depth
, 0)) {
1597 dst_name
= unique_path(o
, rename
->path
, cur_branch
);
1598 output(o
, 1, _("%s is a directory in %s adding as %s instead"),
1599 rename
->path
, other_branch
, dst_name
);
1600 } else if (!o
->call_depth
&&
1601 would_lose_untracked(rename
->path
)) {
1602 dst_name
= unique_path(o
, rename
->path
, cur_branch
);
1603 output(o
, 1, _("Refusing to lose untracked file at %s; "
1604 "adding as %s instead"),
1605 rename
->path
, dst_name
);
1608 if ((ret
= update_file(o
, 0, &rename
->oid
, rename
->mode
, dst_name
)))
1609 ; /* fall through, do allow dst_name to be released */
1610 else if (stage
== 2)
1611 ret
= update_stages(o
, rename
->path
, NULL
, rename
, add
);
1613 ret
= update_stages(o
, rename
->path
, NULL
, add
, rename
);
1615 if (dst_name
!= rename
->path
)
1621 static int conflict_rename_rename_1to2(struct merge_options
*o
,
1622 struct rename_conflict_info
*ci
)
1624 /* One file was renamed in both branches, but to different names. */
1625 struct diff_filespec
*one
= ci
->pair1
->one
;
1626 struct diff_filespec
*a
= ci
->pair1
->two
;
1627 struct diff_filespec
*b
= ci
->pair2
->two
;
1629 output(o
, 1, _("CONFLICT (rename/rename): "
1630 "Rename \"%s\"->\"%s\" in branch \"%s\" "
1631 "rename \"%s\"->\"%s\" in \"%s\"%s"),
1632 one
->path
, a
->path
, ci
->branch1
,
1633 one
->path
, b
->path
, ci
->branch2
,
1634 o
->call_depth
? _(" (left unresolved)") : "");
1635 if (o
->call_depth
) {
1636 struct merge_file_info mfi
;
1637 struct diff_filespec other
;
1638 struct diff_filespec
*add
;
1639 if (merge_file_one(o
, one
->path
,
1640 &one
->oid
, one
->mode
,
1643 ci
->branch1
, ci
->branch2
, &mfi
))
1647 * FIXME: For rename/add-source conflicts (if we could detect
1648 * such), this is wrong. We should instead find a unique
1649 * pathname and then either rename the add-source file to that
1650 * unique path, or use that unique path instead of src here.
1652 if (update_file(o
, 0, &mfi
.oid
, mfi
.mode
, one
->path
))
1656 * Above, we put the merged content at the merge-base's
1657 * path. Now we usually need to delete both a->path and
1658 * b->path. However, the rename on each side of the merge
1659 * could also be involved in a rename/add conflict. In
1660 * such cases, we should keep the added file around,
1661 * resolving the conflict at that path in its favor.
1663 add
= filespec_from_entry(&other
, ci
->dst_entry1
, 2 ^ 1);
1665 if (update_file(o
, 0, &add
->oid
, add
->mode
, a
->path
))
1669 remove_file_from_cache(a
->path
);
1670 add
= filespec_from_entry(&other
, ci
->dst_entry2
, 3 ^ 1);
1672 if (update_file(o
, 0, &add
->oid
, add
->mode
, b
->path
))
1676 remove_file_from_cache(b
->path
);
1677 } else if (handle_file(o
, a
, 2, ci
) || handle_file(o
, b
, 3, ci
))
1683 static int conflict_rename_rename_2to1(struct merge_options
*o
,
1684 struct rename_conflict_info
*ci
)
1686 /* Two files, a & b, were renamed to the same thing, c. */
1687 struct diff_filespec
*a
= ci
->pair1
->one
;
1688 struct diff_filespec
*b
= ci
->pair2
->one
;
1689 struct diff_filespec
*c1
= ci
->pair1
->two
;
1690 struct diff_filespec
*c2
= ci
->pair2
->two
;
1691 char *path
= c1
->path
; /* == c2->path */
1692 char *path_side_1_desc
;
1693 char *path_side_2_desc
;
1694 struct merge_file_info mfi_c1
;
1695 struct merge_file_info mfi_c2
;
1698 output(o
, 1, _("CONFLICT (rename/rename): "
1699 "Rename %s->%s in %s. "
1700 "Rename %s->%s in %s"),
1701 a
->path
, c1
->path
, ci
->branch1
,
1702 b
->path
, c2
->path
, ci
->branch2
);
1704 remove_file(o
, 1, a
->path
, o
->call_depth
|| would_lose_untracked(a
->path
));
1705 remove_file(o
, 1, b
->path
, o
->call_depth
|| would_lose_untracked(b
->path
));
1707 path_side_1_desc
= xstrfmt("%s (was %s)", path
, a
->path
);
1708 path_side_2_desc
= xstrfmt("%s (was %s)", path
, b
->path
);
1709 if (merge_file_special_markers(o
, a
, c1
, &ci
->ren1_other
,
1711 o
->branch1
, c1
->path
,
1712 o
->branch2
, ci
->ren1_other
.path
, &mfi_c1
) ||
1713 merge_file_special_markers(o
, b
, &ci
->ren2_other
, c2
,
1715 o
->branch1
, ci
->ren2_other
.path
,
1716 o
->branch2
, c2
->path
, &mfi_c2
))
1718 free(path_side_1_desc
);
1719 free(path_side_2_desc
);
1721 if (o
->call_depth
) {
1723 * If mfi_c1.clean && mfi_c2.clean, then it might make
1724 * sense to do a two-way merge of those results. But, I
1725 * think in all cases, it makes sense to have the virtual
1726 * merge base just undo the renames; they can be detected
1727 * again later for the non-recursive merge.
1729 remove_file(o
, 0, path
, 0);
1730 ret
= update_file(o
, 0, &mfi_c1
.oid
, mfi_c1
.mode
, a
->path
);
1732 ret
= update_file(o
, 0, &mfi_c2
.oid
, mfi_c2
.mode
,
1735 char *new_path1
= unique_path(o
, path
, ci
->branch1
);
1736 char *new_path2
= unique_path(o
, path
, ci
->branch2
);
1737 output(o
, 1, _("Renaming %s to %s and %s to %s instead"),
1738 a
->path
, new_path1
, b
->path
, new_path2
);
1739 if (was_dirty(o
, path
))
1740 output(o
, 1, _("Refusing to lose dirty file at %s"),
1742 else if (would_lose_untracked(path
))
1744 * Only way we get here is if both renames were from
1745 * a directory rename AND user had an untracked file
1746 * at the location where both files end up after the
1747 * two directory renames. See testcase 10d of t6043.
1749 output(o
, 1, _("Refusing to lose untracked file at "
1750 "%s, even though it's in the way."),
1753 remove_file(o
, 0, path
, 0);
1754 ret
= update_file(o
, 0, &mfi_c1
.oid
, mfi_c1
.mode
, new_path1
);
1756 ret
= update_file(o
, 0, &mfi_c2
.oid
, mfi_c2
.mode
,
1759 * unpack_trees() actually populates the index for us for
1760 * "normal" rename/rename(2to1) situtations so that the
1761 * correct entries are at the higher stages, which would
1762 * make the call below to update_stages_for_stage_data
1763 * unnecessary. However, if either of the renames came
1764 * from a directory rename, then unpack_trees() will not
1765 * have gotten the right data loaded into the index, so we
1766 * need to do so now. (While it'd be tempting to move this
1767 * call to update_stages_for_stage_data() to
1768 * apply_directory_rename_modifications(), that would break
1769 * our intermediate calls to would_lose_untracked() since
1770 * those rely on the current in-memory index. See also the
1771 * big "NOTE" in update_stages()).
1773 if (update_stages_for_stage_data(o
, path
, ci
->dst_entry1
))
1784 * Get the diff_filepairs changed between o_tree and tree.
1786 static struct diff_queue_struct
*get_diffpairs(struct merge_options
*o
,
1787 struct tree
*o_tree
,
1790 struct diff_queue_struct
*ret
;
1791 struct diff_options opts
;
1794 opts
.flags
.recursive
= 1;
1795 opts
.flags
.rename_empty
= 0;
1796 opts
.detect_rename
= merge_detect_rename(o
);
1798 * We do not have logic to handle the detection of copies. In
1799 * fact, it may not even make sense to add such logic: would we
1800 * really want a change to a base file to be propagated through
1801 * multiple other files by a merge?
1803 if (opts
.detect_rename
> DIFF_DETECT_RENAME
)
1804 opts
.detect_rename
= DIFF_DETECT_RENAME
;
1805 opts
.rename_limit
= o
->merge_rename_limit
>= 0 ? o
->merge_rename_limit
:
1806 o
->diff_rename_limit
>= 0 ? o
->diff_rename_limit
:
1808 opts
.rename_score
= o
->rename_score
;
1809 opts
.show_rename_progress
= o
->show_rename_progress
;
1810 opts
.output_format
= DIFF_FORMAT_NO_OUTPUT
;
1811 diff_setup_done(&opts
);
1812 diff_tree_oid(&o_tree
->object
.oid
, &tree
->object
.oid
, "", &opts
);
1813 diffcore_std(&opts
);
1814 if (opts
.needed_rename_limit
> o
->needed_rename_limit
)
1815 o
->needed_rename_limit
= opts
.needed_rename_limit
;
1817 ret
= xmalloc(sizeof(*ret
));
1818 *ret
= diff_queued_diff
;
1820 opts
.output_format
= DIFF_FORMAT_NO_OUTPUT
;
1821 diff_queued_diff
.nr
= 0;
1822 diff_queued_diff
.queue
= NULL
;
1827 static int tree_has_path(struct tree
*tree
, const char *path
)
1829 struct object_id hashy
;
1830 unsigned int mode_o
;
1832 return !get_tree_entry(&tree
->object
.oid
, path
,
1837 * Return a new string that replaces the beginning portion (which matches
1838 * entry->dir), with entry->new_dir. In perl-speak:
1839 * new_path_name = (old_path =~ s/entry->dir/entry->new_dir/);
1841 * Caller must ensure that old_path starts with entry->dir + '/'.
1843 static char *apply_dir_rename(struct dir_rename_entry
*entry
,
1844 const char *old_path
)
1846 struct strbuf new_path
= STRBUF_INIT
;
1849 if (entry
->non_unique_new_dir
)
1852 oldlen
= strlen(entry
->dir
);
1853 newlen
= entry
->new_dir
.len
+ (strlen(old_path
) - oldlen
) + 1;
1854 strbuf_grow(&new_path
, newlen
);
1855 strbuf_addbuf(&new_path
, &entry
->new_dir
);
1856 strbuf_addstr(&new_path
, &old_path
[oldlen
]);
1858 return strbuf_detach(&new_path
, NULL
);
1861 static void get_renamed_dir_portion(const char *old_path
, const char *new_path
,
1862 char **old_dir
, char **new_dir
)
1864 char *end_of_old
, *end_of_new
;
1865 int old_len
, new_len
;
1872 * "a/b/c/d/e/foo.c" -> "a/b/some/thing/else/e/foo.c"
1873 * the "e/foo.c" part is the same, we just want to know that
1874 * "a/b/c/d" was renamed to "a/b/some/thing/else"
1875 * so, for this example, this function returns "a/b/c/d" in
1876 * *old_dir and "a/b/some/thing/else" in *new_dir.
1878 * Also, if the basename of the file changed, we don't care. We
1879 * want to know which portion of the directory, if any, changed.
1881 end_of_old
= strrchr(old_path
, '/');
1882 end_of_new
= strrchr(new_path
, '/');
1884 if (end_of_old
== NULL
|| end_of_new
== NULL
)
1886 while (*--end_of_new
== *--end_of_old
&&
1887 end_of_old
!= old_path
&&
1888 end_of_new
!= new_path
)
1889 ; /* Do nothing; all in the while loop */
1891 * We've found the first non-matching character in the directory
1892 * paths. That means the current directory we were comparing
1893 * represents the rename. Move end_of_old and end_of_new back
1894 * to the full directory name.
1896 if (*end_of_old
== '/')
1898 if (*end_of_old
!= '/')
1900 end_of_old
= strchr(end_of_old
, '/');
1901 end_of_new
= strchr(end_of_new
, '/');
1904 * It may have been the case that old_path and new_path were the same
1905 * directory all along. Don't claim a rename if they're the same.
1907 old_len
= end_of_old
- old_path
;
1908 new_len
= end_of_new
- new_path
;
1910 if (old_len
!= new_len
|| strncmp(old_path
, new_path
, old_len
)) {
1911 *old_dir
= xstrndup(old_path
, old_len
);
1912 *new_dir
= xstrndup(new_path
, new_len
);
1916 static void remove_hashmap_entries(struct hashmap
*dir_renames
,
1917 struct string_list
*items_to_remove
)
1920 struct dir_rename_entry
*entry
;
1922 for (i
= 0; i
< items_to_remove
->nr
; i
++) {
1923 entry
= items_to_remove
->items
[i
].util
;
1924 hashmap_remove(dir_renames
, entry
, NULL
);
1926 string_list_clear(items_to_remove
, 0);
1930 * See if there is a directory rename for path, and if there are any file
1931 * level conflicts for the renamed location. If there is a rename and
1932 * there are no conflicts, return the new name. Otherwise, return NULL.
1934 static char *handle_path_level_conflicts(struct merge_options
*o
,
1936 struct dir_rename_entry
*entry
,
1937 struct hashmap
*collisions
,
1940 char *new_path
= NULL
;
1941 struct collision_entry
*collision_ent
;
1943 struct strbuf collision_paths
= STRBUF_INIT
;
1946 * entry has the mapping of old directory name to new directory name
1947 * that we want to apply to path.
1949 new_path
= apply_dir_rename(entry
, path
);
1952 /* This should only happen when entry->non_unique_new_dir set */
1953 if (!entry
->non_unique_new_dir
)
1954 BUG("entry->non_unqiue_dir not set and !new_path");
1955 output(o
, 1, _("CONFLICT (directory rename split): "
1956 "Unclear where to place %s because directory "
1957 "%s was renamed to multiple other directories, "
1958 "with no destination getting a majority of the "
1966 * The caller needs to have ensured that it has pre-populated
1967 * collisions with all paths that map to new_path. Do a quick check
1968 * to ensure that's the case.
1970 collision_ent
= collision_find_entry(collisions
, new_path
);
1971 if (collision_ent
== NULL
)
1972 BUG("collision_ent is NULL");
1975 * Check for one-sided add/add/.../add conflicts, i.e.
1976 * where implicit renames from the other side doing
1977 * directory rename(s) can affect this side of history
1978 * to put multiple paths into the same location. Warn
1979 * and bail on directory renames for such paths.
1981 if (collision_ent
->reported_already
) {
1983 } else if (tree_has_path(tree
, new_path
)) {
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): Existing "
1988 "file/dir at %s in the way of implicit "
1989 "directory rename(s) putting the following "
1990 "path(s) there: %s."),
1991 new_path
, collision_paths
.buf
);
1993 } else if (collision_ent
->source_files
.nr
> 1) {
1994 collision_ent
->reported_already
= 1;
1995 strbuf_add_separated_string_list(&collision_paths
, ", ",
1996 &collision_ent
->source_files
);
1997 output(o
, 1, _("CONFLICT (implicit dir rename): Cannot map "
1998 "more than one path to %s; implicit directory "
1999 "renames tried to put these paths there: %s"),
2000 new_path
, collision_paths
.buf
);
2004 /* Free memory we no longer need */
2005 strbuf_release(&collision_paths
);
2006 if (!clean
&& new_path
) {
2015 * There are a couple things we want to do at the directory level:
2016 * 1. Check for both sides renaming to the same thing, in order to avoid
2017 * implicit renaming of files that should be left in place. (See
2018 * testcase 6b in t6043 for details.)
2019 * 2. Prune directory renames if there are still files left in the
2020 * the original directory. These represent a partial directory rename,
2021 * i.e. a rename where only some of the files within the directory
2022 * were renamed elsewhere. (Technically, this could be done earlier
2023 * in get_directory_renames(), except that would prevent us from
2024 * doing the previous check and thus failing testcase 6b.)
2025 * 3. Check for rename/rename(1to2) conflicts (at the directory level).
2026 * In the future, we could potentially record this info as well and
2027 * omit reporting rename/rename(1to2) conflicts for each path within
2028 * the affected directories, thus cleaning up the merge output.
2029 * NOTE: We do NOT check for rename/rename(2to1) conflicts at the
2030 * directory level, because merging directories is fine. If it
2031 * causes conflicts for files within those merged directories, then
2032 * that should be detected at the individual path level.
2034 static void handle_directory_level_conflicts(struct merge_options
*o
,
2035 struct hashmap
*dir_re_head
,
2037 struct hashmap
*dir_re_merge
,
2040 struct hashmap_iter iter
;
2041 struct dir_rename_entry
*head_ent
;
2042 struct dir_rename_entry
*merge_ent
;
2044 struct string_list remove_from_head
= STRING_LIST_INIT_NODUP
;
2045 struct string_list remove_from_merge
= STRING_LIST_INIT_NODUP
;
2047 hashmap_iter_init(dir_re_head
, &iter
);
2048 while ((head_ent
= hashmap_iter_next(&iter
))) {
2049 merge_ent
= dir_rename_find_entry(dir_re_merge
, head_ent
->dir
);
2051 !head_ent
->non_unique_new_dir
&&
2052 !merge_ent
->non_unique_new_dir
&&
2053 !strbuf_cmp(&head_ent
->new_dir
, &merge_ent
->new_dir
)) {
2054 /* 1. Renamed identically; remove it from both sides */
2055 string_list_append(&remove_from_head
,
2056 head_ent
->dir
)->util
= head_ent
;
2057 strbuf_release(&head_ent
->new_dir
);
2058 string_list_append(&remove_from_merge
,
2059 merge_ent
->dir
)->util
= merge_ent
;
2060 strbuf_release(&merge_ent
->new_dir
);
2061 } else if (tree_has_path(head
, head_ent
->dir
)) {
2062 /* 2. This wasn't a directory rename after all */
2063 string_list_append(&remove_from_head
,
2064 head_ent
->dir
)->util
= head_ent
;
2065 strbuf_release(&head_ent
->new_dir
);
2069 remove_hashmap_entries(dir_re_head
, &remove_from_head
);
2070 remove_hashmap_entries(dir_re_merge
, &remove_from_merge
);
2072 hashmap_iter_init(dir_re_merge
, &iter
);
2073 while ((merge_ent
= hashmap_iter_next(&iter
))) {
2074 head_ent
= dir_rename_find_entry(dir_re_head
, merge_ent
->dir
);
2075 if (tree_has_path(merge
, merge_ent
->dir
)) {
2076 /* 2. This wasn't a directory rename after all */
2077 string_list_append(&remove_from_merge
,
2078 merge_ent
->dir
)->util
= merge_ent
;
2079 } else if (head_ent
&&
2080 !head_ent
->non_unique_new_dir
&&
2081 !merge_ent
->non_unique_new_dir
) {
2082 /* 3. rename/rename(1to2) */
2084 * We can assume it's not rename/rename(1to1) because
2085 * that was case (1), already checked above. So we
2086 * know that head_ent->new_dir and merge_ent->new_dir
2087 * are different strings.
2089 output(o
, 1, _("CONFLICT (rename/rename): "
2090 "Rename directory %s->%s in %s. "
2091 "Rename directory %s->%s in %s"),
2092 head_ent
->dir
, head_ent
->new_dir
.buf
, o
->branch1
,
2093 head_ent
->dir
, merge_ent
->new_dir
.buf
, o
->branch2
);
2094 string_list_append(&remove_from_head
,
2095 head_ent
->dir
)->util
= head_ent
;
2096 strbuf_release(&head_ent
->new_dir
);
2097 string_list_append(&remove_from_merge
,
2098 merge_ent
->dir
)->util
= merge_ent
;
2099 strbuf_release(&merge_ent
->new_dir
);
2103 remove_hashmap_entries(dir_re_head
, &remove_from_head
);
2104 remove_hashmap_entries(dir_re_merge
, &remove_from_merge
);
2107 static struct hashmap
*get_directory_renames(struct diff_queue_struct
*pairs
,
2110 struct hashmap
*dir_renames
;
2111 struct hashmap_iter iter
;
2112 struct dir_rename_entry
*entry
;
2116 * Typically, we think of a directory rename as all files from a
2117 * certain directory being moved to a target directory. However,
2118 * what if someone first moved two files from the original
2119 * directory in one commit, and then renamed the directory
2120 * somewhere else in a later commit? At merge time, we just know
2121 * that files from the original directory went to two different
2122 * places, and that the bulk of them ended up in the same place.
2123 * We want each directory rename to represent where the bulk of the
2124 * files from that directory end up; this function exists to find
2125 * where the bulk of the files went.
2127 * The first loop below simply iterates through the list of file
2128 * renames, finding out how often each directory rename pair
2129 * possibility occurs.
2131 dir_renames
= xmalloc(sizeof(*dir_renames
));
2132 dir_rename_init(dir_renames
);
2133 for (i
= 0; i
< pairs
->nr
; ++i
) {
2134 struct string_list_item
*item
;
2136 struct diff_filepair
*pair
= pairs
->queue
[i
];
2137 char *old_dir
, *new_dir
;
2139 /* File not part of directory rename if it wasn't renamed */
2140 if (pair
->status
!= 'R')
2143 get_renamed_dir_portion(pair
->one
->path
, pair
->two
->path
,
2144 &old_dir
, &new_dir
);
2146 /* Directory didn't change at all; ignore this one. */
2149 entry
= dir_rename_find_entry(dir_renames
, old_dir
);
2151 entry
= xmalloc(sizeof(*entry
));
2152 dir_rename_entry_init(entry
, old_dir
);
2153 hashmap_put(dir_renames
, entry
);
2157 item
= string_list_lookup(&entry
->possible_new_dirs
, new_dir
);
2159 item
= string_list_insert(&entry
->possible_new_dirs
,
2161 item
->util
= xcalloc(1, sizeof(int));
2170 * For each directory with files moved out of it, we find out which
2171 * target directory received the most files so we can declare it to
2172 * be the "winning" target location for the directory rename. This
2173 * winner gets recorded in new_dir. If there is no winner
2174 * (multiple target directories received the same number of files),
2175 * we set non_unique_new_dir. Once we've determined the winner (or
2176 * that there is no winner), we no longer need possible_new_dirs.
2178 hashmap_iter_init(dir_renames
, &iter
);
2179 while ((entry
= hashmap_iter_next(&iter
))) {
2184 for (i
= 0; i
< entry
->possible_new_dirs
.nr
; i
++) {
2185 int *count
= entry
->possible_new_dirs
.items
[i
].util
;
2189 else if (*count
> max
) {
2191 best
= entry
->possible_new_dirs
.items
[i
].string
;
2195 entry
->non_unique_new_dir
= 1;
2197 assert(entry
->new_dir
.len
== 0);
2198 strbuf_addstr(&entry
->new_dir
, best
);
2201 * The relevant directory sub-portion of the original full
2202 * filepaths were xstrndup'ed before inserting into
2203 * possible_new_dirs, and instead of manually iterating the
2204 * list and free'ing each, just lie and tell
2205 * possible_new_dirs that it did the strdup'ing so that it
2206 * will free them for us.
2208 entry
->possible_new_dirs
.strdup_strings
= 1;
2209 string_list_clear(&entry
->possible_new_dirs
, 1);
2215 static struct dir_rename_entry
*check_dir_renamed(const char *path
,
2216 struct hashmap
*dir_renames
)
2218 char *temp
= xstrdup(path
);
2220 struct dir_rename_entry
*entry
= NULL
;;
2222 while ((end
= strrchr(temp
, '/'))) {
2224 entry
= dir_rename_find_entry(dir_renames
, temp
);
2232 static void compute_collisions(struct hashmap
*collisions
,
2233 struct hashmap
*dir_renames
,
2234 struct diff_queue_struct
*pairs
)
2239 * Multiple files can be mapped to the same path due to directory
2240 * renames done by the other side of history. Since that other
2241 * side of history could have merged multiple directories into one,
2242 * if our side of history added the same file basename to each of
2243 * those directories, then all N of them would get implicitly
2244 * renamed by the directory rename detection into the same path,
2245 * and we'd get an add/add/.../add conflict, and all those adds
2246 * from *this* side of history. This is not representable in the
2247 * index, and users aren't going to easily be able to make sense of
2248 * it. So we need to provide a good warning about what's
2249 * happening, and fall back to no-directory-rename detection
2250 * behavior for those paths.
2252 * See testcases 9e and all of section 5 from t6043 for examples.
2254 collision_init(collisions
);
2256 for (i
= 0; i
< pairs
->nr
; ++i
) {
2257 struct dir_rename_entry
*dir_rename_ent
;
2258 struct collision_entry
*collision_ent
;
2260 struct diff_filepair
*pair
= pairs
->queue
[i
];
2262 if (pair
->status
!= 'A' && pair
->status
!= 'R')
2264 dir_rename_ent
= check_dir_renamed(pair
->two
->path
,
2266 if (!dir_rename_ent
)
2269 new_path
= apply_dir_rename(dir_rename_ent
, pair
->two
->path
);
2272 * dir_rename_ent->non_unique_new_path is true, which
2273 * means there is no directory rename for us to use,
2274 * which means it won't cause us any additional
2278 collision_ent
= collision_find_entry(collisions
, new_path
);
2279 if (!collision_ent
) {
2280 collision_ent
= xcalloc(1,
2281 sizeof(struct collision_entry
));
2282 hashmap_entry_init(collision_ent
, strhash(new_path
));
2283 hashmap_put(collisions
, collision_ent
);
2284 collision_ent
->target_file
= new_path
;
2288 string_list_insert(&collision_ent
->source_files
,
2293 static char *check_for_directory_rename(struct merge_options
*o
,
2296 struct hashmap
*dir_renames
,
2297 struct hashmap
*dir_rename_exclusions
,
2298 struct hashmap
*collisions
,
2301 char *new_path
= NULL
;
2302 struct dir_rename_entry
*entry
= check_dir_renamed(path
, dir_renames
);
2303 struct dir_rename_entry
*oentry
= NULL
;
2309 * This next part is a little weird. We do not want to do an
2310 * implicit rename into a directory we renamed on our side, because
2311 * that will result in a spurious rename/rename(1to2) conflict. An
2313 * Base commit: dumbdir/afile, otherdir/bfile
2314 * Side 1: smrtdir/afile, otherdir/bfile
2315 * Side 2: dumbdir/afile, dumbdir/bfile
2316 * Here, while working on Side 1, we could notice that otherdir was
2317 * renamed/merged to dumbdir, and change the diff_filepair for
2318 * otherdir/bfile into a rename into dumbdir/bfile. However, Side
2319 * 2 will notice the rename from dumbdir to smrtdir, and do the
2320 * transitive rename to move it from dumbdir/bfile to
2321 * smrtdir/bfile. That gives us bfile in dumbdir vs being in
2322 * smrtdir, a rename/rename(1to2) conflict. We really just want
2323 * the file to end up in smrtdir. And the way to achieve that is
2324 * to not let Side1 do the rename to dumbdir, since we know that is
2325 * the source of one of our directory renames.
2327 * That's why oentry and dir_rename_exclusions is here.
2329 * As it turns out, this also prevents N-way transient rename
2330 * confusion; See testcases 9c and 9d of t6043.
2332 oentry
= dir_rename_find_entry(dir_rename_exclusions
, entry
->new_dir
.buf
);
2334 output(o
, 1, _("WARNING: Avoiding applying %s -> %s rename "
2335 "to %s, because %s itself was renamed."),
2336 entry
->dir
, entry
->new_dir
.buf
, path
, entry
->new_dir
.buf
);
2338 new_path
= handle_path_level_conflicts(o
, path
, entry
,
2340 *clean_merge
&= (new_path
!= NULL
);
2346 static void apply_directory_rename_modifications(struct merge_options
*o
,
2347 struct diff_filepair
*pair
,
2351 struct tree
*o_tree
,
2352 struct tree
*a_tree
,
2353 struct tree
*b_tree
,
2354 struct string_list
*entries
,
2357 struct string_list_item
*item
;
2358 int stage
= (tree
== a_tree
? 2 : 3);
2362 * In all cases where we can do directory rename detection,
2363 * unpack_trees() will have read pair->two->path into the
2364 * index and the working copy. We need to remove it so that
2365 * we can instead place it at new_path. It is guaranteed to
2366 * not be untracked (unpack_trees() would have errored out
2367 * saying the file would have been overwritten), but it might
2370 update_wd
= !was_dirty(o
, pair
->two
->path
);
2372 output(o
, 1, _("Refusing to lose dirty file at %s"),
2374 remove_file(o
, 1, pair
->two
->path
, !update_wd
);
2376 /* Find or create a new re->dst_entry */
2377 item
= string_list_lookup(entries
, new_path
);
2380 * Since we're renaming on this side of history, and it's
2381 * due to a directory rename on the other side of history
2382 * (which we only allow when the directory in question no
2383 * longer exists on the other side of history), the
2384 * original entry for re->dst_entry is no longer
2387 re
->dst_entry
->processed
= 1;
2390 * ...because we'll be using this new one.
2392 re
->dst_entry
= item
->util
;
2395 * re->dst_entry is for the before-dir-rename path, and we
2396 * need it to hold information for the after-dir-rename
2397 * path. Before creating a new entry, we need to mark the
2398 * old one as unnecessary (...unless it is shared by
2399 * src_entry, i.e. this didn't use to be a rename, in which
2400 * case we can just allow the normal processing to happen
2403 if (pair
->status
== 'R')
2404 re
->dst_entry
->processed
= 1;
2406 re
->dst_entry
= insert_stage_data(new_path
,
2407 o_tree
, a_tree
, b_tree
,
2409 item
= string_list_insert(entries
, new_path
);
2410 item
->util
= re
->dst_entry
;
2414 * Update the stage_data with the information about the path we are
2415 * moving into place. That slot will be empty and available for us
2416 * to write to because of the collision checks in
2417 * handle_path_level_conflicts(). In other words,
2418 * re->dst_entry->stages[stage].oid will be the null_oid, so it's
2419 * open for us to write to.
2421 * It may be tempting to actually update the index at this point as
2422 * well, using update_stages_for_stage_data(), but as per the big
2423 * "NOTE" in update_stages(), doing so will modify the current
2424 * in-memory index which will break calls to would_lose_untracked()
2425 * that we need to make. Instead, we need to just make sure that
2426 * the various conflict_rename_*() functions update the index
2427 * explicitly rather than relying on unpack_trees() to have done it.
2429 get_tree_entry(&tree
->object
.oid
,
2431 &re
->dst_entry
->stages
[stage
].oid
,
2432 &re
->dst_entry
->stages
[stage
].mode
);
2434 /* Update pair status */
2435 if (pair
->status
== 'A') {
2437 * Recording rename information for this add makes it look
2438 * like a rename/delete conflict. Make sure we can
2439 * correctly handle this as an add that was moved to a new
2440 * directory instead of reporting a rename/delete conflict.
2442 re
->add_turned_into_rename
= 1;
2445 * We don't actually look at pair->status again, but it seems
2446 * pedagogically correct to adjust it.
2451 * Finally, record the new location.
2453 pair
->two
->path
= new_path
;
2457 * Get information of all renames which occurred in 'pairs', making use of
2458 * any implicit directory renames inferred from the other side of history.
2459 * We need the three trees in the merge ('o_tree', 'a_tree' and 'b_tree')
2460 * to be able to associate the correct cache entries with the rename
2461 * information; tree is always equal to either a_tree or b_tree.
2463 static struct string_list
*get_renames(struct merge_options
*o
,
2464 struct diff_queue_struct
*pairs
,
2465 struct hashmap
*dir_renames
,
2466 struct hashmap
*dir_rename_exclusions
,
2468 struct tree
*o_tree
,
2469 struct tree
*a_tree
,
2470 struct tree
*b_tree
,
2471 struct string_list
*entries
,
2475 struct hashmap collisions
;
2476 struct hashmap_iter iter
;
2477 struct collision_entry
*e
;
2478 struct string_list
*renames
;
2480 compute_collisions(&collisions
, dir_renames
, pairs
);
2481 renames
= xcalloc(1, sizeof(struct string_list
));
2483 for (i
= 0; i
< pairs
->nr
; ++i
) {
2484 struct string_list_item
*item
;
2486 struct diff_filepair
*pair
= pairs
->queue
[i
];
2487 char *new_path
; /* non-NULL only with directory renames */
2489 if (pair
->status
!= 'A' && pair
->status
!= 'R') {
2490 diff_free_filepair(pair
);
2493 new_path
= check_for_directory_rename(o
, pair
->two
->path
, tree
,
2495 dir_rename_exclusions
,
2498 if (pair
->status
!= 'R' && !new_path
) {
2499 diff_free_filepair(pair
);
2503 re
= xmalloc(sizeof(*re
));
2505 re
->add_turned_into_rename
= 0;
2507 item
= string_list_lookup(entries
, re
->pair
->one
->path
);
2509 re
->src_entry
= insert_stage_data(re
->pair
->one
->path
,
2510 o_tree
, a_tree
, b_tree
, entries
);
2512 re
->src_entry
= item
->util
;
2514 item
= string_list_lookup(entries
, re
->pair
->two
->path
);
2516 re
->dst_entry
= insert_stage_data(re
->pair
->two
->path
,
2517 o_tree
, a_tree
, b_tree
, entries
);
2519 re
->dst_entry
= item
->util
;
2520 item
= string_list_insert(renames
, pair
->one
->path
);
2523 apply_directory_rename_modifications(o
, pair
, new_path
,
2530 hashmap_iter_init(&collisions
, &iter
);
2531 while ((e
= hashmap_iter_next(&iter
))) {
2532 free(e
->target_file
);
2533 string_list_clear(&e
->source_files
, 0);
2535 hashmap_free(&collisions
, 1);
2539 static int process_renames(struct merge_options
*o
,
2540 struct string_list
*a_renames
,
2541 struct string_list
*b_renames
)
2543 int clean_merge
= 1, i
, j
;
2544 struct string_list a_by_dst
= STRING_LIST_INIT_NODUP
;
2545 struct string_list b_by_dst
= STRING_LIST_INIT_NODUP
;
2546 const struct rename
*sre
;
2548 for (i
= 0; i
< a_renames
->nr
; i
++) {
2549 sre
= a_renames
->items
[i
].util
;
2550 string_list_insert(&a_by_dst
, sre
->pair
->two
->path
)->util
2553 for (i
= 0; i
< b_renames
->nr
; i
++) {
2554 sre
= b_renames
->items
[i
].util
;
2555 string_list_insert(&b_by_dst
, sre
->pair
->two
->path
)->util
2559 for (i
= 0, j
= 0; i
< a_renames
->nr
|| j
< b_renames
->nr
;) {
2560 struct string_list
*renames1
, *renames2Dst
;
2561 struct rename
*ren1
= NULL
, *ren2
= NULL
;
2562 const char *branch1
, *branch2
;
2563 const char *ren1_src
, *ren1_dst
;
2564 struct string_list_item
*lookup
;
2566 if (i
>= a_renames
->nr
) {
2567 ren2
= b_renames
->items
[j
++].util
;
2568 } else if (j
>= b_renames
->nr
) {
2569 ren1
= a_renames
->items
[i
++].util
;
2571 int compare
= strcmp(a_renames
->items
[i
].string
,
2572 b_renames
->items
[j
].string
);
2574 ren1
= a_renames
->items
[i
++].util
;
2576 ren2
= b_renames
->items
[j
++].util
;
2579 /* TODO: refactor, so that 1/2 are not needed */
2581 renames1
= a_renames
;
2582 renames2Dst
= &b_by_dst
;
2583 branch1
= o
->branch1
;
2584 branch2
= o
->branch2
;
2586 renames1
= b_renames
;
2587 renames2Dst
= &a_by_dst
;
2588 branch1
= o
->branch2
;
2589 branch2
= o
->branch1
;
2593 if (ren1
->processed
)
2595 ren1
->processed
= 1;
2596 ren1
->dst_entry
->processed
= 1;
2597 /* BUG: We should only mark src_entry as processed if we
2598 * are not dealing with a rename + add-source case.
2600 ren1
->src_entry
->processed
= 1;
2602 ren1_src
= ren1
->pair
->one
->path
;
2603 ren1_dst
= ren1
->pair
->two
->path
;
2606 /* One file renamed on both sides */
2607 const char *ren2_src
= ren2
->pair
->one
->path
;
2608 const char *ren2_dst
= ren2
->pair
->two
->path
;
2609 enum rename_type rename_type
;
2610 if (strcmp(ren1_src
, ren2_src
) != 0)
2611 BUG("ren1_src != ren2_src");
2612 ren2
->dst_entry
->processed
= 1;
2613 ren2
->processed
= 1;
2614 if (strcmp(ren1_dst
, ren2_dst
) != 0) {
2615 rename_type
= RENAME_ONE_FILE_TO_TWO
;
2618 rename_type
= RENAME_ONE_FILE_TO_ONE
;
2619 /* BUG: We should only remove ren1_src in
2620 * the base stage (think of rename +
2621 * add-source cases).
2623 remove_file(o
, 1, ren1_src
, 1);
2624 update_entry(ren1
->dst_entry
,
2629 setup_rename_conflict_info(rename_type
,
2639 } else if ((lookup
= string_list_lookup(renames2Dst
, ren1_dst
))) {
2640 /* Two different files renamed to the same thing */
2642 ren2
= lookup
->util
;
2643 ren2_dst
= ren2
->pair
->two
->path
;
2644 if (strcmp(ren1_dst
, ren2_dst
) != 0)
2645 BUG("ren1_dst != ren2_dst");
2648 ren2
->processed
= 1;
2650 * BUG: We should only mark src_entry as processed
2651 * if we are not dealing with a rename + add-source
2654 ren2
->src_entry
->processed
= 1;
2656 setup_rename_conflict_info(RENAME_TWO_FILES_TO_ONE
,
2668 /* Renamed in 1, maybe changed in 2 */
2669 /* we only use sha1 and mode of these */
2670 struct diff_filespec src_other
, dst_other
;
2674 * unpack_trees loads entries from common-commit
2675 * into stage 1, from head-commit into stage 2, and
2676 * from merge-commit into stage 3. We keep track
2677 * of which side corresponds to the rename.
2679 int renamed_stage
= a_renames
== renames1
? 2 : 3;
2680 int other_stage
= a_renames
== renames1
? 3 : 2;
2682 /* BUG: We should only remove ren1_src in the base
2683 * stage and in other_stage (think of rename +
2686 remove_file(o
, 1, ren1_src
,
2687 renamed_stage
== 2 || !was_tracked(o
, ren1_src
));
2689 oidcpy(&src_other
.oid
,
2690 &ren1
->src_entry
->stages
[other_stage
].oid
);
2691 src_other
.mode
= ren1
->src_entry
->stages
[other_stage
].mode
;
2692 oidcpy(&dst_other
.oid
,
2693 &ren1
->dst_entry
->stages
[other_stage
].oid
);
2694 dst_other
.mode
= ren1
->dst_entry
->stages
[other_stage
].mode
;
2697 if (oid_eq(&src_other
.oid
, &null_oid
) &&
2698 ren1
->add_turned_into_rename
) {
2699 setup_rename_conflict_info(RENAME_DIR
,
2709 } else if (oid_eq(&src_other
.oid
, &null_oid
)) {
2710 setup_rename_conflict_info(RENAME_DELETE
,
2720 } else if ((dst_other
.mode
== ren1
->pair
->two
->mode
) &&
2721 oid_eq(&dst_other
.oid
, &ren1
->pair
->two
->oid
)) {
2723 * Added file on the other side identical to
2724 * the file being renamed: clean merge.
2725 * Also, there is no need to overwrite the
2726 * file already in the working copy, so call
2727 * update_file_flags() instead of
2730 if (update_file_flags(o
,
2731 &ren1
->pair
->two
->oid
,
2732 ren1
->pair
->two
->mode
,
2734 1, /* update_cache */
2737 } else if (!oid_eq(&dst_other
.oid
, &null_oid
)) {
2740 output(o
, 1, _("CONFLICT (rename/add): Rename %s->%s in %s. "
2742 ren1_src
, ren1_dst
, branch1
,
2744 if (o
->call_depth
) {
2745 struct merge_file_info mfi
;
2746 if (merge_file_one(o
, ren1_dst
, &null_oid
, 0,
2747 &ren1
->pair
->two
->oid
,
2748 ren1
->pair
->two
->mode
,
2751 branch1
, branch2
, &mfi
)) {
2753 goto cleanup_and_return
;
2755 output(o
, 1, _("Adding merged %s"), ren1_dst
);
2756 if (update_file(o
, 0, &mfi
.oid
,
2757 mfi
.mode
, ren1_dst
))
2761 char *new_path
= unique_path(o
, ren1_dst
, branch2
);
2762 output(o
, 1, _("Adding as %s instead"), new_path
);
2763 if (update_file(o
, 0, &dst_other
.oid
,
2764 dst_other
.mode
, new_path
))
2771 if (clean_merge
< 0)
2772 goto cleanup_and_return
;
2774 struct diff_filespec
*one
, *a
, *b
;
2775 src_other
.path
= (char *)ren1_src
;
2777 one
= ren1
->pair
->one
;
2778 if (a_renames
== renames1
) {
2779 a
= ren1
->pair
->two
;
2782 b
= ren1
->pair
->two
;
2785 update_entry(ren1
->dst_entry
, one
, a
, b
);
2786 setup_rename_conflict_info(RENAME_NORMAL
,
2800 string_list_clear(&a_by_dst
, 0);
2801 string_list_clear(&b_by_dst
, 0);
2806 struct rename_info
{
2807 struct string_list
*head_renames
;
2808 struct string_list
*merge_renames
;
2811 static void initial_cleanup_rename(struct diff_queue_struct
*pairs
,
2812 struct hashmap
*dir_renames
)
2814 struct hashmap_iter iter
;
2815 struct dir_rename_entry
*e
;
2817 hashmap_iter_init(dir_renames
, &iter
);
2818 while ((e
= hashmap_iter_next(&iter
))) {
2820 strbuf_release(&e
->new_dir
);
2821 /* possible_new_dirs already cleared in get_directory_renames */
2823 hashmap_free(dir_renames
, 1);
2830 static int handle_renames(struct merge_options
*o
,
2831 struct tree
*common
,
2834 struct string_list
*entries
,
2835 struct rename_info
*ri
)
2837 struct diff_queue_struct
*head_pairs
, *merge_pairs
;
2838 struct hashmap
*dir_re_head
, *dir_re_merge
;
2841 ri
->head_renames
= NULL
;
2842 ri
->merge_renames
= NULL
;
2844 if (!merge_detect_rename(o
))
2847 head_pairs
= get_diffpairs(o
, common
, head
);
2848 merge_pairs
= get_diffpairs(o
, common
, merge
);
2850 dir_re_head
= get_directory_renames(head_pairs
, head
);
2851 dir_re_merge
= get_directory_renames(merge_pairs
, merge
);
2853 handle_directory_level_conflicts(o
,
2855 dir_re_merge
, merge
);
2857 ri
->head_renames
= get_renames(o
, head_pairs
,
2858 dir_re_merge
, dir_re_head
, head
,
2859 common
, head
, merge
, entries
,
2863 ri
->merge_renames
= get_renames(o
, merge_pairs
,
2864 dir_re_head
, dir_re_merge
, merge
,
2865 common
, head
, merge
, entries
,
2869 clean
&= process_renames(o
, ri
->head_renames
, ri
->merge_renames
);
2873 * Some cleanup is deferred until cleanup_renames() because the
2874 * data structures are still needed and referenced in
2875 * process_entry(). But there are a few things we can free now.
2877 initial_cleanup_rename(head_pairs
, dir_re_head
);
2878 initial_cleanup_rename(merge_pairs
, dir_re_merge
);
2883 static void final_cleanup_rename(struct string_list
*rename
)
2885 const struct rename
*re
;
2891 for (i
= 0; i
< rename
->nr
; i
++) {
2892 re
= rename
->items
[i
].util
;
2893 diff_free_filepair(re
->pair
);
2895 string_list_clear(rename
, 1);
2899 static void final_cleanup_renames(struct rename_info
*re_info
)
2901 final_cleanup_rename(re_info
->head_renames
);
2902 final_cleanup_rename(re_info
->merge_renames
);
2905 static struct object_id
*stage_oid(const struct object_id
*oid
, unsigned mode
)
2907 return (is_null_oid(oid
) || mode
== 0) ? NULL
: (struct object_id
*)oid
;
2910 static int read_oid_strbuf(struct merge_options
*o
,
2911 const struct object_id
*oid
, struct strbuf
*dst
)
2914 enum object_type type
;
2916 buf
= read_object_file(oid
, &type
, &size
);
2918 return err(o
, _("cannot read object %s"), oid_to_hex(oid
));
2919 if (type
!= OBJ_BLOB
) {
2921 return err(o
, _("object %s is not a blob"), oid_to_hex(oid
));
2923 strbuf_attach(dst
, buf
, size
, size
+ 1);
2927 static int blob_unchanged(struct merge_options
*opt
,
2928 const struct object_id
*o_oid
,
2930 const struct object_id
*a_oid
,
2932 int renormalize
, const char *path
)
2934 struct strbuf o
= STRBUF_INIT
;
2935 struct strbuf a
= STRBUF_INIT
;
2936 int ret
= 0; /* assume changed for safety */
2938 if (a_mode
!= o_mode
)
2940 if (oid_eq(o_oid
, a_oid
))
2945 assert(o_oid
&& a_oid
);
2946 if (read_oid_strbuf(opt
, o_oid
, &o
) || read_oid_strbuf(opt
, a_oid
, &a
))
2949 * Note: binary | is used so that both renormalizations are
2950 * performed. Comparison can be skipped if both files are
2951 * unchanged since their sha1s have already been compared.
2953 if (renormalize_buffer(&the_index
, path
, o
.buf
, o
.len
, &o
) |
2954 renormalize_buffer(&the_index
, path
, a
.buf
, a
.len
, &a
))
2955 ret
= (o
.len
== a
.len
&& !memcmp(o
.buf
, a
.buf
, o
.len
));
2963 static int handle_modify_delete(struct merge_options
*o
,
2965 struct object_id
*o_oid
, int o_mode
,
2966 struct object_id
*a_oid
, int a_mode
,
2967 struct object_id
*b_oid
, int b_mode
)
2969 const char *modify_branch
, *delete_branch
;
2970 struct object_id
*changed_oid
;
2974 modify_branch
= o
->branch1
;
2975 delete_branch
= o
->branch2
;
2976 changed_oid
= a_oid
;
2977 changed_mode
= a_mode
;
2979 modify_branch
= o
->branch2
;
2980 delete_branch
= o
->branch1
;
2981 changed_oid
= b_oid
;
2982 changed_mode
= b_mode
;
2985 return handle_change_delete(o
,
2988 changed_oid
, changed_mode
,
2989 modify_branch
, delete_branch
,
2990 _("modify"), _("modified"));
2993 static int merge_content(struct merge_options
*o
,
2996 struct object_id
*o_oid
, int o_mode
,
2997 struct object_id
*a_oid
, int a_mode
,
2998 struct object_id
*b_oid
, int b_mode
,
2999 struct rename_conflict_info
*rename_conflict_info
)
3001 const char *reason
= _("content");
3002 const char *path1
= NULL
, *path2
= NULL
;
3003 struct merge_file_info mfi
;
3004 struct diff_filespec one
, a
, b
;
3005 unsigned df_conflict_remains
= 0;
3008 reason
= _("add/add");
3009 o_oid
= (struct object_id
*)&null_oid
;
3011 one
.path
= a
.path
= b
.path
= (char *)path
;
3012 oidcpy(&one
.oid
, o_oid
);
3014 oidcpy(&a
.oid
, a_oid
);
3016 oidcpy(&b
.oid
, b_oid
);
3019 if (rename_conflict_info
) {
3020 struct diff_filepair
*pair1
= rename_conflict_info
->pair1
;
3022 path1
= (o
->branch1
== rename_conflict_info
->branch1
) ?
3023 pair1
->two
->path
: pair1
->one
->path
;
3024 /* If rename_conflict_info->pair2 != NULL, we are in
3025 * RENAME_ONE_FILE_TO_ONE case. Otherwise, we have a
3028 path2
= (rename_conflict_info
->pair2
||
3029 o
->branch2
== rename_conflict_info
->branch1
) ?
3030 pair1
->two
->path
: pair1
->one
->path
;
3032 if (dir_in_way(path
, !o
->call_depth
,
3033 S_ISGITLINK(pair1
->two
->mode
)))
3034 df_conflict_remains
= 1;
3036 if (merge_file_special_markers(o
, &one
, &a
, &b
, path
,
3038 o
->branch2
, path2
, &mfi
))
3042 * We can skip updating the working tree file iff:
3043 * a) The merge is clean
3044 * b) The merge matches what was in HEAD (content, mode, pathname)
3045 * c) The target path is usable (i.e. not involved in D/F conflict)
3048 was_tracked_and_matches(o
, path
, &mfi
.oid
, mfi
.mode
) &&
3049 !df_conflict_remains
) {
3050 output(o
, 3, _("Skipped %s (merged same as existing)"), path
);
3051 if (add_cacheinfo(o
, mfi
.mode
, &mfi
.oid
, path
,
3052 0, (!o
->call_depth
&& !is_dirty
), 0))
3058 if (S_ISGITLINK(mfi
.mode
))
3059 reason
= _("submodule");
3060 output(o
, 1, _("CONFLICT (%s): Merge conflict in %s"),
3062 if (rename_conflict_info
&& !df_conflict_remains
)
3063 if (update_stages(o
, path
, &one
, &a
, &b
))
3067 if (df_conflict_remains
|| is_dirty
) {
3069 if (o
->call_depth
) {
3070 remove_file_from_cache(path
);
3073 if (update_stages(o
, path
, &one
, &a
, &b
))
3076 int file_from_stage2
= was_tracked(o
, path
);
3077 struct diff_filespec merged
;
3078 oidcpy(&merged
.oid
, &mfi
.oid
);
3079 merged
.mode
= mfi
.mode
;
3081 if (update_stages(o
, path
, NULL
,
3082 file_from_stage2
? &merged
: NULL
,
3083 file_from_stage2
? NULL
: &merged
))
3088 new_path
= unique_path(o
, path
, rename_conflict_info
->branch1
);
3090 output(o
, 1, _("Refusing to lose dirty file at %s"),
3093 output(o
, 1, _("Adding as %s instead"), new_path
);
3094 if (update_file(o
, 0, &mfi
.oid
, mfi
.mode
, new_path
)) {
3100 } else if (update_file(o
, mfi
.clean
, &mfi
.oid
, mfi
.mode
, path
))
3102 return !is_dirty
&& mfi
.clean
;
3105 static int conflict_rename_normal(struct merge_options
*o
,
3107 struct object_id
*o_oid
, unsigned int o_mode
,
3108 struct object_id
*a_oid
, unsigned int a_mode
,
3109 struct object_id
*b_oid
, unsigned int b_mode
,
3110 struct rename_conflict_info
*ci
)
3112 /* Merge the content and write it out */
3113 return merge_content(o
, path
, was_dirty(o
, path
),
3114 o_oid
, o_mode
, a_oid
, a_mode
, b_oid
, b_mode
,
3118 /* Per entry merge function */
3119 static int process_entry(struct merge_options
*o
,
3120 const char *path
, struct stage_data
*entry
)
3122 int clean_merge
= 1;
3123 int normalize
= o
->renormalize
;
3124 unsigned o_mode
= entry
->stages
[1].mode
;
3125 unsigned a_mode
= entry
->stages
[2].mode
;
3126 unsigned b_mode
= entry
->stages
[3].mode
;
3127 struct object_id
*o_oid
= stage_oid(&entry
->stages
[1].oid
, o_mode
);
3128 struct object_id
*a_oid
= stage_oid(&entry
->stages
[2].oid
, a_mode
);
3129 struct object_id
*b_oid
= stage_oid(&entry
->stages
[3].oid
, b_mode
);
3131 entry
->processed
= 1;
3132 if (entry
->rename_conflict_info
) {
3133 struct rename_conflict_info
*conflict_info
= entry
->rename_conflict_info
;
3134 switch (conflict_info
->rename_type
) {
3136 case RENAME_ONE_FILE_TO_ONE
:
3137 clean_merge
= conflict_rename_normal(o
,
3146 if (conflict_rename_dir(o
,
3147 conflict_info
->pair1
,
3148 conflict_info
->branch1
,
3149 conflict_info
->branch2
))
3154 if (conflict_rename_delete(o
,
3155 conflict_info
->pair1
,
3156 conflict_info
->branch1
,
3157 conflict_info
->branch2
))
3160 case RENAME_ONE_FILE_TO_TWO
:
3162 if (conflict_rename_rename_1to2(o
, conflict_info
))
3165 case RENAME_TWO_FILES_TO_ONE
:
3167 if (conflict_rename_rename_2to1(o
, conflict_info
))
3171 entry
->processed
= 0;
3174 } else if (o_oid
&& (!a_oid
|| !b_oid
)) {
3175 /* Case A: Deleted in one */
3176 if ((!a_oid
&& !b_oid
) ||
3177 (!b_oid
&& blob_unchanged(o
, o_oid
, o_mode
, a_oid
, a_mode
, normalize
, path
)) ||
3178 (!a_oid
&& blob_unchanged(o
, o_oid
, o_mode
, b_oid
, b_mode
, normalize
, path
))) {
3179 /* Deleted in both or deleted in one and
3180 * unchanged in the other */
3182 output(o
, 2, _("Removing %s"), path
);
3183 /* do not touch working file if it did not exist */
3184 remove_file(o
, 1, path
, !a_oid
);
3186 /* Modify/delete; deleted side may have put a directory in the way */
3188 if (handle_modify_delete(o
, path
, o_oid
, o_mode
,
3189 a_oid
, a_mode
, b_oid
, b_mode
))
3192 } else if ((!o_oid
&& a_oid
&& !b_oid
) ||
3193 (!o_oid
&& !a_oid
&& b_oid
)) {
3194 /* Case B: Added in one. */
3195 /* [nothing|directory] -> ([nothing|directory], file) */
3197 const char *add_branch
;
3198 const char *other_branch
;
3200 const struct object_id
*oid
;
3204 add_branch
= o
->branch1
;
3205 other_branch
= o
->branch2
;
3208 conf
= _("file/directory");
3210 add_branch
= o
->branch2
;
3211 other_branch
= o
->branch1
;
3214 conf
= _("directory/file");
3216 if (dir_in_way(path
,
3217 !o
->call_depth
&& !S_ISGITLINK(a_mode
),
3219 char *new_path
= unique_path(o
, path
, add_branch
);
3221 output(o
, 1, _("CONFLICT (%s): There is a directory with name %s in %s. "
3223 conf
, path
, other_branch
, path
, new_path
);
3224 if (update_file(o
, 0, oid
, mode
, new_path
))
3226 else if (o
->call_depth
)
3227 remove_file_from_cache(path
);
3230 output(o
, 2, _("Adding %s"), path
);
3231 /* do not overwrite file if already present */
3232 if (update_file_flags(o
, oid
, mode
, path
, 1, !a_oid
))
3235 } else if (a_oid
&& b_oid
) {
3236 /* Case C: Added in both (check for same permissions) and */
3237 /* case D: Modified in both, but differently. */
3238 int is_dirty
= 0; /* unpack_trees would have bailed if dirty */
3239 clean_merge
= merge_content(o
, path
, is_dirty
,
3240 o_oid
, o_mode
, a_oid
, a_mode
, b_oid
, b_mode
,
3242 } else if (!o_oid
&& !a_oid
&& !b_oid
) {
3244 * this entry was deleted altogether. a_mode == 0 means
3245 * we had that path and want to actively remove it.
3247 remove_file(o
, 1, path
, !a_mode
);
3249 BUG("fatal merge failure, shouldn't happen.");
3254 int merge_trees(struct merge_options
*o
,
3257 struct tree
*common
,
3258 struct tree
**result
)
3262 if (o
->subtree_shift
) {
3263 merge
= shift_tree_object(head
, merge
, o
->subtree_shift
);
3264 common
= shift_tree_object(head
, common
, o
->subtree_shift
);
3267 if (oid_eq(&common
->object
.oid
, &merge
->object
.oid
)) {
3268 struct strbuf sb
= STRBUF_INIT
;
3270 if (!o
->call_depth
&& index_has_changes(&sb
)) {
3271 err(o
, _("Dirty index: cannot merge (dirty: %s)"),
3275 output(o
, 0, _("Already up to date!"));
3280 code
= unpack_trees_start(o
, common
, head
, merge
);
3283 if (show(o
, 4) || o
->call_depth
)
3284 err(o
, _("merging of trees %s and %s failed"),
3285 oid_to_hex(&head
->object
.oid
),
3286 oid_to_hex(&merge
->object
.oid
));
3287 unpack_trees_finish(o
);
3291 if (unmerged_cache()) {
3292 struct string_list
*entries
;
3293 struct rename_info re_info
;
3296 * Only need the hashmap while processing entries, so
3297 * initialize it here and free it when we are done running
3298 * through the entries. Keeping it in the merge_options as
3299 * opposed to decaring a local hashmap is for convenience
3300 * so that we don't have to pass it to around.
3302 hashmap_init(&o
->current_file_dir_set
, path_hashmap_cmp
, NULL
, 512);
3303 get_files_dirs(o
, head
);
3304 get_files_dirs(o
, merge
);
3306 entries
= get_unmerged();
3307 clean
= handle_renames(o
, common
, head
, merge
, entries
,
3309 record_df_conflict_files(o
, entries
);
3312 for (i
= entries
->nr
-1; 0 <= i
; i
--) {
3313 const char *path
= entries
->items
[i
].string
;
3314 struct stage_data
*e
= entries
->items
[i
].util
;
3315 if (!e
->processed
) {
3316 int ret
= process_entry(o
, path
, e
);
3325 for (i
= 0; i
< entries
->nr
; i
++) {
3326 struct stage_data
*e
= entries
->items
[i
].util
;
3328 BUG("unprocessed path??? %s",
3329 entries
->items
[i
].string
);
3333 final_cleanup_renames(&re_info
);
3335 string_list_clear(entries
, 1);
3338 hashmap_free(&o
->current_file_dir_set
, 1);
3341 unpack_trees_finish(o
);
3348 unpack_trees_finish(o
);
3350 if (o
->call_depth
&& !(*result
= write_tree_from_memory(o
)))
3356 static struct commit_list
*reverse_commit_list(struct commit_list
*list
)
3358 struct commit_list
*next
= NULL
, *current
, *backup
;
3359 for (current
= list
; current
; current
= backup
) {
3360 backup
= current
->next
;
3361 current
->next
= next
;
3368 * Merge the commits h1 and h2, return the resulting virtual
3369 * commit object and a flag indicating the cleanness of the merge.
3371 int merge_recursive(struct merge_options
*o
,
3374 struct commit_list
*ca
,
3375 struct commit
**result
)
3377 struct commit_list
*iter
;
3378 struct commit
*merged_common_ancestors
;
3379 struct tree
*mrtree
;
3383 output(o
, 4, _("Merging:"));
3384 output_commit_title(o
, h1
);
3385 output_commit_title(o
, h2
);
3389 ca
= get_merge_bases(h1
, h2
);
3390 ca
= reverse_commit_list(ca
);
3394 unsigned cnt
= commit_list_count(ca
);
3396 output(o
, 5, Q_("found %u common ancestor:",
3397 "found %u common ancestors:", cnt
), cnt
);
3398 for (iter
= ca
; iter
; iter
= iter
->next
)
3399 output_commit_title(o
, iter
->item
);
3402 merged_common_ancestors
= pop_commit(&ca
);
3403 if (merged_common_ancestors
== NULL
) {
3404 /* if there is no common ancestor, use an empty tree */
3407 tree
= lookup_tree(the_hash_algo
->empty_tree
);
3408 merged_common_ancestors
= make_virtual_commit(tree
, "ancestor");
3411 for (iter
= ca
; iter
; iter
= iter
->next
) {
3412 const char *saved_b1
, *saved_b2
;
3415 * When the merge fails, the result contains files
3416 * with conflict markers. The cleanness flag is
3417 * ignored (unless indicating an error), it was never
3418 * actually used, as result of merge_trees has always
3419 * overwritten it: the committed "conflicts" were
3423 saved_b1
= o
->branch1
;
3424 saved_b2
= o
->branch2
;
3425 o
->branch1
= "Temporary merge branch 1";
3426 o
->branch2
= "Temporary merge branch 2";
3427 if (merge_recursive(o
, merged_common_ancestors
, iter
->item
,
3428 NULL
, &merged_common_ancestors
) < 0)
3430 o
->branch1
= saved_b1
;
3431 o
->branch2
= saved_b2
;
3434 if (!merged_common_ancestors
)
3435 return err(o
, _("merge returned no commit"));
3442 o
->ancestor
= "merged common ancestors";
3443 clean
= merge_trees(o
, get_commit_tree(h1
), get_commit_tree(h2
),
3444 get_commit_tree(merged_common_ancestors
),
3451 if (o
->call_depth
) {
3452 *result
= make_virtual_commit(mrtree
, "merged tree");
3453 commit_list_insert(h1
, &(*result
)->parents
);
3454 commit_list_insert(h2
, &(*result
)->parents
->next
);
3457 if (!o
->call_depth
&& o
->buffer_output
< 2)
3458 strbuf_release(&o
->obuf
);
3460 diff_warn_rename_limit("merge.renamelimit",
3461 o
->needed_rename_limit
, 0);
3465 static struct commit
*get_ref(const struct object_id
*oid
, const char *name
)
3467 struct object
*object
;
3469 object
= deref_tag(parse_object(oid
), name
, strlen(name
));
3472 if (object
->type
== OBJ_TREE
)
3473 return make_virtual_commit((struct tree
*)object
, name
);
3474 if (object
->type
!= OBJ_COMMIT
)
3476 if (parse_commit((struct commit
*)object
))
3478 return (struct commit
*)object
;
3481 int merge_recursive_generic(struct merge_options
*o
,
3482 const struct object_id
*head
,
3483 const struct object_id
*merge
,
3485 const struct object_id
**base_list
,
3486 struct commit
**result
)
3489 struct lock_file lock
= LOCK_INIT
;
3490 struct commit
*head_commit
= get_ref(head
, o
->branch1
);
3491 struct commit
*next_commit
= get_ref(merge
, o
->branch2
);
3492 struct commit_list
*ca
= NULL
;
3496 for (i
= 0; i
< num_base_list
; ++i
) {
3497 struct commit
*base
;
3498 if (!(base
= get_ref(base_list
[i
], oid_to_hex(base_list
[i
]))))
3499 return err(o
, _("Could not parse object '%s'"),
3500 oid_to_hex(base_list
[i
]));
3501 commit_list_insert(base
, &ca
);
3505 hold_locked_index(&lock
, LOCK_DIE_ON_ERROR
);
3506 clean
= merge_recursive(o
, head_commit
, next_commit
, ca
,
3509 rollback_lock_file(&lock
);
3513 if (write_locked_index(&the_index
, &lock
,
3514 COMMIT_LOCK
| SKIP_IF_UNCHANGED
))
3515 return err(o
, _("Unable to write index."));
3517 return clean
? 0 : 1;
3520 static void merge_recursive_config(struct merge_options
*o
)
3523 git_config_get_int("merge.verbosity", &o
->verbosity
);
3524 git_config_get_int("diff.renamelimit", &o
->diff_rename_limit
);
3525 git_config_get_int("merge.renamelimit", &o
->merge_rename_limit
);
3526 if (!git_config_get_string("diff.renames", &value
)) {
3527 o
->diff_detect_rename
= git_config_rename("diff.renames", value
);
3530 if (!git_config_get_string("merge.renames", &value
)) {
3531 o
->merge_detect_rename
= git_config_rename("merge.renames", value
);
3534 git_config(git_xmerge_config
, NULL
);
3537 void init_merge_options(struct merge_options
*o
)
3539 const char *merge_verbosity
;
3540 memset(o
, 0, sizeof(struct merge_options
));
3542 o
->buffer_output
= 1;
3543 o
->diff_rename_limit
= -1;
3544 o
->merge_rename_limit
= -1;
3546 o
->diff_detect_rename
= -1;
3547 o
->merge_detect_rename
= -1;
3548 merge_recursive_config(o
);
3549 merge_verbosity
= getenv("GIT_MERGE_VERBOSITY");
3550 if (merge_verbosity
)
3551 o
->verbosity
= strtol(merge_verbosity
, NULL
, 10);
3552 if (o
->verbosity
>= 5)
3553 o
->buffer_output
= 0;
3554 strbuf_init(&o
->obuf
, 0);
3555 string_list_init(&o
->df_conflict_file_set
, 1);
3558 int parse_merge_opt(struct merge_options
*o
, const char *s
)
3564 if (!strcmp(s
, "ours"))
3565 o
->recursive_variant
= MERGE_RECURSIVE_OURS
;
3566 else if (!strcmp(s
, "theirs"))
3567 o
->recursive_variant
= MERGE_RECURSIVE_THEIRS
;
3568 else if (!strcmp(s
, "subtree"))
3569 o
->subtree_shift
= "";
3570 else if (skip_prefix(s
, "subtree=", &arg
))
3571 o
->subtree_shift
= arg
;
3572 else if (!strcmp(s
, "patience"))
3573 o
->xdl_opts
= DIFF_WITH_ALG(o
, PATIENCE_DIFF
);
3574 else if (!strcmp(s
, "histogram"))
3575 o
->xdl_opts
= DIFF_WITH_ALG(o
, HISTOGRAM_DIFF
);
3576 else if (skip_prefix(s
, "diff-algorithm=", &arg
)) {
3577 long value
= parse_algorithm_value(arg
);
3580 /* clear out previous settings */
3581 DIFF_XDL_CLR(o
, NEED_MINIMAL
);
3582 o
->xdl_opts
&= ~XDF_DIFF_ALGORITHM_MASK
;
3583 o
->xdl_opts
|= value
;
3585 else if (!strcmp(s
, "ignore-space-change"))
3586 DIFF_XDL_SET(o
, IGNORE_WHITESPACE_CHANGE
);
3587 else if (!strcmp(s
, "ignore-all-space"))
3588 DIFF_XDL_SET(o
, IGNORE_WHITESPACE
);
3589 else if (!strcmp(s
, "ignore-space-at-eol"))
3590 DIFF_XDL_SET(o
, IGNORE_WHITESPACE_AT_EOL
);
3591 else if (!strcmp(s
, "ignore-cr-at-eol"))
3592 DIFF_XDL_SET(o
, IGNORE_CR_AT_EOL
);
3593 else if (!strcmp(s
, "renormalize"))
3595 else if (!strcmp(s
, "no-renormalize"))
3597 else if (!strcmp(s
, "no-renames"))
3598 o
->merge_detect_rename
= 0;
3599 else if (!strcmp(s
, "find-renames")) {
3600 o
->merge_detect_rename
= 1;
3601 o
->rename_score
= 0;
3603 else if (skip_prefix(s
, "find-renames=", &arg
) ||
3604 skip_prefix(s
, "rename-threshold=", &arg
)) {
3605 if ((o
->rename_score
= parse_rename_score(&arg
)) == -1 || *arg
!= 0)
3607 o
->merge_detect_rename
= 1;