git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 0/1] fetch.c: fix typo in a warning message
@ 2019-10-31 20:41 Ralf Thielow via GitGitGadget
  2019-10-31 20:41 ` [PATCH 1/1] " Ralf Thielow via GitGitGadget
  0 siblings, 1 reply; 5+ messages in thread
From: Ralf Thielow via GitGitGadget @ 2019-10-31 20:41 UTC (permalink / raw)
  To: git; +Cc: Corentin BOMPARD, Ralf Thielow, Junio C Hamano

Noticed this while reviewing German translation.

Cc: Matthias Rüster matthias.ruester@gmail.com [matthias.ruester@gmail.com]

Ralf Thielow (1):
  fetch.c: fix typo in a warning message

 builtin/fetch.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


base-commit: f21f8f5d35b09ecdd1a0112f114436fd2eda7df2
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-441%2Fralfth%2Ffetch-fix-warning-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-441/ralfth/fetch-fix-warning-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/441
-- 
gitgitgadget

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH 1/1] fetch.c: fix typo in a warning message
  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 ` Ralf Thielow via GitGitGadget
  2019-10-31 22:53   ` Jonathan Nieder
  0 siblings, 1 reply; 5+ messages in thread
From: Ralf Thielow via GitGitGadget @ 2019-10-31 20:41 UTC (permalink / raw)
  To: git; +Cc: Corentin BOMPARD, Ralf Thielow, Junio C Hamano, Ralf Thielow

From: Ralf Thielow <ralf.thielow@gmail.com>

Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
---
 builtin/fetch.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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"));
 					goto skip;
 				} else {
 					source_ref = rm;
-- 
gitgitgadget

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH 1/1] fetch.c: fix typo in a warning message
  2019-10-31 20:41 ` [PATCH 1/1] " Ralf Thielow via GitGitGadget
@ 2019-10-31 22:53   ` Jonathan Nieder
  2019-11-01  9:48     ` Ralf Thielow
  2019-11-02  5:50     ` Junio C Hamano
  0 siblings, 2 replies; 5+ messages in thread
From: Jonathan Nieder @ 2019-10-31 22:53 UTC (permalink / raw)
  To: Ralf Thielow via GitGitGadget
  Cc: git, Corentin BOMPARD, Ralf Thielow, Junio C Hamano

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

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH 1/1] fetch.c: fix typo in a warning message
  2019-10-31 22:53   ` Jonathan Nieder
@ 2019-11-01  9:48     ` Ralf Thielow
  2019-11-02  5:50     ` Junio C Hamano
  1 sibling, 0 replies; 5+ messages in thread
From: Ralf Thielow @ 2019-11-01  9:48 UTC (permalink / raw)
  To: Jonathan Nieder
  Cc: Ralf Thielow via GitGitGadget, git, Corentin BOMPARD, Junio C Hamano

Am Do., 31. Okt. 2019 um 23:53 Uhr schrieb Jonathan Nieder <jrnieder@gmail.com>:
>
> 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?
>

The message shows up when multiple refspecs/branches are passed,
like

$ git fetch --set-upstream origin master next
From https://github.com/git/git
 * branch                  master     -> FETCH_HEAD
 * branch                  next       -> FETCH_HEAD
warning: multiple branch detected, incompatible with --set-upstream

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH 1/1] fetch.c: fix typo in a warning message
  2019-10-31 22:53   ` Jonathan Nieder
  2019-11-01  9:48     ` Ralf Thielow
@ 2019-11-02  5:50     ` Junio C Hamano
  1 sibling, 0 replies; 5+ messages in thread
From: Junio C Hamano @ 2019-11-02  5:50 UTC (permalink / raw)
  To: Jonathan Nieder
  Cc: Ralf Thielow via GitGitGadget, git, Corentin BOMPARD, Ralf Thielow

Jonathan Nieder <jrnieder@gmail.com> writes:

> 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>
>>  				if (source_ref) {
>> -					warning(_("multiple branch detected, incompatible with --set-upstream"));
>> +					warning(_("multiple branches detected, incompatible with --set-upstream"));
>
> Long line.


Thanks, both.  This close to the final, I am reluctant to touch any
string inside _(), so let's postpone it to the next cycle, though.

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2019-11-02  5:50 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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
2019-11-01  9:48     ` Ralf Thielow
2019-11-02  5:50     ` Junio C Hamano

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).