diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-11-21 22:57:46 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-21 22:57:46 +0900 |
| commit | 1fae869ef22c7599694c93d8ca40f36ecb916e16 (patch) | |
| tree | a17a8d35851c2b75cc40f1fbc2cd1ef9b3c23d34 | |
| parent | Merge branch 'jt/lazy-object-fetch-fix' into maint (diff) | |
| parent | builtin/remote: quote remote name on error to display empty name (diff) | |
| download | tgif-1fae869ef22c7599694c93d8ca40f36ecb916e16.tar.xz | |
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
| -rw-r--r-- | builtin/remote.c | 6 | ||||
| -rwxr-xr-x | t/t5505-remote.sh | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/builtin/remote.c b/builtin/remote.c index 7876db1c20..5fd1012faa 100644 --- a/builtin/remote.c +++ b/builtin/remote.c @@ -625,7 +625,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); @@ -761,7 +761,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); @@ -860,7 +860,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 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 ) |