Re: [PATCH 1/1] fetch.c: fix typo in a warning message

From: Jonathan Nieder <jrnieder@gmail.com>
Date: Oct 31, 2019, 22:53 UTC
Message-ID: <20191031225310.GA211076@google.com>
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.

Show 10 quoted lines

> 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