Merge branch 'ms/remote-error-message-update' into maint

gitster · gitster · commit 1fae869ef22c · 2018-11-21T22:57:46.000+09:00
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
diff --git 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
@@ -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
 	)

Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ test_expect_success 'remove remote protects local branches' '`
`145`	`145`	`test_expect_success 'remove errors out early when deleting non-existent branch' '`
`146`	`146`	`(`
`147`	`147`	`cd test &&`
`148`		`- echo "fatal: No such remote: foo" >expect &&`
	`148`	`+ echo "fatal: No such remote: '\''foo'\''" >expect &&`
`149`	`149`	`test_must_fail git remote rm foo 2>actual &&`
`150`	`150`	`test_i18ncmp expect actual`
`151`	`151`	`)`
`@@ -173,7 +173,7 @@ test_expect_success 'remove remote with a branch without configured merge' '`
`173`	`173`	`test_expect_success 'rename errors out early when deleting non-existent branch' '`
`174`	`174`	`(`
`175`	`175`	`cd test &&`
`176`		`- echo "fatal: No such remote: foo" >expect &&`
	`176`	`+ echo "fatal: No such remote: '\''foo'\''" >expect &&`
`177`	`177`	`test_must_fail git remote rename foo bar 2>actual &&`
`178`	`178`	`test_i18ncmp expect actual`
`179`	`179`	`)`