From: Junio C Hamano <gitster@pobox.com>
To: Glen Choo <chooglen@google.com>
Cc: git@vger.kernel.org, Jonathan Tan <jonathantanmy@google.com>,
Jiang Xin <worldhello.net@gmail.com>
Subject: Re* [PATCH v7 0/3] fetch: skip unnecessary tasks when using --negotiate-only
Date: Thu, 20 Jan 2022 13:58:43 -0800 [thread overview]
Message-ID: <xmqqk0eugjcc.fsf_-_@gitster.g> (raw)
In-Reply-To: <20220120174942.94231-1-chooglen@google.com> (Glen Choo's message of "Thu, 20 Jan 2022 09:49:39 -0800")
Glen Choo <chooglen@google.com> writes:
> Changes since v6:
> * use standard message format introduced in 246cac8505 (i18n: turn even
> more messages into "cannot be used together" ones, 2022-01-05) (thanks
> Jiang Xin!)
As v6 is already in 'next' since yesterday, let's make it an
incremental update. It would give us a place to spell out why we
consider this change is desirable.
This is a tangent, but I recall there was a talk about "reviewer
checklist". Things like:
- check if we can reuse existing and identical message to reduce
load on translators
- when we are creating a file in a subdirectory of $GIT_DIR, be
prepared to see any directories other than $GIT_DIR itself
missing and create them as necessary
- use safe_create_leading_directories() and adjust_shared_perm() on
things under $GIT_DIR but not in the working tree
may belong there.
I am not sure if it is feasible to create and maintain such a list,
though.
----- >8 --------- >8 --------- >8 --------- >8 -----
Subject: [PATCH] fetch: help translators by reusing the same message template
Follow the example set by 12909b6b (i18n: turn "options are
incompatible" into "cannot be used together", 2022-01-05) and use
the same message string to reduce the need for translation.
Reported-by: Jiang Xin <worldhello.net@gmail.com>
Helped-by: Glen Choo <chooglen@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
builtin/fetch.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git c/builtin/fetch.c w/builtin/fetch.c
index dc6e637428..5c329f9835 100644
--- c/builtin/fetch.c
+++ w/builtin/fetch.c
@@ -2014,7 +2014,8 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
break;
default:
- die(_("--negotiate-only and --recurse-submodules cannot be used together"));
+ die(_("options '%s' and '%s' cannot be used together"),
+ "--negotiate-only", "--recurse-submodules");
}
}
next prev parent reply other threads:[~2022-01-20 21:58 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-07 19:29 [PATCH] builtin/fetch: skip unnecessary tasks when using --negotiate-only Glen Choo
2021-12-09 22:12 ` Jonathan Tan
2021-12-09 22:36 ` Glen Choo
2021-12-13 22:58 ` Jonathan Tan
2021-12-16 18:11 ` Glen Choo
2021-12-17 0:02 ` [PATCH v2] " Glen Choo
2021-12-17 23:35 ` Junio C Hamano
2021-12-20 19:37 ` Glen Choo
2021-12-20 19:56 ` Junio C Hamano
2021-12-20 20:54 ` Glen Choo
2021-12-20 22:12 ` Junio C Hamano
2021-12-21 0:18 ` Glen Choo
2021-12-21 23:07 ` Glen Choo
2021-12-22 0:11 ` [PATCH v3 0/3] " Glen Choo
2021-12-22 0:11 ` [PATCH v3 1/3] builtin/fetch: use goto cleanup in cmd_fetch() Glen Choo
2021-12-22 0:11 ` [PATCH v3 2/3] builtin/fetch: skip unnecessary tasks when using --negotiate-only Glen Choo
2021-12-22 6:42 ` Junio C Hamano
2021-12-22 17:28 ` Glen Choo
2021-12-22 19:29 ` Junio C Hamano
2021-12-22 20:27 ` Glen Choo
2021-12-22 0:11 ` [PATCH v3 3/3] builtin/fetch: die on --negotiate-only and --recurse-submodules Glen Choo
2021-12-22 6:46 ` Junio C Hamano
2021-12-23 19:08 ` Jonathan Tan
2022-01-13 0:44 ` [PATCH v4 0/3] fetch: skip unnecessary tasks when using --negotiate-only Glen Choo
2022-01-13 0:44 ` [PATCH v4 1/3] fetch: use goto cleanup in cmd_fetch() Glen Choo
2022-01-13 0:45 ` [PATCH v4 2/3] fetch: skip tasks related to fetching objects Glen Choo
2022-01-13 0:45 ` [PATCH v4 3/3] fetch --negotiate-only: do not update submodules Glen Choo
2022-01-13 1:16 ` Junio C Hamano
2022-01-18 18:54 ` [PATCH v5 0/3] fetch: skip unnecessary tasks when using --negotiate-only Glen Choo
2022-01-18 18:54 ` [PATCH v5 1/3] fetch: use goto cleanup in cmd_fetch() Glen Choo
2022-01-18 18:54 ` [PATCH v5 2/3] fetch: skip tasks related to fetching objects Glen Choo
2022-01-18 18:54 ` [PATCH v5 3/3] fetch --negotiate-only: do not update submodules Glen Choo
2022-01-18 22:05 ` Junio C Hamano
2022-01-18 23:41 ` Glen Choo
2022-01-19 0:26 ` Junio C Hamano
2022-01-19 0:00 ` [PATCH v6 0/3] fetch: skip unnecessary tasks when using --negotiate-only Glen Choo
2022-01-19 0:00 ` [PATCH v6 1/3] fetch: use goto cleanup in cmd_fetch() Glen Choo
2022-01-19 0:00 ` [PATCH v6 2/3] fetch: skip tasks related to fetching objects Glen Choo
2022-01-19 0:00 ` [PATCH v6 3/3] fetch --negotiate-only: do not update submodules Glen Choo
2022-01-20 2:38 ` Jiang Xin
2022-01-20 17:40 ` Glen Choo
2022-01-20 17:49 ` [PATCH v7 0/3] fetch: skip unnecessary tasks when using --negotiate-only Glen Choo
2022-01-20 17:49 ` [PATCH v7 1/3] fetch: use goto cleanup in cmd_fetch() Glen Choo
2022-01-20 17:49 ` [PATCH v7 2/3] fetch: skip tasks related to fetching objects Glen Choo
2022-01-20 17:49 ` [PATCH v7 3/3] fetch --negotiate-only: do not update submodules Glen Choo
2022-01-20 23:08 ` Junio C Hamano
2022-01-20 23:16 ` Glen Choo
2022-01-20 21:58 ` Junio C Hamano [this message]
2022-01-20 23:15 ` Re* [PATCH v7 0/3] fetch: skip unnecessary tasks when using --negotiate-only Glen Choo
2022-01-21 2:17 ` Jiang Xin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqk0eugjcc.fsf_-_@gitster.g \
--to=gitster@pobox.com \
--cc=chooglen@google.com \
--cc=git@vger.kernel.org \
--cc=jonathantanmy@google.com \
--cc=worldhello.net@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).