summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-10-07 16:27:55 +0900
committerJunio C Hamano <gitster@pobox.com>2017-10-07 16:27:56 +0900
commit2a5aa826eec2eec64b4065f599ee7fb613a871ba (patch)
treee0d0b23ccbef143358d5135a78d7f483fdba4579
parent932b573406fda922d8edbecb0d7f9ad3ce9155ec (diff)
parent33f3c683ecfb702c4cef85383f779ca93c4fc44c (diff)
downloadgit-2a5aa826eec2eec64b4065f599ee7fb613a871ba.tar.gz
Merge branch 'ks/verify-filename-non-option-error-message-tweak'
Error message tweak. * ks/verify-filename-non-option-error-message-tweak: setup: update error message to be more meaningful
-rw-r--r--setup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/setup.c b/setup.c
index d777ff34b7..03f51e056c 100644
--- a/setup.c
+++ b/setup.c
@@ -230,7 +230,7 @@ void verify_filename(const char *prefix,
int diagnose_misspelt_rev)
{
if (*arg == '-')
- die("bad flag '%s' used after filename", arg);
+ die("option '%s' must come before non-option arguments", arg);
if (looks_like_pathspec(arg) || check_filename(prefix, arg))
return;
die_verify_filename(prefix, arg, diagnose_misspelt_rev);