merge-recur: do not setenv("GIT_INDEX_FILE")

diff --git a/builtin-push.c b/builtin-push.c
index 31cbfd73861326ad303472718365838329a55cb8..a824171066b8b02b82ee45030efa7e6ef359b995 100644 (file)
--- a/builtin-push.c
+++ b/builtin-push.c
@@ -270,7 +270,7 @@ static int do_push(const char *repo)
        return 0;
 }
 
-int cmd_push(int argc, const char **argv, char **envp)
+int cmd_push(int argc, const char **argv, const char *prefix)
 {
        int i;
        const char *repo = "origin";    /* default repository */