Merge branch 'maint'

[git.git] / setup.c

diff --git a/setup.c b/setup.c
index 4945eb3134c3e047f54e51db25cd0aa81d9c47d7..b55b82c99e2f796700ee95abc8bb5a71e01235ab 100644 (file)
--- a/setup.c
+++ b/setup.c
@@ -107,7 +107,7 @@ void verify_non_filename(const char *prefix, const char *arg)
        if (!lstat(name, &st))
                die("ambiguous argument '%s': both revision and filename\n"
                    "Use '--' to separate filenames from revisions", arg);
-       if (errno != ENOENT)
+       if (errno != ENOENT && errno != ENOTDIR)
                die("'%s': %s", arg, strerror(errno));
 }