Re: [PATCH 1/3] make-static: master

From: Johannes Sixt <j.sixt@viscovery.net>
Date: Sep 14, 2011, 06:50 UTC
Message-ID: <4E704EA2.8060307@viscovery.net>
In-Reply-To: <7v62kwvwe9.fsf@alter.siamese.dyndns.org>

Am 9/14/2011 1:46, schrieb Junio C Hamano:

> This kind of breakage report was exactly what I was looking for by
> merging it early to 'next'. Hopefully no other (function / platform) combo
> has such dependencies...

There is! prepare_git_cmd is used from the Windows section in run-command.c. Therefore, the following hunks of the patch should be reverted.

diff --git a/exec_cmd.c b/exec_cmd.c
index 171e841..1dddbf4 100644
--- a/exec_cmd.c
+++ b/exec_cmd.c
@@ -113,7 +113,7 @@ void setup_path(void)
 	strbuf_release(&new_path);
 }
 
-const char **prepare_git_cmd(const char **argv)
+static const char **prepare_git_cmd(const char **argv)
 {
 	int argc;
 	const char **nargv;
diff --git a/exec_cmd.h b/exec_cmd.h
index e2b546b..f5d2cdd 100644
--- a/exec_cmd.h
+++ b/exec_cmd.h
@@ -5,7 +5,6 @@ extern void git_set_argv_exec_path(const char *exec_path);
 extern const char *git_extract_argv0_path(const char *path);
 extern const char *git_exec_path(void);
 extern void setup_path(void);
-extern const char **prepare_git_cmd(const char **argv);
 extern int execv_git_cmd(const char **argv); /* NULL terminated */
 extern int execl_git_cmd(const char *cmd, ...);
 extern const char *system_path(const char *path);