From patchwork Sun Mar 20 21:54:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Jean-No=C3=ABl_AVILA?= X-Patchwork-Id: 12786696 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DFCCEC433F5 for ; Sun, 20 Mar 2022 21:55:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343759AbiCTV4W (ORCPT ); Sun, 20 Mar 2022 17:56:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60960 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343754AbiCTV4U (ORCPT ); Sun, 20 Mar 2022 17:56:20 -0400 Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [IPv6:2a00:1450:4864:20::32b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 42C80E0F3 for ; Sun, 20 Mar 2022 14:54:56 -0700 (PDT) Received: by mail-wm1-x32b.google.com with SMTP id q20so7570934wmq.1 for ; Sun, 20 Mar 2022 14:54:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:in-reply-to:references:from:date:subject:mime-version :content-transfer-encoding:fcc:to:cc; bh=Juwv5Cy7+lSwZA4MJAFTHbhbw/7/VfeRQSW9/T8wlo4=; b=RS93do33SMvK33pa8s078Gsc3lP9pkQB3iTWFsFVf8wJN9RSmw6csZNHP/AwkbKLlB xjOPk7qLVirX1xZl6erRo/ya2dgpyM3009MYlP0czTDe3Mc2TZrlVDJNRSv4C/PhR5NZ 4+CEprx/UKvvef+hkMvgD4++bhMRw/ckPBoemxCZswp4eCrHPon+Y25OFcZPDPGp0cAe z4X5YRbcK67UCM99JvU/elC+AKDubbDyG0J+bHhf6Wky5RPVvEdExHamAxicv/JNhjfe ch2E1QZi8X7Pxa6VMQCyPfB2st+sggPXgLKBmNMMnsQD54GQweGvTeU17NCGklLKqKDl pCAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:mime-version:content-transfer-encoding:fcc:to:cc; bh=Juwv5Cy7+lSwZA4MJAFTHbhbw/7/VfeRQSW9/T8wlo4=; b=KYdcVZERjRg0CJsLQeBtNR02Gke2nMIaNfYqOXuFBgR4TBzo9c42GjMcDnBzFH9Lct 7kgVgxsowRpmKl6cmIE+bf49kiRVT8Jp+kVK1rbEcPWsxAmOvO+oWqjgyqAiQI5+hcfY Jvh5IrfzUfTCgYfYzOxaMycoRmYrJv0k+cu+GqJRzR5z52llt8oL8CGLGcRxs28+NhZP VoT4cP9p3GdaUZJrdTXFlWj8ACpVfiJBqN/nnzH3HHUQfdujirDoIWfkF3d4BgGYoEsM 0X2DaZPs4nIKvw30tbYMuyqJVL+yQep1X/JPcatU87/cVKih9pavsWFVDfv/W7pvxh+U fHUA== X-Gm-Message-State: AOAM530XGkhp5ngl99usMmHREFfBmCRGwscz8YvIQdDXFEe1nvhkd4Si bG3p35XYgbYrKEQjmFrRsTHpU6ZQcPk= X-Google-Smtp-Source: ABdhPJy91FZf8+kAl6XlMLrnGcYLrcjxKweNF2MvNqL/c57MexDJVVh5mjcoGwu8Xn66ixtzcY8lfg== X-Received: by 2002:a05:600c:190e:b0:389:d9cf:1cf1 with SMTP id j14-20020a05600c190e00b00389d9cf1cf1mr16919781wmq.150.1647813294581; Sun, 20 Mar 2022 14:54:54 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id g6-20020adfd1e6000000b00203f8effc22sm10740187wrd.63.2022.03.20.14.54.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Mar 2022 14:54:54 -0700 (PDT) Message-Id: <73a3a8d7d97e00c94d891e30b96729e65ee4aede.1647813291.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Sun, 20 Mar 2022 21:54:45 +0000 Subject: [PATCH 1/7] i18n: factorize generic failure messages MIME-Version: 1.0 Fcc: Sent To: git@vger.kernel.org Cc: =?utf-8?q?Jean-No=C3=ABl?= Avila , =?utf-8?q?Jean-No?= =?utf-8?q?=C3=ABl_Avila?= Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: =?utf-8?q?Jean-No=C3=ABl_Avila?= From: =?UTF-8?q?Jean-No=C3=ABl=20Avila?= In these message the command 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..d545dea2ff2 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(_("'%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(_("'%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..b26a55318e7 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(_("'%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..d512c127b99 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(_("'%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(_("'%s' failed"), "git multi-pack-index repack"); return 0; } diff --git a/builtin/merge.c b/builtin/merge.c index f178f5a3ee1..3155f116610 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(_("'%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(_("'%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(_("'%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..ed032eaf0f8 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(_("'%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(_("'%s' failed"), "cherry-pick"); return res; } diff --git a/fetch-pack.c b/fetch-pack.c index 87657907e78..09b1cf6173a 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(_("'%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..28619583ec5 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(_("'%s' failed"), "git-http-push"); return 0; } diff --git a/setup.c b/setup.c index 04ce33cdcd4..3d123cc11fd 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(_("'%s' failed"), "fork"); default: exit(0); } if (setsid() == -1) - die_errno(_("setsid failed")); + die_errno(_("'%s' failed"), "setsid"); close(0); close(1); close(2); diff --git a/t/t3510-cherry-pick-sequence.sh b/t/t3510-cherry-pick-sequence.sh index 3b0fa66c33d..75a3fbd469b 100755 --- a/t/t3510-cherry-pick-sequence.sh +++ b/t/t3510-cherry-pick-sequence.sh @@ -193,7 +193,7 @@ test_expect_success 'check advice when we move HEAD by committing' ' error: there is nothing to skip hint: have you committed already? hint: try "git cherry-pick --continue" - fatal: cherry-pick failed + fatal: '\''cherry-pick'\'' failed EOF test_must_fail git cherry-pick base..yetanotherpick && echo c >foo && @@ -208,7 +208,7 @@ test_expect_success 'selectively advise --skip while launching another sequence' cat >expect <<-EOF && error: cherry-pick is already in progress hint: try "git cherry-pick (--continue | --skip | --abort | --quit)" - fatal: cherry-pick failed + fatal: '\''cherry-pick'\'' failed EOF test_must_fail git cherry-pick picked..yetanotherpick && test_must_fail git cherry-pick picked..yetanotherpick 2>advice && @@ -216,7 +216,7 @@ test_expect_success 'selectively advise --skip while launching another sequence' cat >expect <<-EOF && error: cherry-pick is already in progress hint: try "git cherry-pick (--continue | --abort | --quit)" - fatal: cherry-pick failed + fatal: '\''cherry-pick'\'' failed EOF git reset --merge && test_must_fail git cherry-pick picked..yetanotherpick 2>advice && @@ -227,7 +227,7 @@ test_expect_success 'allow skipping commit but not abort for a new history' ' pristine_detach initial && cat >expect <<-EOF && error: cannot abort from a branch yet to be born - fatal: cherry-pick failed + fatal: '\''cherry-pick'\'' failed EOF git checkout --orphan new_disconnected && git reset --hard && diff --git a/t/t6436-merge-overwrite.sh b/t/t6436-merge-overwrite.sh index c0b7bd7c3fe..e8abcd10f5c 100755 --- a/t/t6436-merge-overwrite.sh +++ b/t/t6436-merge-overwrite.sh @@ -166,7 +166,7 @@ test_expect_success 'will not be confused by symlink in leading path' ' cat >expect <<\EOF error: Untracked working tree file 'c0.c' would be overwritten by merge. -fatal: read-tree failed +fatal: 'read-tree' failed EOF test_expect_success 'will not overwrite untracked file on unborn branch' ' From patchwork Sun Mar 20 21:54:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bagas Sanjaya X-Patchwork-Id: 12786697 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 19D2FC433F5 for ; Sun, 20 Mar 2022 21:55:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343768AbiCTV43 (ORCPT ); Sun, 20 Mar 2022 17:56:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32770 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343756AbiCTV4V (ORCPT ); Sun, 20 Mar 2022 17:56:21 -0400 Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 49A1D10FD0 for ; Sun, 20 Mar 2022 14:54:57 -0700 (PDT) Received: by mail-wr1-x430.google.com with SMTP id a1so17078718wrh.10 for ; Sun, 20 Mar 2022 14:54:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=MeEzhbEHtTaBVg6MOBhhPaE+R0IoY5wZDi9UCIaHSQg=; b=BnpY1MW4KV+eXLfuJbbTZC7ZLp/QVq5rNPJ5cTHLCzZnkgj0cy0ivYoipsNX6l+76p DVASZPPqV1RLy2npxdVzu7I0ANoKMBEBAeEq/tMv0fsb59AVkZyRqXJ7HwBOlNPqdJP/ 63+AptJGMcAkhyb+p+10MequVZAO6jZWDdCMxe4AMbVfKAtByGMNIekrn1pvtSdgatol 0eFGkMmvXKYLI/ZAW+9AEWPgzFGX1ijX9x5939uEOeC3BNZ6YJppeYAtOE8yBiCdS5SF 9EKdWC6gYNnZWBPNFjbNVn9xpNURtJfVmF1Jzg0dVEoHFDusX0zwhuYN5K8FJM+xqyM3 Q/kg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=MeEzhbEHtTaBVg6MOBhhPaE+R0IoY5wZDi9UCIaHSQg=; b=aW15btN5fDD9HrDyglVJko8chyl6HLQtGCvWAD/S3iSY3Y3668IP13r+fU5KLetn4f g39KkDvDjvAvAiJlyIVgNSYEPciRdyZqe6ISL6kXn3OTFN/RCMtG4qulz2bx7xaoMYTZ l/KYu7opxjpJ6mN5GZKBOmF/9eGMR5exxHSd5jmknbECt6cc90OfParxhetpt75omflX /YHfbbBLkLqRqgSuIfbs55HA25YrgEwMjV2zORLzeUn3A6AzPTbtIEkf28ST8QyjNKWK LWBr6xSL1JjHZqhTQvvCV40z34lVGzICsj3JjUDPabzOcWuQzJd7CJsf1Z3r0KrYX1dA dUyw== X-Gm-Message-State: AOAM531KEOlrVCsg7EW7NA2g4HmKy8Di+rAAhcDBixlUDvjGHBNjLdhF rdr+0J6OCXQ1maPzi3xBZTPT+jmVfIA= X-Google-Smtp-Source: ABdhPJw+XToKUF4kbXfuvUmu8c4tCJZmNDcjiFQ88AOx4NwhO+HfYgZrIbplRPbXG/1llkINVbKcqA== X-Received: by 2002:a05:6000:1d8b:b0:203:df82:ff8d with SMTP id bk11-20020a0560001d8b00b00203df82ff8dmr15900768wrb.623.1647813295720; Sun, 20 Mar 2022 14:54:55 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id k35-20020a05600c1ca300b0038ca38626c0sm2039844wms.16.2022.03.20.14.54.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Mar 2022 14:54:55 -0700 (PDT) Message-Id: <8bdbb32f54421f99be55493257b31b203a11f202.1647813292.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Sun, 20 Mar 2022 21:54:46 +0000 Subject: [PATCH 2/7] sequencer: factor GIT_AUTHOR_* from message strings Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: =?utf-8?q?Jean-No=C3=ABl?= Avila , Bagas Sanjaya Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Bagas Sanjaya From: Bagas Sanjaya Factor messages containing GIT_AUTHOR_* variable. Signed-off-by: Bagas Sanjaya Acked-by: Bagas Sanjaya --- sequencer.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sequencer.c b/sequencer.c index 84eed9e96bc..647f5efa656 100644 --- a/sequencer.c +++ b/sequencer.c @@ -848,17 +848,17 @@ int read_author_script(const char *path, char **name, char **email, char **date, for (i = 0; i < kv.nr; i++) { if (!strcmp(kv.items[i].string, "GIT_AUTHOR_NAME")) { if (name_i != -2) - name_i = error(_("'GIT_AUTHOR_NAME' already given")); + name_i = error(_("'%s' already given"), "GIT_AUTHOR_NAME"); else name_i = i; } else if (!strcmp(kv.items[i].string, "GIT_AUTHOR_EMAIL")) { if (email_i != -2) - email_i = error(_("'GIT_AUTHOR_EMAIL' already given")); + email_i = error(_("'%s' already given"), "GIT_AUTHOR_EMAIL"); else email_i = i; } else if (!strcmp(kv.items[i].string, "GIT_AUTHOR_DATE")) { if (date_i != -2) - date_i = error(_("'GIT_AUTHOR_DATE' already given")); + date_i = error(_("'%s' already given"), "GIT_AUTHOR_DATE"); else date_i = i; } else { @@ -867,11 +867,11 @@ int read_author_script(const char *path, char **name, char **email, char **date, } } if (name_i == -2) - error(_("missing 'GIT_AUTHOR_NAME'")); + error(_("missing '%s'"), "GIT_AUTHOR_NAME"); if (email_i == -2) - error(_("missing 'GIT_AUTHOR_EMAIL'")); + error(_("missing '%s'"), "GIT_AUTHOR_EMAIL"); if (date_i == -2) - error(_("missing 'GIT_AUTHOR_DATE'")); + error(_("missing '%s'"), "GIT_AUTHOR_DATE"); if (date_i < 0 || email_i < 0 || date_i < 0 || err) goto finish; *name = kv.items[name_i].util; From patchwork Sun Mar 20 21:54:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Jean-No=C3=ABl_AVILA?= X-Patchwork-Id: 12786698 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 73D48C433F5 for ; Sun, 20 Mar 2022 21:55:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343765AbiCTV4b (ORCPT ); Sun, 20 Mar 2022 17:56:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32804 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343758AbiCTV4V (ORCPT ); Sun, 20 Mar 2022 17:56:21 -0400 Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0471910FE1 for ; Sun, 20 Mar 2022 14:54:58 -0700 (PDT) Received: by mail-wr1-x433.google.com with SMTP id m30so8621786wrb.1 for ; Sun, 20 Mar 2022 14:54:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:in-reply-to:references:from:date:subject:mime-version :content-transfer-encoding:fcc:to:cc; bh=zyDHw+zxGizXnRHPB7DNFSp0YST+9toLA7uDECDfe4k=; b=RhAj8Zxf0pyV4HrCP+3rz8Xw4UzHu1a3XeyMFCeJL3pRhSWMkEk/CZmF6o//sIMFmn 0UfHLVl71vHhtku2YwrBRB9nfnp91/C+sLbSktzCyV8N/aNw8Jwh7uLskCjnEwfEROcl 0lv4ThwHL4PS0FHj+82wxI8Y0EwDqmctI8MGY/daTCN/Kl1/SZmcPOgfIFZtsb9hb6dY x0OTyZT4LlYE+7dVJszCQ7l8D3XVL54P0c3G55B98hh5uDfviYyznxuyWrkhipVW7jCB FCobTASoZKZH5u/LjZNVBM5vSvL4Hyr8F+dWh8EbkYbQyMVRgBB/vEGXyfRMfgl5e1SI kr8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:mime-version:content-transfer-encoding:fcc:to:cc; bh=zyDHw+zxGizXnRHPB7DNFSp0YST+9toLA7uDECDfe4k=; b=VfY7XgXmkUy5ENwhqW8H2fY/1RPoSRkn7+ggOOKN1Zdvsa62mfmhlRvAiTWCCTLoKY kdDQ8FDUgcQyuL8gC7VX653xjLPv8XukvKKUzkv3/UkReaG9c3kdMp9f2lAZf4B8aE7d +d28juYtiyAGKOnmc4SrdtXjrdbYB9vM9fIh5VgS7SndO10iCRS6tdBykimSlaJmlVhP 2nBPekCCxFBlUWjbf2/w+3e9xLt+5PJLzob7kEsyC/xeJqYjRe8eHJTWst2L4zh9jfuI Pegu7vedA2pJk/TH6O8hMVwyndlsyPDwjzhN151G8woDLtlHMjsPaFU4TS8Sbn0Qcjxj 2gmw== X-Gm-Message-State: AOAM532QQ0UApuAoLeaF+QjNlyOHnlXU6A+DhI6uHuZLVAvQv/Ba+Q3K f5LjYSk0IBldKR+f4vSb9hlic+rDfSE= X-Google-Smtp-Source: ABdhPJxEa3hYhyKbPEJHi+DEffS+dCXofIuXdHdD5ktds/nt7kak7DPa4MUzLVlPSoLpzvzbic9kOA== X-Received: by 2002:a05:6000:1a8f:b0:203:7ca5:8dc0 with SMTP id f15-20020a0560001a8f00b002037ca58dc0mr15632381wry.358.1647813296464; Sun, 20 Mar 2022 14:54:56 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id k9-20020adfd849000000b00203d18bf389sm11248758wrl.17.2022.03.20.14.54.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Mar 2022 14:54:56 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Sun, 20 Mar 2022 21:54:47 +0000 Subject: [PATCH 3/7] i18n: factorize "bad argument" messages MIME-Version: 1.0 Fcc: Sent To: git@vger.kernel.org Cc: =?utf-8?q?Jean-No=C3=ABl?= Avila , =?utf-8?q?Jean-No?= =?utf-8?q?=C3=ABl_Avila?= Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: =?utf-8?q?Jean-No=C3=ABl_Avila?= From: =?UTF-8?q?Jean-No=C3=ABl=20Avila?= Signed-off-by: Jean-Noël Avila --- builtin/bisect--helper.c | 2 +- diff.c | 4 ++-- submodule.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c index 8b2b259ff0d..289a7d2bc9e 100644 --- a/builtin/bisect--helper.c +++ b/builtin/bisect--helper.c @@ -268,7 +268,7 @@ static int bisect_write(const char *state, const char *rev, } else if (one_of(state, terms->term_good, "skip", NULL)) { strbuf_addf(&tag, "refs/bisect/%s-%s", state, rev); } else { - res = error(_("Bad bisect_write argument: %s"), state); + res = error(_("bad %s argument: %s"), "bisect_write", state); goto finish; } diff --git a/diff.c b/diff.c index 6b22946cd0e..5e045b4ba87 100644 --- a/diff.c +++ b/diff.c @@ -5010,7 +5010,7 @@ static int diff_opt_color_moved(const struct option *opt, } else { int cm = parse_color_moved(arg); if (cm < 0) - return error(_("bad --color-moved argument: %s"), arg); + return error(_("bad %s argument: %s"), "--color-moved", arg); options->color_moved = cm; } return 0; @@ -5334,7 +5334,7 @@ static int diff_opt_word_diff(const struct option *opt, else if (!strcmp(arg, "none")) options->word_diff = DIFF_WORDS_NONE; else - return error(_("bad --word-diff argument: %s"), arg); + return error(_("bad %s argument: %s"), "--word-diff", arg); } else { if (options->word_diff == DIFF_WORDS_NONE) options->word_diff = DIFF_WORDS_PLAIN; diff --git a/submodule.c b/submodule.c index 5ace18a7d94..010f8252c5e 100644 --- a/submodule.c +++ b/submodule.c @@ -470,7 +470,7 @@ void handle_ignore_submodules_arg(struct diff_options *diffopt, else if (!strcmp(arg, "dirty")) diffopt->flags.ignore_dirty_submodules = 1; else if (strcmp(arg, "none")) - die(_("bad --ignore-submodules argument: %s"), arg); + die(_("bad %s argument: %s"), "--ignore-submodules", arg); /* * Please update _git_status() in git-completion.bash when you * add new options From patchwork Sun Mar 20 21:54:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Jean-No=C3=ABl_AVILA?= X-Patchwork-Id: 12786699 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CAE2AC433FE for ; Sun, 20 Mar 2022 21:55:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343756AbiCTV4d (ORCPT ); Sun, 20 Mar 2022 17:56:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32886 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343754AbiCTV4W (ORCPT ); Sun, 20 Mar 2022 17:56:22 -0400 Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com [IPv6:2a00:1450:4864:20::435]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E4D0C11151 for ; Sun, 20 Mar 2022 14:54:58 -0700 (PDT) Received: by mail-wr1-x435.google.com with SMTP id t11so18469302wrm.5 for ; Sun, 20 Mar 2022 14:54:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:in-reply-to:references:from:date:subject:mime-version :content-transfer-encoding:fcc:to:cc; bh=QQcDvCDYwvzH0EntRq1TIK5AC8tttVytzx41QHC/LF0=; b=NRm0BYiRaARvrNcHX0io+JDShXEVElzA8Ii9xsNUPA3FR2HhdBVGceJUbJj4mUHwqP BxEj4hBif8ApRpI9S92sjx0kt5yxS28Zyt1BQQ3o8uW1iW/vHsf544XJNA0JBupFI7X8 EVWE2W/87WVRUzkJPLPEtyS87PdYjRq1zo1OYPPFJR+/bWf/L2V9vkIwcAkokdZOHmF2 w3bS6b7pLRFL4ggP7dzIlPzrxnXMDGYTS4zM51ZOPfkVrp1AR9quGmmlfLu0NJuh6qk4 IeEMfZL1MFGqhJoOD+w04ZUSEJMpxNpk6Iybl26M9kHcuIgtM2yAhgKHrwPUTZE6QX0y fTBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:mime-version:content-transfer-encoding:fcc:to:cc; bh=QQcDvCDYwvzH0EntRq1TIK5AC8tttVytzx41QHC/LF0=; b=ZErI31wtriDXMlXew2WwVmfE1cdFLt4W314CS2nSSJ6Xk9RXzGARocilh6FM+vGeiP 0nlCeNBSlJWifZG/VVv2YPxe9Y99byOMC3GMUu476Sf2ypUEmwcgYqQCUlkn0eZsmAeb ufcD1vM1wgQSNfOKrYcLbbCq14jwyFyyIz76iMzc/+h8IAofgGb1wBqlAV8eTW9GOBqj p+ZJw+1/FOPC2cS2BITliH7s4+12nMNRIDzntGJPBF+RnMhTmGFwPm/kCPQAwQyUyX7L WcDGDMRfqCdJFKKdJmdV36C6B5UaAJgVr0g8yrcUF50qmvN3/TtBQiLXSOIPO5ioAX7g yoLA== X-Gm-Message-State: AOAM530Yd9iG/Px0+eCOWBWnQbUf4FuBluCKclkyk2ek0RIx+Z9ZIVlo kv3rhSsBKJ08/yiNCgk9U+REVomCjpM= X-Google-Smtp-Source: ABdhPJzTavs3TtdGTC8SBEGdyN7AjUkU051UEVV5mV09BHTXdDhypTXxZ7d7z2i4vkv7OU0ztvYRxQ== X-Received: by 2002:adf:f946:0:b0:1f0:62c3:ea2e with SMTP id q6-20020adff946000000b001f062c3ea2emr15489979wrr.348.1647813297417; Sun, 20 Mar 2022 14:54:57 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id v124-20020a1cac82000000b0037c3d08e0e7sm15256951wme.29.2022.03.20.14.54.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Mar 2022 14:54:56 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Sun, 20 Mar 2022 21:54:48 +0000 Subject: [PATCH 4/7] i18n: factorize "Server does not support foo" messages MIME-Version: 1.0 Fcc: Sent To: git@vger.kernel.org Cc: =?utf-8?q?Jean-No=C3=ABl?= Avila , =?utf-8?q?Jean-No?= =?utf-8?q?=C3=ABl_Avila?= Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: =?utf-8?q?Jean-No=C3=ABl_Avila?= From: =?UTF-8?q?Jean-No=C3=ABl=20Avila?= Signed-off-by: Jean-Noël Avila --- fetch-pack.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fetch-pack.c b/fetch-pack.c index 09b1cf6173a..fcbc5cc5944 100644 --- a/fetch-pack.c +++ b/fetch-pack.c @@ -1106,16 +1106,16 @@ static struct ref *do_fetch_pack(struct fetch_pack_args *args, print_verbose(args, _("Server supports %s"), "deepen-since"); deepen_since_ok = 1; } else if (args->deepen_since) - die(_("Server does not support --shallow-since")); + die(_("Server does not support %s"), "--shallow-since"); if (server_supports("deepen-not")) { print_verbose(args, _("Server supports %s"), "deepen-not"); deepen_not_ok = 1; } else if (args->deepen_not) - die(_("Server does not support --shallow-exclude")); + die(_("Server does not support %s"), "--shallow-exclude"); if (server_supports("deepen-relative")) print_verbose(args, _("Server supports %s"), "deepen-relative"); else if (args->deepen_relative) - die(_("Server does not support --deepen")); + die(_("Server does not support %s"), "--deepen"); if (!server_supports_hash(the_hash_algo->name, NULL)) die(_("Server does not support this repository's object format")); From patchwork Sun Mar 20 21:54:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Jean-No=C3=ABl_AVILA?= X-Patchwork-Id: 12786700 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1A382C433EF for ; Sun, 20 Mar 2022 21:55:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343776AbiCTV4e (ORCPT ); Sun, 20 Mar 2022 17:56:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32958 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343760AbiCTV4X (ORCPT ); Sun, 20 Mar 2022 17:56:23 -0400 Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [IPv6:2a00:1450:4864:20::42e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 96F2911164 for ; Sun, 20 Mar 2022 14:54:59 -0700 (PDT) Received: by mail-wr1-x42e.google.com with SMTP id r10so18480385wrp.3 for ; Sun, 20 Mar 2022 14:54:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:in-reply-to:references:from:date:subject:mime-version :content-transfer-encoding:fcc:to:cc; bh=tjrvtqkr+nl9gmML/KfR/cFoT7TmHJLUsLTa738DfhI=; b=bjO89K2nJ5oVruXjn3Da2AXtZLjmi24TK3KAGAO+HF/y9Z//parewxynzyxaDBVMWz Kj7BLdnYoh9zlFntBL1VtQQs/soy2ZVwzC3xXOwGzplhsDFvzI/c2KIzAoSqGEv9Zcrq Bnry/mcK/xIWib58FkbL0Ks92nHc6EqOQQJPug4MF0bqIujh00Xjont0GXg2U6aYw+Dp TMF4ZeOB2QGPZItLDYGChOuyWVBCHKIwKTshwUs93bP4ct4boYDlXpzTFAzGJhotblxI a/76ETMJU94dKzf/JBkZKTJj6PbXMkswqINALBGHQK3KINFxFIM0NzWjDRdfl1b2dru0 FRLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:mime-version:content-transfer-encoding:fcc:to:cc; bh=tjrvtqkr+nl9gmML/KfR/cFoT7TmHJLUsLTa738DfhI=; b=Irw4J/RIw7cPTUT70sNR1rVKRxXUAcvnQ64WdbLTsve1PfIRDZJpjV4SKkuebwSVCs 2Jbvt1pjYvHGrNLxmvtxuEyOIcK2FuP714CMo04P9rVEeEUhQk6XCe1OsfrnWpm/6HKQ lYFImtfj12zwLnleZW2F3OK7TxQG+S6WHWytLtdXDKjpTJMzv3sn11ow15SgBs4Nj/+c HXH+Sz3PDnlNz2mYd0fg3fTmVfnWEGvj4ker4r0qh7lDPfiDtFd4H3UeaqNKCszvsQ6R PGPHCxBpXkW/X7QKrDs7kmlJBs9f+j2mTxQElG4ifpHJaOljZ8E61dvixO6twX0ueW5F BquQ== X-Gm-Message-State: AOAM531+uzdjUzuriX/LdWyXZ+rZFqwZmuYqXvXOw987BRgG3ov7IcaG gjT6oeZSfgoDPcbRy5/YZHwhD2U/OG0= X-Google-Smtp-Source: ABdhPJzm6Qc5ipwBVnxrUpsaxfp7aKAwylLv3QI62lvq+lTy0uATVlVFEz/qzfPdIknZ5nP4Fq6tFw== X-Received: by 2002:a5d:59a4:0:b0:203:914f:52fa with SMTP id p4-20020a5d59a4000000b00203914f52famr15854315wrr.257.1647813298100; Sun, 20 Mar 2022 14:54:58 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id c8-20020a056000184800b002040e925afasm2300856wri.59.2022.03.20.14.54.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Mar 2022 14:54:57 -0700 (PDT) Message-Id: <2e1bd504673e8e2ec77ac8e99edb9aac0fb82db2.1647813292.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Sun, 20 Mar 2022 21:54:49 +0000 Subject: [PATCH 5/7] i18n: factorize "foo does not take arguments" messages MIME-Version: 1.0 Fcc: Sent To: git@vger.kernel.org Cc: =?utf-8?q?Jean-No=C3=ABl?= Avila , =?utf-8?q?Jean-No?= =?utf-8?q?=C3=ABl_Avila?= Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: =?utf-8?q?Jean-No=C3=ABl_Avila?= From: =?UTF-8?q?Jean-No=C3=ABl=20Avila?= Signed-off-by: Jean-Noël Avila --- contrib/scalar/scalar.c | 2 +- ref-filter.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/contrib/scalar/scalar.c b/contrib/scalar/scalar.c index 7db2a97416e..1aeecea1daa 100644 --- a/contrib/scalar/scalar.c +++ b/contrib/scalar/scalar.c @@ -502,7 +502,7 @@ cleanup: static int cmd_list(int argc, const char **argv) { if (argc != 1) - die(_("`scalar list` does not take arguments")); + die(_("%s does not take arguments"), "`scalar list`"); if (run_git("config", "--global", "--get-all", "scalar.repo", NULL) < 0) return -1; diff --git a/ref-filter.c b/ref-filter.c index 7838bd22b8d..74f84cc0ed7 100644 --- a/ref-filter.c +++ b/ref-filter.c @@ -317,7 +317,7 @@ static int objecttype_atom_parser(struct ref_format *format, struct used_atom *a const char *arg, struct strbuf *err) { if (arg) - return strbuf_addf_ret(err, -1, _("%%(objecttype) does not take arguments")); + return strbuf_addf_ret(err, -1, _("%s does not take arguments"), "%(objecttype)"); if (*atom->name == '*') oi_deref.info.typep = &oi_deref.type; else @@ -349,7 +349,7 @@ static int deltabase_atom_parser(struct ref_format *format, struct used_atom *at const char *arg, struct strbuf *err) { if (arg) - return strbuf_addf_ret(err, -1, _("%%(deltabase) does not take arguments")); + return strbuf_addf_ret(err, -1, _("%s does not take arguments"), "%(deltabase)"); if (*atom->name == '*') oi_deref.info.delta_base_oid = &oi_deref.delta_base_oid; else @@ -361,7 +361,7 @@ static int body_atom_parser(struct ref_format *format, struct used_atom *atom, const char *arg, struct strbuf *err) { if (arg) - return strbuf_addf_ret(err, -1, _("%%(body) does not take arguments")); + return strbuf_addf_ret(err, -1, _("%s does not take arguments"), "%(body)"); atom->u.contents.option = C_BODY_DEP; return 0; } @@ -565,7 +565,7 @@ static int rest_atom_parser(struct ref_format *format, struct used_atom *atom, const char *arg, struct strbuf *err) { if (arg) - return strbuf_addf_ret(err, -1, _("%%(rest) does not take arguments")); + return strbuf_addf_ret(err, -1, _("%s does not take arguments"), "%(rest)"); format->use_rest = 1; return 0; } From patchwork Sun Mar 20 21:54:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Jean-No=C3=ABl_AVILA?= X-Patchwork-Id: 12786702 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3C6D8C433EF for ; Sun, 20 Mar 2022 21:55:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343774AbiCTV4i (ORCPT ); Sun, 20 Mar 2022 17:56:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33184 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343762AbiCTV40 (ORCPT ); Sun, 20 Mar 2022 17:56:26 -0400 Received: from mail-wm1-x329.google.com (mail-wm1-x329.google.com [IPv6:2a00:1450:4864:20::329]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4CD8712AAF for ; Sun, 20 Mar 2022 14:55:01 -0700 (PDT) Received: by mail-wm1-x329.google.com with SMTP id r190-20020a1c2bc7000000b0038a1013241dso7490016wmr.1 for ; Sun, 20 Mar 2022 14:55:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:in-reply-to:references:from:date:subject:mime-version :content-transfer-encoding:fcc:to:cc; bh=d9pu7hbmPd8Hp89pPbBh3nbD40C/8UQUvYI2mXHteDg=; b=Oi6pqbAwvQFD2IVF+FUaGUTJx2xwCpbpqkkE21sffRwcWXMdoCzVbQefV36OBW1HmD TL1FnmqAQmFRj5/pfG9E1NLh49g4iQhJUSMb6tecHNqPUXg+ayVAOcNxyQ39Wl4FqU/m BCgcJcftQpPGVE05wTwOyCBoiV4sQ+PDLoI8jOHTU2sJ2xblHHOkQ62a792zcD9tJodm UbsnbYyJZdcU2HtMAMB9NW3ZRk3Zc3TFSNXGp2UiAhaymqdu5/pbFBcqMQVstV79eLQK QZlpefhn3tE0N/QUlSg8JB3Q6s12xX82TAczdNBT5qxLE4glMjgItY4Mv1cxWNIqiyMN XuMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:mime-version:content-transfer-encoding:fcc:to:cc; bh=d9pu7hbmPd8Hp89pPbBh3nbD40C/8UQUvYI2mXHteDg=; b=7yKxUvTHbTXnYYdawjKgCI8xE5aIyj/AJsFJpNjsvLsuLmnVyWD2EiqC36XIfLB6+l gkka33WFvseMklhoKn5awMXk7y0b4ReXSIrNftJKhIAEKHhj+OphFFY7pyXPWAywLvws 3TB8Ce7HiKpK4I+nN6DgfrhlVRAzD0vFCwe+tn1U7ZprDl4AKFevCx6HmW9g51dd/+Y7 Q0WZaQpqVXFA13YqEY64/Lf1GrZEKE4s5IFx93SebacYR4HyGkbEFHRBXfgcARpy+Uv8 3xewgzFb7SMAZYLjqPaO9Wr3f7ChbT3rrZbb8Lk7zlpjonyLs1jaWJFXnOJKxBmBxwR9 WqGQ== X-Gm-Message-State: AOAM531sNySAdcP4PbhRTrklNjFiqw9KzC6lx9aWK/fUNth/AxYoMI95 2tTZktOXqifvcMUkKlZ7BN++ktsonWY= X-Google-Smtp-Source: ABdhPJyhtkW04Ls2zc2fMvqUCP2utyeeq1yJKCLqc3xwWwU+UOW49gAikmYvWn4K8X5qdYIGL7rCxA== X-Received: by 2002:a1c:e90a:0:b0:381:504e:b57d with SMTP id q10-20020a1ce90a000000b00381504eb57dmr24617193wmc.177.1647813298851; Sun, 20 Mar 2022 14:54:58 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id n7-20020a05600c3b8700b00389a6241669sm17062469wms.33.2022.03.20.14.54.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Mar 2022 14:54:58 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Sun, 20 Mar 2022 21:54:50 +0000 Subject: [PATCH 6/7] i18n: factorize read-cache error messages MIME-Version: 1.0 Fcc: Sent To: git@vger.kernel.org Cc: =?utf-8?q?Jean-No=C3=ABl?= Avila , =?utf-8?q?Jean-No?= =?utf-8?q?=C3=ABl_Avila?= Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: =?utf-8?q?Jean-No=C3=ABl_Avila?= From: =?UTF-8?q?Jean-No=C3=ABl=20Avila?= Signed-off-by: Jean-Noël Avila --- read-cache.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/read-cache.c b/read-cache.c index 1ad56d02e1d..39a633ea4b8 100644 --- a/read-cache.c +++ b/read-cache.c @@ -1735,8 +1735,8 @@ static unsigned int get_index_format_default(struct repository *r) if (r->settings.index_version >= 0) version = r->settings.index_version; if (version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < version) { - warning(_("index.version set, but the value is invalid.\n" - "Using version %i"), INDEX_FORMAT_DEFAULT); + warning(_("%s set, but the value is invalid.\n" + "Using version %i"), "index.version", INDEX_FORMAT_DEFAULT); return INDEX_FORMAT_DEFAULT; } return version; @@ -1745,8 +1745,8 @@ static unsigned int get_index_format_default(struct repository *r) version = strtoul(envversion, &endp, 10); if (*endp || version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < version) { - warning(_("GIT_INDEX_VERSION set, but the value is invalid.\n" - "Using version %i"), INDEX_FORMAT_DEFAULT); + warning(_("%s set, but the value is invalid.\n" + "Using version %i"), "GIT_INDEX_VERSION", INDEX_FORMAT_DEFAULT); version = INDEX_FORMAT_DEFAULT; } return version; From patchwork Sun Mar 20 21:54:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Jean-No=C3=ABl_AVILA?= X-Patchwork-Id: 12786701 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 57047C433F5 for ; Sun, 20 Mar 2022 21:55:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343778AbiCTV4h (ORCPT ); Sun, 20 Mar 2022 17:56:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33056 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343761AbiCTV4Z (ORCPT ); Sun, 20 Mar 2022 17:56:25 -0400 Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [IPv6:2a00:1450:4864:20::429]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 36BD912A82 for ; Sun, 20 Mar 2022 14:55:01 -0700 (PDT) Received: by mail-wr1-x429.google.com with SMTP id b19so18431658wrh.11 for ; Sun, 20 Mar 2022 14:55:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:in-reply-to:references:from:date:subject:mime-version :content-transfer-encoding:fcc:to:cc; bh=FpFxPc+QcmTYNUPNiRVEoOstnUf1weEtg8E6bXT4nYU=; b=ZK6H5L/H5ysa0p+EcAopfmGXoZiCw0Tf/r5EKXHG3MSaQ0goJH4tZxcBrPASjmeguK mDoSLrev7Wg2Q+6+XIfN1XSBY705uiEJyBFTEUhzq+EJJRz/TgPHBEqHfXbJjNy/pxtl R7umsc1Nva2xHYLLV3llhHAKMX2ti+LJ3yZ4mHoneksY3eQBIJ4Ni/kHXy+ErsAf+U1v bPdMe6psb+rsJqI876iIKWhkMQXN0y9SM2/oCghXVes76cSO4gX5GOPVxyDioi8+nL39 wylVk0p2YS9z1u+D9TUpp3CkunNOBCdg39gdz6RSMtivtZSyOF25v++vVM9uhn8cynun xBWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:mime-version:content-transfer-encoding:fcc:to:cc; bh=FpFxPc+QcmTYNUPNiRVEoOstnUf1weEtg8E6bXT4nYU=; b=m/DHNYNKMmTLnkjf/XlhwBWV5fWxmmweX6ZfSlQm8xR2aHuPX0mhXqTlUOmJgINEv0 JzwIgNoqVyBVbC7xUXJaPY6Xt4TzdfsGZzWaN/9bYi0x5qT8sLGtswkgfCvVtXMCecdk rweLRkZF0wD556J78iER60oJSRFPWDe0TokvQbA51ggdXymEfr3EuNyRZnQkhOnz/I5Q cOE1Y2XCHBkxvBL8MgQXzJ9o05CxE60SPmb46e5R0GmacuWL6CGmgN76cz+T0kyaDeRr q/gNKbs7RY62cNMt5rsJPB/FlNCIdPmSzsmKXyzNT/mqLSVC78Klm1HgZGY4lF1bRzf5 AJ0Q== X-Gm-Message-State: AOAM530pDQHYvCb5rVXRYBafcJAxW3Oc7ANlAvhG9tUPFefJKLA2HG6d lUWGc34xbrynruE2Hcsz3quvpciYBjI= X-Google-Smtp-Source: ABdhPJyW/pIQ3ZaSGVKYwF6SlL4iPY6aRq1mXzsZY7dxvOxvW+lhl6T4DfSpJSHivc46SMwmaEviUw== X-Received: by 2002:adf:e8c9:0:b0:204:116:9e04 with SMTP id k9-20020adfe8c9000000b0020401169e04mr6552435wrn.19.1647813299691; Sun, 20 Mar 2022 14:54:59 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id c8-20020a056000184800b002040e925afasm2300907wri.59.2022.03.20.14.54.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Mar 2022 14:54:59 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Sun, 20 Mar 2022 21:54:51 +0000 Subject: [PATCH 7/7] i18n: factorize unrecognized options arguments messages MIME-Version: 1.0 Fcc: Sent To: git@vger.kernel.org Cc: =?utf-8?q?Jean-No=C3=ABl?= Avila , =?utf-8?q?Jean-No?= =?utf-8?q?=C3=ABl_Avila?= Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: =?utf-8?q?Jean-No=C3=ABl_Avila?= From: =?UTF-8?q?Jean-No=C3=ABl=20Avila?= Signed-off-by: Jean-Noël Avila --- builtin/commit-graph.c | 2 +- builtin/config.c | 2 +- builtin/env--helper.c | 2 +- builtin/gc.c | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/builtin/commit-graph.c b/builtin/commit-graph.c index 51c4040ea6c..1a4c798f908 100644 --- a/builtin/commit-graph.c +++ b/builtin/commit-graph.c @@ -134,7 +134,7 @@ static int write_option_parse_split(const struct option *opt, const char *arg, else if (!strcmp(arg, "replace")) *flags = COMMIT_GRAPH_SPLIT_REPLACE; else - die(_("unrecognized --split argument, %s"), arg); + die(_("unrecognized %s argument '%s'"), "--split", arg); return 0; } diff --git a/builtin/config.c b/builtin/config.c index e7b88a9c08d..aaf87761e58 100644 --- a/builtin/config.c +++ b/builtin/config.c @@ -106,7 +106,7 @@ static int option_parse_type(const struct option *opt, const char *arg, else if (!strcmp(arg, "color")) new_type = TYPE_COLOR; else - die(_("unrecognized --type argument, %s"), arg); + die(_("unrecognized %s argument '%s'"), "--type", arg); } to_type = opt->value; diff --git a/builtin/env--helper.c b/builtin/env--helper.c index 27349098b07..e58e0de9a7b 100644 --- a/builtin/env--helper.c +++ b/builtin/env--helper.c @@ -24,7 +24,7 @@ static int option_parse_type(const struct option *opt, const char *arg, else if (!strcmp(arg, "ulong")) *cmdmode = ENV_HELPER_TYPE_ULONG; else - die(_("unrecognized --type argument, %s"), arg); + die(_("unrecognized %s argument '%s'"), "--type", arg); return 0; } diff --git a/builtin/gc.c b/builtin/gc.c index d512c127b99..1a9ee85a4d3 100644 --- a/builtin/gc.c +++ b/builtin/gc.c @@ -750,7 +750,7 @@ static int maintenance_opt_schedule(const struct option *opt, const char *arg, *priority = parse_schedule(arg); if (!*priority) - die(_("unrecognized --schedule argument '%s'"), arg); + die(_("unrecognized %s argument '%s'"), "--schedule", arg); return 0; } @@ -2393,7 +2393,7 @@ static int maintenance_opt_scheduler(const struct option *opt, const char *arg, *scheduler = parse_scheduler(arg); if (*scheduler == SCHEDULER_INVALID) - return error(_("unrecognized --scheduler argument '%s'"), arg); + return error(_("unrecognized %s argument '%s'"), "--scheduler", arg); return 0; }