replace: add --graft option

diff --git a/git.c b/git.c
index 8a19974611fe7492707392510da7656fe0d10ae2..d6b4a5543f77071aff977f6d58e3ab6c5495f19d 100644 (file)
--- a/git.c
+++ b/git.c
@@ -328,7 +328,7 @@ static int run_builtin(struct cmd_struct *p, int argc, const char **argv)
        if (!help) {
                if (p->option & RUN_SETUP)
                        prefix = setup_git_directory();
-               if (p->option & RUN_SETUP_GENTLY) {
+               else if (p->option & RUN_SETUP_GENTLY) {
                        int nongit_ok;
                        prefix = setup_git_directory_gently(&nongit_ok);
                }