mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'do/maint-merge-recursive-fix'

Browse Source 
* do/maint-merge-recursive-fix:
  merge-recursive: never leave index unmerged while recursing
This commit is contained in:
Junio C Hamano
2009-05-23 01:39:50 -07:00
parent e05aae684d bf74106a5b
commit d32643c0ff
2 changed files with 101 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
merge-recursive.c
View File

@ -933,11 +933,12 @@ static int process_renames(struct merge_options *o,
ren1_src, ren1_dst, branch1,
branch2);
update_file(o, 0, ren1->pair->two->sha1, ren1->pair->two->mode, ren1_dst);
update_stages(ren1_dst, NULL,
branch1 == o->branch1 ?
ren1->pair->two : NULL,
branch1 == o->branch1 ?
NULL : ren1->pair->two, 1);
if (!o->call_depth)
update_stages(ren1_dst, NULL,
branch1 == o->branch1 ?
ren1->pair->two : NULL,
branch1 == o->branch1 ?
NULL : ren1->pair->two, 1);
} else if (!sha_eq(dst_other.sha1, null_sha1)) {
const char *new_path;
clean_merge = 0;