rebase -p: fix quoting when calling `git merge`

diff --git a/builtin/update-index.c b/builtin/update-index.c
index 655e6d60d3f7e0525d5b88c66803e7b993168443..bf7420b808fd1e0314d981bf65073df62f7578a4 100644 (file)
--- a/builtin/update-index.c
+++ b/builtin/update-index.c
@@ -287,8 +287,10 @@ static int add_one_path(const struct cache_entry *old, const char *path, int len
        }
        option = allow_add ? ADD_CACHE_OK_TO_ADD : 0;
        option |= allow_replace ? ADD_CACHE_OK_TO_REPLACE : 0;
-       if (add_cache_entry(ce, option))
+       if (add_cache_entry(ce, option)) {
+               free(ce);
                return error("%s: cannot add to the index - missing --add option?", path);
+       }
        return 0;
 }