fetch.c: fix typo in a warning message - #441
Conversation
Signed-off-by: Ralf Thielow <[email protected]>
Welcome to GitGitGadgetHi @ralfth, and welcome to GitGitGadget, the GitHub App to send patch series to the Git mailing list from GitHub Pull Requests. Please make sure that this Pull Request has a good description, as it will be used as cover letter. Also, it is a good idea to review the commit messages one last time, as the Git project expects them in a quite specific form:
It is in general a good idea to await the automated test ("Checks") in this Pull Request before contributing the patches, e.g. to avoid trivial issues such as unportable code. Contributing the patchesBefore you can contribute the patches, your GitHub username needs to be added to the list of permitted users. Any already-permitted user can do that, by adding a comment to your PR of the form Both the person who commented An alternative is the channel Once on the list of permitted usernames, you can contribute the patches to the Git mailing list by adding a PR comment After you submit, GitGitGadget will respond with another comment that contains the link to the cover letter mail in the Git mailing list archive. Please make sure to monitor the discussion in that thread and to address comments and suggestions. If you want to see what email(s) would be sent for a submit request, add a PR comment If you do not want to subscribe to the Git mailing list just to be able to respond to a mail, you can download the mbox ("raw") file corresponding to the mail you want to reply to from the Git mailing list. If you use GMail, you can upload that raw mbox file via: curl -g --user "<EMailAddress>:<Password>" --url "imaps://imap.gmail.com/INBOX" -T /path/to/raw.txt |
|
/allow |
|
User ralfth is now allowed to use GitGitGadget. |
|
/submit |
|
Submitted as [email protected] |
![gitgitgadget[bot]](https://avatars.githubusercontent.com/in/12836?s=60&v=4){kind=small}
| @@ -1411,7 +1411,7 @@ static int do_fetch(struct transport *transport, | |||
| for (rm = ref_map; rm; rm = rm->next) { | |||
There was a problem hiding this comment.
On the Git mailing list, Jonathan Nieder wrote (reply to this):
Ralf Thielow wrote:
> Signed-off-by: Ralf Thielow <[email protected]>
> ---
> builtin/fetch.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Reviewed-by: Jonathan Nieder <[email protected]>
> 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
There was a problem hiding this comment.
On the Git mailing list, Ralf Thielow wrote (reply to this):
Am Do., 31. Okt. 2019 um 23:53 Uhr schrieb Jonathan Nieder <[email protected]>:
>
> 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
There was a problem hiding this comment.
On the Git mailing list, Junio C Hamano wrote (reply to this):
Jonathan Nieder <[email protected]> writes:
> Ralf Thielow wrote:
>
>> Signed-off-by: Ralf Thielow <[email protected]>
>> ---
>> builtin/fetch.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> Reviewed-by: Jonathan Nieder <[email protected]>
>> 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.
|
This branch is now known as |
|
This patch series was integrated into pu via git@8e69c66. |
|
This patch series was integrated into pu via git@96fc817. |
|
This patch series was integrated into pu via git@969ad15. |
|
This patch series was integrated into pu via git@04a05c0. |
|
This patch series was integrated into pu via git@d391b1a. |
|
This patch series was integrated into pu via git@5cda4e8. |
|
This patch series was integrated into pu via git@4d0eab0. |
|
This patch series was integrated into pu via git@6522a8c. |
|
This patch series was integrated into pu via git@ea706de. |
|
This patch series was integrated into next via git@69eb337. |
|
This patch series was integrated into pu via git@20a1fcc. |
|
This patch series was integrated into pu via git@8b9bdb6. |
|
This patch series was integrated into pu via git@08cfac8. |
|
This patch series was integrated into pu via git@bd80555. |
|
This patch series was integrated into pu via git@54400cb. |
|
This patch series was integrated into pu via git@7ab2088. |
|
This patch series was integrated into next via git@7ab2088. |
|
This patch series was integrated into master via git@7ab2088. |
|
Closed via 7ab2088. |
2 participants
Noticed this while reviewing German translation.
Cc: Matthias Rüster [email protected]
Cc: Corentin BOMPARD [email protected]