Merge branch 'ks/verify-filename-non-option-error-message-tweak'

gitster · gitster · commit 2a5aa826eec2 · 2017-10-07T16:27:56.000+09:00
Error message tweak.

* ks/verify-filename-non-option-error-message-tweak:
  setup: update error message to be more meaningful
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -230,7 +230,7 @@ void verify_filename(const char *prefix,`
`230`	`230`	`int diagnose_misspelt_rev)`
`231`	`231`	`{`
`232`	`232`	`if (*arg == '-')`
`233`		`- die("bad flag '%s' used after filename", arg);`
	`233`	`+ die("option '%s' must come before non-option arguments", arg);`
`234`	`234`	`if (looks_like_pathspec(arg) \|\| check_filename(prefix, arg))`
`235`	`235`	`return;`
`236`	`236`	`die_verify_filename(prefix, arg, diagnose_misspelt_rev);`