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>
Jeff King committed
Jul 1, 2016 at 02:07 UTC
5ce5f5fa5ad3de3c36fdd00df2d5c045ad1d7f04
12 files changed
+2
-22
common-main.c
+2
@@ -37,6 +37,8 @@ int main(int argc, char **av)
37
*/
38
sanitize_stdfds();
39
40
+ git_setup_gettext();
41
+
42
argv[0] = git_extract_argv0_path(argv[0]);
43
44
restore_sigpipe_to_default();
daemon.c
-2
@@ -1187,8 +1187,6 @@ int cmd_main(int argc, const char **argv)
1187
struct credentials *cred = NULL;
1188
int i;
1189
1190
- git_setup_gettext();
1191
-
1190
for (i = 1; i < argc; i++) {
1191
const char *arg = argv[i];
1192
const char *v;
fast-import.c
-2
@@ -3384,8 +3384,6 @@ int cmd_main(int argc, const char **argv)
3384
{
3385
unsigned int i;
3386
3387
- git_setup_gettext();
3388
-
3387
if (argc == 2 && !strcmp(argv[1], "-h"))
3388
usage(fast_import_usage);
3389
git.c
-2
@@ -618,8 +618,6 @@ int cmd_main(int argc, const char **argv)
618
if (!cmd)
619
cmd = "git-help";
620
621
- git_setup_gettext();
622
-
621
trace_command_performance(argv);
622
623
/*
http-backend.c
-2
@@ -640,8 +640,6 @@ int cmd_main(int argc, const char **argv)
640
char *cmd_arg = NULL;
641
int i;
642
643
- git_setup_gettext();
644
-
643
set_die_routine(die_webcgi);
644
set_die_is_recursing_routine(die_webcgi_recursing);
645
http-fetch.c
-2
@@ -22,8 +22,6 @@ int cmd_main(int argc, const char **argv)
22
int get_verbosely = 0;
23
int get_recover = 0;
24
25
- git_setup_gettext();
26
-
25
while (arg < argc && argv[arg][0] == '-') {
26
if (argv[arg][1] == 't') {
27
get_tree = 1;
http-push.c
-2
@@ -1709,8 +1709,6 @@ int cmd_main(int argc, const char **argv)
1709
int new_refs;
1710
struct ref *ref, *local_refs;
1711
1712
- git_setup_gettext();
1713
-
1712
repo = xcalloc(1, sizeof(*repo));
1713
1714
argv++;
imap-send.c
-2
@@ -1500,8 +1500,6 @@ int cmd_main(int argc, const char **argv)
1500
int total;
1501
int nongit_ok;
1502
1503
- git_setup_gettext();
1504
-
1503
setup_git_directory_gently(&nongit_ok);
1504
git_imap_config();
1505
remote-curl.c
-2
@@ -989,8 +989,6 @@ int cmd_main(int argc, const char **argv)
989
struct strbuf buf = STRBUF_INIT;
990
int nongit;
991
992
- git_setup_gettext();
993
-
992
setup_git_directory_gently(&nongit);
993
if (argc < 2) {
994
error("remote-curl: usage: git remote-curl <remote> [<url>]");
shell.c
-2
@@ -145,8 +145,6 @@ int cmd_main(int argc, const char **argv)
145
struct commands *cmd;
146
int count;
147
148
- git_setup_gettext();
149
-
148
/*
149
* Special hack to pretend to be a CVS server
150
*/
show-index.c
-2
@@ -11,8 +11,6 @@ int cmd_main(int argc, const char **argv)
11
unsigned int version;
12
static unsigned int top_index[256];
13
14
- git_setup_gettext();
15
-
14
if (argc != 1)
15
usage(show_index_usage);
16
if (fread(top_index, 2 * 4, 1, stdin) != 1)
upload-pack.c
-2
@@ -823,8 +823,6 @@ int cmd_main(int argc, const char **argv)
823
int i;
824
int strict = 0;
825
826
- git_setup_gettext();
827
-
826
packet_trace_identity("upload-pack");
827
check_replace_refs = 0;
828