diff options
| author |  Jeff King <peff@peff.net> | 2016-07-01 02:07:01 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2016-07-01 15:09:10 -0700 |
| commit | 5ce5f5fa5ad3de3c36fdd00df2d5c045ad1d7f04 (patch) | |
| tree | 980b0f34b834b35e6a9c8bc97d1aef01cf9e7a79 | |
| parent | common-main: call restore_sigpipe_to_default() (diff) | |
| download | tgif-5ce5f5fa5ad3de3c36fdd00df2d5c045ad1d7f04.tar.xz | |
common-main: call git_setup_gettext()
This should be part of every program, as otherwise users do
not get translated error messages. However, some external
commands forgot to do so (e.g., git-credential-store). This
fixes them, and eliminates the repeated code in programs
that did remember to use it.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | common-main.c | 2 | ||||
| -rw-r--r-- | daemon.c | 2 | ||||
| -rw-r--r-- | fast-import.c | 2 | ||||
| -rw-r--r-- | git.c | 2 | ||||
| -rw-r--r-- | http-backend.c | 2 | ||||
| -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 | 2 | ||||
| -rw-r--r-- | shell.c | 2 | ||||
| -rw-r--r-- | show-index.c | 2 | ||||
| -rw-r--r-- | upload-pack.c | 2 |
12 files changed, 2 insertions, 22 deletions
diff --git a/common-main.c b/common-main.c index 20e55ef7d7..3be5ad18e1 100644 --- a/common-main.c +++ b/common-main.c @@ -37,6 +37,8 @@ int main(int argc, char **av) */ sanitize_stdfds(); + git_setup_gettext(); + argv[0] = git_extract_argv0_path(argv[0]); restore_sigpipe_to_default(); @@ -1187,8 +1187,6 @@ int cmd_main(int argc, const char **argv) struct credentials *cred = NULL; int i; - git_setup_gettext(); - 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 72d209c19a..c434272566 100644 --- a/fast-import.c +++ b/fast-import.c @@ -3384,8 +3384,6 @@ int cmd_main(int argc, const char **argv) { unsigned int i; - git_setup_gettext(); - if (argc == 2 && !strcmp(argv[1], "-h")) usage(fast_import_usage); @@ -618,8 +618,6 @@ int cmd_main(int argc, const char **argv) if (!cmd) cmd = "git-help"; - git_setup_gettext(); - trace_command_performance(argv); /* diff --git a/http-backend.c b/http-backend.c index 2926d1f9e7..5a17bcac87 100644 --- a/http-backend.c +++ b/http-backend.c @@ -640,8 +640,6 @@ int cmd_main(int argc, const char **argv) char *cmd_arg = NULL; int i; - git_setup_gettext(); - set_die_routine(die_webcgi); set_die_is_recursing_routine(die_webcgi_recursing); diff --git a/http-fetch.c b/http-fetch.c index 244cd0db5d..3b556d6619 100644 --- a/http-fetch.c +++ b/http-fetch.c @@ -22,8 +22,6 @@ int cmd_main(int argc, const char **argv) int get_verbosely = 0; int get_recover = 0; - git_setup_gettext(); - 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 acfcd1f1ad..366794d707 100644 --- a/http-push.c +++ b/http-push.c @@ -1709,8 +1709,6 @@ int cmd_main(int argc, const char **argv) int new_refs; struct ref *ref, *local_refs; - git_setup_gettext(); - repo = xcalloc(1, sizeof(*repo)); argv++; diff --git a/imap-send.c b/imap-send.c index 125b2183a7..9cbe27fcd4 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_setup_gettext(); - setup_git_directory_gently(&nongit_ok); git_imap_config(); diff --git a/remote-curl.c b/remote-curl.c index cdbaed1479..46a55d28f5 100644 --- a/remote-curl.c +++ b/remote-curl.c @@ -989,8 +989,6 @@ int cmd_main(int argc, const char **argv) struct strbuf buf = STRBUF_INIT; int nongit; - git_setup_gettext(); - setup_git_directory_gently(&nongit); if (argc < 2) { error("remote-curl: usage: git remote-curl <remote> [<url>]"); @@ -145,8 +145,6 @@ int cmd_main(int argc, const char **argv) struct commands *cmd; int count; - git_setup_gettext(); - /* * Special hack to pretend to be a CVS server */ diff --git a/show-index.c b/show-index.c index 575f9c5894..1ead41e211 100644 --- a/show-index.c +++ b/show-index.c @@ -11,8 +11,6 @@ int cmd_main(int argc, const char **argv) unsigned int version; static unsigned int top_index[256]; - git_setup_gettext(); - if (argc != 1) usage(show_index_usage); if (fread(top_index, 2 * 4, 1, stdin) != 1) diff --git a/upload-pack.c b/upload-pack.c index 8f2dd7d49a..f0a0fdaf71 100644 --- a/upload-pack.c +++ b/upload-pack.c @@ -823,8 +823,6 @@ int cmd_main(int argc, const char **argv) int i; int strict = 0; - git_setup_gettext(); - packet_trace_identity("upload-pack"); check_replace_refs = 0; |