diff options
| -rw-r--r-- | common-main.c | 3 | ||||
| -rw-r--r-- | daemon.c | 3 | ||||
| -rw-r--r-- | fast-import.c | 3 | ||||
| -rw-r--r-- | git.c | 2 | ||||
| -rw-r--r-- | http-backend.c | 1 | ||||
| -rw-r--r-- | http-fetch.c | 2 | ||||
| -rw-r--r-- | http-push.c | 2 | ||||
| -rw-r--r-- | imap-send.c | 2 | ||||
| -rw-r--r-- | remote-curl.c | 1 | ||||
| -rw-r--r-- | remote-testsvn.c | 1 | ||||
| -rw-r--r-- | shell.c | 2 | ||||
| -rw-r--r-- | upload-pack.c | 1 |
12 files changed, 4 insertions, 19 deletions
diff --git a/common-main.c b/common-main.c index 2b96bbf436..57c912a78e 100644 --- a/common-main.c +++ b/common-main.c @@ -1,4 +1,5 @@ #include "git-compat-util.h" +#include "exec_cmd.h" int main(int argc, char **av) { @@ -8,5 +9,7 @@ int main(int argc, char **av) */ const char **argv = (const char **)av; + argv[0] = git_extract_argv0_path(argv[0]); + return cmd_main(argc, argv); } @@ -1,6 +1,5 @@ #include "cache.h" #include "pkt-line.h" -#include "exec_cmd.h" #include "run-command.h" #include "strbuf.h" #include "string-list.h" @@ -1190,8 +1189,6 @@ int cmd_main(int argc, const char **argv) git_setup_gettext(); - git_extract_argv0_path(argv[0]); - for (i = 1; i < argc; i++) { const char *arg = argv[i]; const char *v; diff --git a/fast-import.c b/fast-import.c index bd649268b2..72d209c19a 100644 --- a/fast-import.c +++ b/fast-import.c @@ -164,7 +164,6 @@ Format of STDIN stream: #include "refs.h" #include "csum-file.h" #include "quote.h" -#include "exec_cmd.h" #include "dir.h" #define PACK_ID_BITS 16 @@ -3385,8 +3384,6 @@ int cmd_main(int argc, const char **argv) { unsigned int i; - git_extract_argv0_path(argv[0]); - git_setup_gettext(); if (argc == 2 && !strcmp(argv[1], "-h")) @@ -635,7 +635,7 @@ int cmd_main(int argc, const char **argv) const char *cmd; int done_help = 0; - cmd = git_extract_argv0_path(argv[0]); + cmd = argv[0]; if (!cmd) cmd = "git-help"; diff --git a/http-backend.c b/http-backend.c index 3249652b3d..2926d1f9e7 100644 --- a/http-backend.c +++ b/http-backend.c @@ -642,7 +642,6 @@ int cmd_main(int argc, const char **argv) git_setup_gettext(); - git_extract_argv0_path(argv[0]); set_die_routine(die_webcgi); set_die_is_recursing_routine(die_webcgi_recursing); diff --git a/http-fetch.c b/http-fetch.c index eb559eb83b..244cd0db5d 100644 --- a/http-fetch.c +++ b/http-fetch.c @@ -24,8 +24,6 @@ int cmd_main(int argc, const char **argv) git_setup_gettext(); - git_extract_argv0_path(argv[0]); - while (arg < argc && argv[arg][0] == '-') { if (argv[arg][1] == 't') { get_tree = 1; diff --git a/http-push.c b/http-push.c index 98228a4262..acfcd1f1ad 100644 --- a/http-push.c +++ b/http-push.c @@ -1711,8 +1711,6 @@ int cmd_main(int argc, const char **argv) git_setup_gettext(); - git_extract_argv0_path(argv[0]); - repo = xcalloc(1, sizeof(*repo)); argv++; diff --git a/imap-send.c b/imap-send.c index 890e1cbb64..125b2183a7 100644 --- a/imap-send.c +++ b/imap-send.c @@ -1500,8 +1500,6 @@ int cmd_main(int argc, const char **argv) int total; int nongit_ok; - git_extract_argv0_path(argv[0]); - git_setup_gettext(); setup_git_directory_gently(&nongit_ok); diff --git a/remote-curl.c b/remote-curl.c index 6ebc2a0c11..cdbaed1479 100644 --- a/remote-curl.c +++ b/remote-curl.c @@ -991,7 +991,6 @@ int cmd_main(int argc, const char **argv) git_setup_gettext(); - git_extract_argv0_path(argv[0]); setup_git_directory_gently(&nongit); if (argc < 2) { error("remote-curl: usage: git remote-curl <remote> [<url>]"); diff --git a/remote-testsvn.c b/remote-testsvn.c index 32631eb14a..f87bf851ba 100644 --- a/remote-testsvn.c +++ b/remote-testsvn.c @@ -292,7 +292,6 @@ int cmd_main(int argc, const char **argv) static struct remote *remote; const char *url_in; - git_extract_argv0_path(argv[0]); setup_git_directory(); if (argc < 2 || argc > 3) { usage("git-remote-svn <remote-name> [<url>]"); @@ -147,8 +147,6 @@ int cmd_main(int argc, const char **argv) git_setup_gettext(); - git_extract_argv0_path(argv[0]); - /* * Always open file descriptors 0/1/2 to avoid clobbering files * in die(). It also avoids messing up when the pipes are dup'ed diff --git a/upload-pack.c b/upload-pack.c index 909ce68cfb..8f2dd7d49a 100644 --- a/upload-pack.c +++ b/upload-pack.c @@ -826,7 +826,6 @@ int cmd_main(int argc, const char **argv) git_setup_gettext(); packet_trace_identity("upload-pack"); - git_extract_argv0_path(argv[0]); check_replace_refs = 0; for (i = 1; i < argc; i++) { |