From: "Zbigniew Jędrzejewski-Szmek" <zbyszek@in.waw.pl>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
Subject: Re: [PATCH 2/5] Provide branch name in error message when using @{u}
Date: Thu, 12 Apr 2012 00:13:36 +0200 [thread overview]
Message-ID: <4F860210.5030409@in.waw.pl> (raw)
In-Reply-To: <7v7gxmkv1m.fsf@alter.siamese.dyndns.org>
On 04/11/2012 08:00 PM, Junio C Hamano wrote:
> Zbigniew Jędrzejewski-Szmek<zbyszek@in.waw.pl> writes:
>
>> diff --git a/t/t1507-rev-parse-upstream.sh b/t/t1507-rev-parse-upstream.sh
>> index 1342915..a00b689 100755
>> --- a/t/t1507-rev-parse-upstream.sh
>> +++ b/t/t1507-rev-parse-upstream.sh
>> @@ -135,7 +135,7 @@ test_expect_success 'branch@{u} error message when no upstream' '
>>
>> test_expect_success '@{u} error message when no upstream' '
>> cat>expect<<-EOF&&
>> - error: No upstream branch found for ${sq}${sq}
>> + error: No upstream branch found for ${sq}master${sq}
>> fatal: Needed a single revision
>> EOF
>> test_must_fail git rev-parse --verify @{u} 2>actual&&
>
> I am not sure if saying "... for 'master'" is better or "... for the
> current branch" is better. Using different wording reflects the fact that
> the user gave "@{u}" and not "master@{u}".
Hi,
I think that explicitly providing the name of the branch is useless when
the user has a properly configured git prompt which always shows the
current branch. But not everybody does that, and for such people
providing the name in the error message could be useful.
> But I do not care too deeply.
I don't either. I'll wait to see if other people chime in.
> Either way, it is a vast improvement over
> the current "... for ''" output.
> And the "detached" case is definitely better.
Thanks!
Thank you for the review. I'll send a reroll taking into account your
and Matthieu's comments in a day or two if nobody else comments.
Zbyszek
next prev parent reply other threads:[~2012-04-11 22:13 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-11 16:17 [PATCH 0/5] provide better error messages for @{upstream} Zbigniew Jędrzejewski-Szmek
2012-04-11 16:17 ` [PATCH 1/5] t1507: add additional tests " Zbigniew Jędrzejewski-Szmek
2012-04-11 17:52 ` Junio C Hamano
2012-04-11 17:57 ` Junio C Hamano
2012-04-11 21:51 ` Zbigniew Jędrzejewski-Szmek
2012-04-11 17:59 ` Matthieu Moy
2012-04-11 22:05 ` Zbigniew Jędrzejewski-Szmek
2012-04-11 16:17 ` [PATCH 2/5] Provide branch name in error message when using @{u} Zbigniew Jędrzejewski-Szmek
2012-04-11 18:00 ` Junio C Hamano
2012-04-11 22:13 ` Zbigniew Jędrzejewski-Szmek [this message]
2012-04-11 16:17 ` [PATCH 3/5] Provide better message for barnhc_wiht_tpyo@{u} Zbigniew Jędrzejewski-Szmek
2012-04-11 16:17 ` [PATCH 4/5] Be more specific if upstream branch is not fetched Zbigniew Jędrzejewski-Szmek
2012-04-12 5:30 ` Jeff King
2012-04-12 9:15 ` Zbigniew Jędrzejewski-Szmek
2012-04-12 15:15 ` Junio C Hamano
2012-04-12 20:40 ` Jeff King
2012-04-14 7:54 ` [PATCH v2 0/5] provide better error messages for @{upstream} Zbigniew Jędrzejewski-Szmek
2012-04-14 7:54 ` [PATCH v2 1/5] t1507: add tests to document @{upstream} behaviour Zbigniew Jędrzejewski-Szmek
2012-04-14 7:54 ` [PATCH v2 2/5] Provide branch name in error message when using @{u} Zbigniew Jędrzejewski-Szmek
2012-04-14 7:54 ` [PATCH v2 3/5] Provide better message for barnhc_wiht_tpyo@{u} Zbigniew Jędrzejewski-Szmek
2012-04-14 7:54 ` [PATCH v2 4/5] Be more specific if upstream branch is not tracked Zbigniew Jędrzejewski-Szmek
2012-04-14 7:54 ` [PATCH v2 5/5] i18n: mark @{upstream} error messages for translation Zbigniew Jędrzejewski-Szmek
2012-04-14 8:09 ` [PATCH v2 0/5] provide better error messages for @{upstream} Jeff King
2012-04-11 16:17 ` [PATCH 5/5] i18n: mark @{upstream} error messages for translation Zbigniew Jędrzejewski-Szmek
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=4F860210.5030409@in.waw.pl \
--to=zbyszek@in.waw.pl \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).