.mailmap maintenance after pulling from git-svn

diff --git a/merge-recursive.c b/merge-recursive.c
index a68fcc6f377fc5df3ec0527e9bfe552754c81ede..58989424d77467da018e7daf5761f1f85040d2f6 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -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");
        }