Sync with 1.7.5.3

diff --git a/builtin/grep.c b/builtin/grep.c
index 3ee2ec51def59695813ee14f104d142a62d530b6..931eee0d750cd8662347e2a7c8e8a89d23228e17 100644 (file)
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -969,13 +969,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
                        verify_filename(prefix, argv[j]);
        }
 
-       if (i < argc)
-               paths = get_pathspec(prefix, argv + i);
-       else if (prefix) {
-               paths = xcalloc(2, sizeof(const char *));
-               paths[0] = prefix;
-               paths[1] = NULL;
-       }
+       paths = get_pathspec(prefix, argv + i);
        init_pathspec(&pathspec, paths);
        pathspec.max_depth = opt.max_depth;
        pathspec.recursive = 1;