summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-02-12 12:41:37 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-02-12 12:41:37 -0800
commitdb72f8c940b3c49286fb88958b3c50fe6f0d6319 (patch)
tree7154d7c2c1e8bd77c0e767e9defc90e31a5a958d
parentMerge branch 'ma/filter-branch-doc-caret' (diff)
parentparse-options: lose an unnecessary space in an error message (diff)
downloadtgif-db72f8c940b3c49286fb88958b3c50fe6f0d6319.tar.xz
Merge branch 'jb/parse-options-message-fix'
Error message fix. * jb/parse-options-message-fix: parse-options: lose an unnecessary space in an error message
-rw-r--r--parse-options.c4
-rwxr-xr-xt/t0040-parse-options.sh4
2 files changed, 4 insertions, 4 deletions
diff --git a/parse-options.c b/parse-options.c
index e8c04109ba..a0cef401fc 100644
--- a/parse-options.c
+++ b/parse-options.c
@@ -419,7 +419,7 @@ static void check_typos(const char *arg, const struct option *options)
return;
if (starts_with(arg, "no-")) {
- error(_("did you mean `--%s` (with two dashes ?)"), arg);
+ error(_("did you mean `--%s` (with two dashes)?"), arg);
exit(129);
}
@@ -427,7 +427,7 @@ static void check_typos(const char *arg, const struct option *options)
if (!options->long_name)
continue;
if (starts_with(options->long_name, arg)) {
- error(_("did you mean `--%s` (with two dashes ?)"), arg);
+ error(_("did you mean `--%s` (with two dashes)?"), arg);
exit(129);
}
}
diff --git a/t/t0040-parse-options.sh b/t/t0040-parse-options.sh
index 705a136ed9..9d7c7fdaa2 100755
--- a/t/t0040-parse-options.sh
+++ b/t/t0040-parse-options.sh
@@ -242,7 +242,7 @@ test_expect_success 'Alias options do not contribute to abbreviation' '
'
cat >typo.err <<\EOF
-error: did you mean `--boolean` (with two dashes ?)
+error: did you mean `--boolean` (with two dashes)?
EOF
test_expect_success 'detect possible typos' '
@@ -252,7 +252,7 @@ test_expect_success 'detect possible typos' '
'
cat >typo.err <<\EOF
-error: did you mean `--ambiguous` (with two dashes ?)
+error: did you mean `--ambiguous` (with two dashes)?
EOF
test_expect_success 'detect possible typos' '