summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorShawn Pearce <spearce@spearce.org>2006-12-13 10:42:44 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-12-13 17:13:21 (GMT)
commit8371234ecaaf6e14fe3f2082a855eff1bbd79ae9 (patch)
treede648693fea04a54043b799bfbb552caf6dc173a /merge-recursive.c
parent1349f8771310987dd07b679a512e46e1b17e2b8d (diff)
downloadgit-8371234ecaaf6e14fe3f2082a855eff1bbd79ae9.zip
git-8371234ecaaf6e14fe3f2082a855eff1bbd79ae9.tar.gz
git-8371234ecaaf6e14fe3f2082a855eff1bbd79ae9.tar.bz2
Remove uncontested renamed files during merge.
Prior to 65ac6e9c3f47807cb603af07a6a9e1a43bc119ae we deleted a file from the working directory during a merge if the file existed before the merge started but was renamed by the branch being merged in. This broke in 65ac6e as git-merge-recursive did not actually update the working directory on an uncontested rename. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'merge-recursive.c')
-rw-r--r--merge-recursive.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c
index 32e186c..866a4e4 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -889,7 +889,7 @@ static int process_renames(struct path_list *a_renames,
struct diff_filespec src_other, dst_other;
int try_merge, stage = a_renames == renames1 ? 3: 2;
- remove_file(1, ren1_src, 1);
+ remove_file(1, ren1_src, index_only);
hashcpy(src_other.sha1, ren1->src_entry->stages[stage].sha);
src_other.mode = ren1->src_entry->stages[stage].mode;