diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-05-26 02:03:43 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-05-26 02:03:43 (GMT) |
| commit | 5c44cc9ea29b74ed10f5f239791b2c2f9586f197 (patch) | |
| tree | 229ac0b470b16816573dbee84e71e2d02fd9798c /merge-recursive.c | |
| parent | 417653777a1d073f53b2053cf0b0838a35cfc7d5 (diff) | |
| parent | bf74106a5b4577fd695d15a28ad51537ae7470d8 (diff) | |
| download | git-5c44cc9ea29b74ed10f5f239791b2c2f9586f197.zip git-5c44cc9ea29b74ed10f5f239791b2c2f9586f197.tar.gz git-5c44cc9ea29b74ed10f5f239791b2c2f9586f197.tar.bz2 | |
Merge branch 'do/maint-merge-recursive-fix' into maint
* do/maint-merge-recursive-fix:
merge-recursive: never leave index unmerged while recursing
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index a3721ef..f5df9b9 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -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; |