undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'en/merge-fixes'

Browse Source 
"merge-recursive" strategy incorrectly checked if a path that is
involved in its internal merge exists in the working tree.

* en/merge-fixes:
  merge-recursive: do not check working copy when creating a virtual merge base
  merge-recursive: remove duplicate code
This commit is contained in:
Junio C Hamano 2016-05-03 14:08:12 -07:00
commit 10b8084ee1
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
merge-recursive.c
View File

@ -622,7 +622,7 @@ static char *unique_path(struct merge_options *o, const char *path, const char *
base_len = newpath.len; base_len = newpath.len;
while (string_list_has_string(&o->current_file_set, newpath.buf) || while (string_list_has_string(&o->current_file_set, newpath.buf) ||
string_list_has_string(&o->current_directory_set, newpath.buf) || string_list_has_string(&o->current_directory_set, newpath.buf) ||
file_exists(newpath.buf)) { (!o->call_depth && file_exists(newpath.buf))) {
strbuf_setlen(&newpath, base_len); strbuf_setlen(&newpath, base_len);
strbuf_addf(&newpath, "_%d", suffix++); strbuf_addf(&newpath, "_%d", suffix++);
} }
@ -1234,8 +1234,8 @@ static void conflict_rename_rename_2to1(struct merge_options *o,
a->path, c1->path, ci->branch1, a->path, c1->path, ci->branch1,
b->path, c2->path, ci->branch2); b->path, c2->path, ci->branch2);
remove_file(o, 1, a->path, would_lose_untracked(a->path)); remove_file(o, 1, a->path, o->call_depth || would_lose_untracked(a->path));
remove_file(o, 1, b->path, would_lose_untracked(b->path)); remove_file(o, 1, b->path, o->call_depth || would_lose_untracked(b->path));
mfi_c1 = merge_file_special_markers(o, a, c1, &ci->ren1_other, mfi_c1 = merge_file_special_markers(o, a, c1, &ci->ren1_other,
o->branch1, c1->path, o->branch1, c1->path,
@ -1773,8 +1773,6 @@ static int process_entry(struct merge_options *o,
output(o, 1, _("CONFLICT (%s): There is a directory with name %s in %s. " output(o, 1, _("CONFLICT (%s): There is a directory with name %s in %s. "
"Adding %s as %s"), "Adding %s as %s"),
conf, path, other_branch, path, new_path); conf, path, other_branch, path, new_path);
if (o->call_depth)
remove_file_from_cache(path);
update_file(o, 0, sha, mode, new_path); update_file(o, 0, sha, mode, new_path);
if (o->call_depth) if (o->call_depth)
remove_file_from_cache(path); remove_file_from_cache(path);