merge-recur: do not call git-write-tree

diff --git a/builtin-add.c b/builtin-add.c
index 72d2853176f9c6d8b7c678bce64f5f482c2c5345..f548b8007de79d66f7ed3fad0d96bce75c6bbf57 100644 (file)
--- a/builtin-add.c
+++ b/builtin-add.c
@@ -84,11 +84,10 @@ static void fill_directory(struct dir_struct *dir, const char **pathspec)
 
 static struct lock_file lock_file;
 
-int cmd_add(int argc, const char **argv, char **envp)
+int cmd_add(int argc, const char **argv, const char *prefix)
 {
        int i, newfd;
        int verbose = 0, show_only = 0;
-       const char *prefix = setup_git_directory();
        const char **pathspec;
        struct dir_struct dir;