From: Bagas Sanjaya Date: Sun, 03 Apr 2022 05:56:55 GMT Subject: Re: [PATCH v2 1/6] i18n: factorize generic failure messages Message-ID: <4b46ba19-3a39-7317-42fb-4fd4bba09b36@gmail.com> In-Reply-To: <4bba3e1f6cb9cdc35b0dc8da440e38de256b4d2b.1648915853.git.gitgitgadget@gmail.com> On 02/04/22 23.10, Jean-Noël Avila via GitGitGadget wrote: > From: =?UTF-8?q?Jean-No=C3=ABl=20Avila?= > > In these message the command or the function that failed should not be > translated. So it is simpler to just remove these parts from the > message. > > Signed-off-by: Jean-Noël Avila > --- > add-patch.c | 4 ++-- > builtin/am.c | 2 +- > builtin/gc.c | 4 ++-- > builtin/merge.c | 6 +++--- > builtin/revert.c | 4 ++-- > fetch-pack.c | 2 +- > remote-curl.c | 2 +- > setup.c | 4 ++-- > t/t3510-cherry-pick-sequence.sh | 8 ++++---- > t/t6436-merge-overwrite.sh | 2 +- > 10 files changed, 19 insertions(+), 19 deletions(-) > > diff --git a/add-patch.c b/add-patch.c > index 55d719f7845..8c9e81ec78e 100644 > --- a/add-patch.c > +++ b/add-patch.c > @@ -1181,7 +1181,7 @@ static int run_apply_check(struct add_p_state *s, > "apply", "--check", NULL); > strvec_pushv(&cp.args, s->mode->apply_check_args); > if (pipe_command(&cp, s->buf.buf, s->buf.len, NULL, 0, NULL, 0)) > - return error(_("'git apply --cached' failed")); > + return error(_("the command '%s' failed"), "git apply --cached"); > > return 0; > } > @@ -1683,7 +1683,7 @@ soft_increment: > strvec_pushv(&cp.args, s->mode->apply_args); > if (pipe_command(&cp, s->buf.buf, s->buf.len, > NULL, 0, NULL, 0)) > - error(_("'git apply' failed")); > + error(_("the command '%s' failed"), "git apply"); > } > if (repo_read_index(s->s.r) >= 0) > repo_refresh_and_write_index(s->s.r, REFRESH_QUIET, 0, > diff --git a/builtin/am.c b/builtin/am.c > index 0f4111bafa0..a0a57049510 100644 > --- a/builtin/am.c > +++ b/builtin/am.c > @@ -586,7 +586,7 @@ static int is_mail(FILE *fp) > int ret = 1; > > if (fseek(fp, 0L, SEEK_SET)) > - die_errno(_("fseek failed")); > + die_errno(_("the function '%s' failed"), "fseek"); > > if (regcomp(®ex, header_regex, REG_NOSUB | REG_EXTENDED)) > die("invalid pattern: %s", header_regex); > diff --git a/builtin/gc.c b/builtin/gc.c > index ffaf0daf5d9..c062d7bceeb 100644 > --- a/builtin/gc.c > +++ b/builtin/gc.c > @@ -1104,7 +1104,7 @@ static int multi_pack_index_expire(struct maintenance_run_opts *opts) > strvec_push(&child.args, "--no-progress"); > > if (run_command(&child)) > - return error(_("'git multi-pack-index expire' failed")); > + return error(_("the command '%s' failed"), "git multi-pack-index expire"); > > return 0; > } > @@ -1163,7 +1163,7 @@ static int multi_pack_index_repack(struct maintenance_run_opts *opts) > (uintmax_t)get_auto_pack_size()); > > if (run_command(&child)) > - return error(_("'git multi-pack-index repack' failed")); > + return error(_("the command '%s' failed"), "git multi-pack-index repack"); > > return 0; > } > diff --git a/builtin/merge.c b/builtin/merge.c > index f178f5a3ee1..78468ff43a4 100644 > --- a/builtin/merge.c > +++ b/builtin/merge.c > @@ -325,7 +325,7 @@ static int save_state(struct object_id *stash) > close(cp.out); > > if (finish_command(&cp) || len < 0) > - die(_("stash failed")); > + die(_("the command '%s' failed"), "stash"); > else if (!len) /* no changes */ > goto out; > strbuf_setlen(&buffer, buffer.len-1); > @@ -352,7 +352,7 @@ static void read_empty(const struct object_id *oid, int verbose) > args[i] = NULL; > > if (run_command_v_opt(args, RUN_GIT_CMD)) > - die(_("read-tree failed")); > + die(_("the command '%s' failed"), "read-tree"); > } > > static void reset_hard(const struct object_id *oid, int verbose) > @@ -369,7 +369,7 @@ static void reset_hard(const struct object_id *oid, int verbose) > args[i] = NULL; > > if (run_command_v_opt(args, RUN_GIT_CMD)) > - die(_("read-tree failed")); > + die(_("the command '%s' failed"), "read-tree"); > } > > static void restore_state(const struct object_id *head, > diff --git a/builtin/revert.c b/builtin/revert.c > index 51776abea63..d293036e790 100644 > --- a/builtin/revert.c > +++ b/builtin/revert.c > @@ -238,7 +238,7 @@ int cmd_revert(int argc, const char **argv, const char *prefix) > sequencer_init_config(&opts); > res = run_sequencer(argc, argv, &opts); > if (res < 0) > - die(_("revert failed")); > + die(_("the command '%s' failed"), "revert"); > return res; > } > > @@ -251,6 +251,6 @@ int cmd_cherry_pick(int argc, const char **argv, const char *prefix) > sequencer_init_config(&opts); > res = run_sequencer(argc, argv, &opts); > if (res < 0) > - die(_("cherry-pick failed")); > + die(_("the command '%s' failed"), "cherry-pick"); > return res; > } > diff --git a/fetch-pack.c b/fetch-pack.c > index 87657907e78..2e6795cd439 100644 > --- a/fetch-pack.c > +++ b/fetch-pack.c > @@ -989,7 +989,7 @@ static int get_pack(struct fetch_pack_args *args, > args->check_self_contained_and_connected && > ret == 0; > else > - die(_("%s failed"), cmd_name); > + die(_("the command '%s' failed"), cmd_name); > if (use_sideband && finish_async(&demux)) > die(_("error in sideband demultiplexer")); > > diff --git a/remote-curl.c b/remote-curl.c > index ff44f41011e..8393f56652b 100644 > --- a/remote-curl.c > +++ b/remote-curl.c > @@ -1287,7 +1287,7 @@ static int push_dav(int nr_spec, const char **specs) > strvec_push(&child.args, specs[i]); > > if (run_command(&child)) > - die(_("git-http-push failed")); > + die(_("the command '%s' failed"), "git-http-push"); > return 0; > } > > diff --git a/setup.c b/setup.c > index 04ce33cdcd4..30a4b81257d 100644 > --- a/setup.c > +++ b/setup.c > @@ -1506,12 +1506,12 @@ int daemonize(void) > case 0: > break; > case -1: > - die_errno(_("fork failed")); > + die_errno(_("the function '%s' failed"), "fork"); > default: > exit(0); > } > if (setsid() == -1) > - die_errno(_("setsid failed")); > + die_errno(_("the function '%s' failed"), "setsid"); > close(0); > close(1); > close(2); Why not simply "'%s' failed"? -- An old man doll... just what I always wanted! - Clara