Merge branch 'mz/empty-rebase-test' into maint

diff --git a/builtin/grep.c b/builtin/grep.c
index fe1726f5ef60d054938eaa849f2ae6020a95f805..29adb0ac9399002b07942711863fa3b353926468 100644 (file)
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -928,7 +928,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
        if (!seen_dashdash) {
                int j;
                for (j = i; j < argc; j++)
-                       verify_filename(prefix, argv[j]);
+                       verify_filename(prefix, argv[j], j == i);
        }
 
        paths = get_pathspec(prefix, argv + i);