From: Jonathan Nieder <jrnieder@gmail.com>
To: Ralf Thielow via GitGitGadget <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org,
Corentin BOMPARD <corentin.bompard@etu.univ-lyon1.fr>,
Ralf Thielow <ralf.thielow@gmail.com>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH 1/1] fetch.c: fix typo in a warning message
Date: Thu, 31 Oct 2019 15:53:10 -0700 [thread overview]
Message-ID: <20191031225310.GA211076@google.com> (raw)
In-Reply-To: <70f10fe44716e50765a9d8f7794116f390f09dbc.1572554506.git.gitgitgadget@gmail.com>
Ralf Thielow wrote:
> Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
> ---
> builtin/fetch.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
> Noticed this while reviewing German translation.
This kind of context tends to be useful in a commit message --- it
helps clarify the motivation behind the change.
> diff --git a/builtin/fetch.c b/builtin/fetch.c
> index 0c345b5dfe..f9a934f098 100644
> --- a/builtin/fetch.c
> +++ b/builtin/fetch.c
> @@ -1411,7 +1411,7 @@ static int do_fetch(struct transport *transport,
> for (rm = ref_map; rm; rm = rm->next) {
> if (!rm->peer_ref) {
> if (source_ref) {
> - warning(_("multiple branch detected, incompatible with --set-upstream"));
> + warning(_("multiple branches detected, incompatible with --set-upstream"));
Long line.
I wonder what this warning is trying to say. How would I go about
triggering this message? The comment before says
The relevant upstream is the fetched branch that is meant to
be merged with the current one, i.e. the one fetched to
FETCH_HEAD.
So is this about when I'm fetching with a wildcard or something?
Thanks,
Jonathan
next prev parent reply other threads:[~2019-10-31 22:53 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-31 20:41 [PATCH 0/1] fetch.c: fix typo in a warning message Ralf Thielow via GitGitGadget
2019-10-31 20:41 ` [PATCH 1/1] " Ralf Thielow via GitGitGadget
2019-10-31 22:53 ` Jonathan Nieder [this message]
2019-11-01 9:48 ` Ralf Thielow
2019-11-02 5:50 ` Junio C Hamano
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191031225310.GA211076@google.com \
--to=jrnieder@gmail.com \
--cc=corentin.bompard@etu.univ-lyon1.fr \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=ralf.thielow@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.
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 NNTP newsgroup(s).