Re: [PATCH v2] builtin/remote: quote remote name on error to display empty name
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Sep 13, 2018, 22:01 UTC
- Message-ID
- <xmqqlg85dpkh.fsf@gitster-ct.c.googlers.com>
- In-Reply-To
- <xmqqpnxhdq0z.fsf@gitster-ct.c.googlers.com>
Junio C Hamano <gitster@pobox.com> writes:
> Have you run "make test" with this change? > > I expect at least 5505.10 to fail without adjustment.
For now, I'll queue this on top, and if this turns out to be sufficient, I will squash it in.
t/t5505-remote.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh index 241e6a319d..d2a2cdd453 100755 --- a/t/t5505-remote.sh +++ b/t/t5505-remote.sh @@ -145,7 +145,7 @@ test_expect_success 'remove remote protects local branches' ' test_expect_success 'remove errors out early when deleting non-existent branch' ' ( cd test && - echo "fatal: No such remote: foo" >expect && + echo "fatal: No such remote: '\''foo'\''" >expect && test_must_fail git remote rm foo 2>actual && test_i18ncmp expect actual ) @@ -173,7 +173,7 @@ test_expect_success 'remove remote with a branch without configured merge' ' test_expect_success 'rename errors out early when deleting non-existent branch' ' ( cd test && - echo "fatal: No such remote: foo" >expect && + echo "fatal: No such remote: '\''foo'\''" >expect && test_must_fail git remote rename foo bar 2>actual && test_i18ncmp expect actual )