Merge branch 'jk/misc-resolve-ref-unsafe-fixes'

diff --git a/setup.c b/setup.c
index d777ff34b7daf50fb24a8653a7e26e3e95b8c0c7..03f51e056cd6e672ecd80ba94348173b9d496cc0 100644 (file)
--- 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);