X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=merge-recursive.c;h=58989424d77467da018e7daf5761f1f85040d2f6;hb=005f85d9ae95c44d8c6ecf61364642fbcaf49dd2;hp=a5e68457f45f24a646d22eba5f3e3ed9a46286d0;hpb=3dff5379bf1e3fda5e5a84ca5813b0c0cfd51be7;p=git.git

diff --git a/merge-recursive.c b/merge-recursive.c
index a5e68457f..58989424d 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -891,7 +891,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, index_only);
+			remove_file(1, ren1_src, index_only || stage == 3);
 
 			hashcpy(src_other.sha1, ren1->src_entry->stages[stage].sha);
 			src_other.mode = ren1->src_entry->stages[stage].mode;
@@ -1213,7 +1213,7 @@ static int merge(struct commit *h1,
 
 		tree->object.parsed = 1;
 		tree->object.type = OBJ_TREE;
-		write_sha1_file(NULL, 0, tree_type, tree->object.sha1);
+		pretend_sha1_file(NULL, 0, tree_type, tree->object.sha1);
 		merged_common_ancestors = make_virtual_commit(tree, "ancestor");
 	}