@matheusbsbs / matheus-bagliano / commits / 33f3c683ec

setup: update error message to be more meaningful

The error message shown when a flag is found when expecting a filename wasn't clear as it didn't communicate what was wrong using the 'suitable' words in *all* cases. $ git ls-files README.md test-file Correct case, $ git rev-parse README.md --flags README.md --flags fatal: bad flag '--flags' used after filename Incorrect case, $ git grep "some random regex" -n fatal: bad flag '-n' used after filename The above case is incorrect as "some random regex" isn't a filename in this case. Change the error message to be general and communicative. This results in the following output, $ git rev-parse README.md --flags README.md --flags fatal: option '--flags' must come before non-option arguments $ git grep "some random regex" -n fatal: option '-n' must come before non-option arguments Signed-off-by: Kaartic Sivaraam <kaarticsivaraam91196@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Kaartic Sivaraam committed Oct 2, 2017 at 23:00 UTC 33f3c683ecfb702c4cef85383f779ca93c4fc44c

1 file changed +1 -1

setup.c

+1 -1

@@ -230,7 +230,7 @@ void verify_filename(const char *prefix,

230 int diagnose_misspelt_rev)

231 {

232 if (*arg == '-')

233 - die("bad flag '%s' used after filename", arg);

233 + die("option '%s' must come before non-option arguments", arg);

234 if (looks_like_pathspec(arg) || check_filename(prefix, arg))

235 return;

236 die_verify_filename(prefix, arg, diagnose_misspelt_rev);