diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-11-21 16:57:46 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-21 16:57:46 +0300 |
| commit | 1fae869ef22c7599694c93d8ca40f36ecb916e16 (patch) | |
| tree | a17a8d35851c2b75cc40f1fbc2cd1ef9b3c23d34 /t | |
| parent | 2e168d77020f9d448c768bf0fb72f14021d13a99 (diff) | |
| parent | 5025425dffffb4424b746de9209f874ab8b5d179 (diff) | |
Merge branch 'ms/remote-error-message-update' into maint
Update error messages given by "git remote" and make them consistent.
* ms/remote-error-message-update:
builtin/remote: quote remote name on error to display empty name
Diffstat (limited to 't')
| -rwxr-xr-x | t/t5505-remote.sh | 4 |
1 files 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 ) |