Skip to content

Commit 5ce5f5f

Browse files
peffgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 12e0437 commit 5ce5f5f

File tree

12 files changed

+2
-22
lines changed

12 files changed

+2
-22
lines changed

common-main.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ int main(int argc, char **av)
3737
*/
3838
sanitize_stdfds();
3939

40+
git_setup_gettext();
41+
4042
argv[0] = git_extract_argv0_path(argv[0]);
4143

4244
restore_sigpipe_to_default();

daemon.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1187,8 +1187,6 @@ int cmd_main(int argc, const char **argv)
11871187
struct credentials *cred = NULL;
11881188
int i;
11891189

1190-
git_setup_gettext();
1191-
11921190
for (i = 1; i < argc; i++) {
11931191
const char *arg = argv[i];
11941192
const char *v;

fast-import.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3384,8 +3384,6 @@ int cmd_main(int argc, const char **argv)
33843384
{
33853385
unsigned int i;
33863386

3387-
git_setup_gettext();
3388-
33893387
if (argc == 2 && !strcmp(argv[1], "-h"))
33903388
usage(fast_import_usage);
33913389

git.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -618,8 +618,6 @@ int cmd_main(int argc, const char **argv)
618618
if (!cmd)
619619
cmd = "git-help";
620620

621-
git_setup_gettext();
622-
623621
trace_command_performance(argv);
624622

625623
/*

http-backend.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -640,8 +640,6 @@ int cmd_main(int argc, const char **argv)
640640
char *cmd_arg = NULL;
641641
int i;
642642

643-
git_setup_gettext();
644-
645643
set_die_routine(die_webcgi);
646644
set_die_is_recursing_routine(die_webcgi_recursing);
647645

http-fetch.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ int cmd_main(int argc, const char **argv)
2222
int get_verbosely = 0;
2323
int get_recover = 0;
2424

25-
git_setup_gettext();
26-
2725
while (arg < argc && argv[arg][0] == '-') {
2826
if (argv[arg][1] == 't') {
2927
get_tree = 1;

http-push.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1709,8 +1709,6 @@ int cmd_main(int argc, const char **argv)
17091709
int new_refs;
17101710
struct ref *ref, *local_refs;
17111711

1712-
git_setup_gettext();
1713-
17141712
repo = xcalloc(1, sizeof(*repo));
17151713

17161714
argv++;

imap-send.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1500,8 +1500,6 @@ int cmd_main(int argc, const char **argv)
15001500
int total;
15011501
int nongit_ok;
15021502

1503-
git_setup_gettext();
1504-
15051503
setup_git_directory_gently(&nongit_ok);
15061504
git_imap_config();
15071505

remote-curl.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -989,8 +989,6 @@ int cmd_main(int argc, const char **argv)
989989
struct strbuf buf = STRBUF_INIT;
990990
int nongit;
991991

992-
git_setup_gettext();
993-
994992
setup_git_directory_gently(&nongit);
995993
if (argc < 2) {
996994
error("remote-curl: usage: git remote-curl <remote> [<url>]");

shell.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,6 @@ int cmd_main(int argc, const char **argv)
145145
struct commands *cmd;
146146
int count;
147147

148-
git_setup_gettext();
149-
150148
/*
151149
* Special hack to pretend to be a CVS server
152150
*/

0 commit comments

Comments
 (0)