aboutsummaryrefslogtreecommitdiff
path: root/setup.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-08-06 01:37:10 -0700
committerJunio C Hamano <gitster@pobox.com>2007-08-06 01:37:10 -0700
commita6954452ecf757523b31d6eaaf7e00c7a2d91e46 (patch)
tree83019fdce5742e2c84ca2278835e8da1b629fe33 /setup.c
parenta76c2acb28146f5630592f2ba738c0ebf0f3c1c4 (diff)
parent93969438dca50c7f0039fcf35e7ab82776d4122f (diff)
downloadgit-a6954452ecf757523b31d6eaaf7e00c7a2d91e46.tar.gz
git-a6954452ecf757523b31d6eaaf7e00c7a2d91e46.tar.xz
Merge branch 'maint'
* maint: apply: remove directory that becomes empty by renaming the last file away setup.c:verify_non_filename(): don't die unnecessarily while disambiguating
Diffstat (limited to 'setup.c')
-rw-r--r--setup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/setup.c b/setup.c
index 4945eb313..b55b82c99 100644
--- 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));
}