[PATCH v3] builtin/remote: quote remote name on error to display empty name
- From
Shulhan <m.shulhan@gmail.com>
- Date
- Sep 14, 2018, 15:10 UTC
- Message-ID
- <20180914151031.9217-1-m.shulhan@gmail.com>
When adding new remote name with empty string, git will print the following error message,
fatal: '' is not a valid remote name\n
But when removing remote name with empty string as input, git shows the empty string without quote,
fatal: No such remote: \n
To make these error messages consistent, quote the name of the remote that we tried and failed to find.
Signed-off-by: Shulhan <m.shulhan@gmail.com> Reviewed-by: Junio C Hamano <gitster@pobox.com> --- builtin/remote.c | 6 +++--- t/t5505-remote.sh | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/builtin/remote.c b/builtin/remote.c index 40c6f8a1b..f7edf7f2c 100644 --- a/builtin/remote.c +++ b/builtin/remote.c @@ -626,7 +626,7 @@ static int mv(int argc, const char **argv) oldremote = remote_get(rename.old_name); if (!remote_is_configured(oldremote, 1)) - die(_("No such remote: %s"), rename.old_name); + die(_("No such remote: '%s'"), rename.old_name); if (!strcmp(rename.old_name, rename.new_name) && oldremote->origin != REMOTE_CONFIG) return migrate_file(oldremote); @@ -762,7 +762,7 @@ static int rm(int argc, const char **argv) remote = remote_get(argv[1]); if (!remote_is_configured(remote, 1)) - die(_("No such remote: %s"), argv[1]); + die(_("No such remote: '%s'"), argv[1]); known_remotes.to_delete = remote; for_each_remote(add_known_remote, &known_remotes); @@ -861,7 +861,7 @@ static int get_remote_ref_states(const char *name, states->remote = remote_get(name); if (!states->remote) - return error(_("No such remote: %s"), name); + return error(_("No such remote: '%s'"), name); read_branches(); diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh index 241e6a319..d2a2cdd45 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 )
-- 2.19.0.401.g521b368dc