summaryrefslogtreecommitdiff
path: root/setup.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-08-06 07:20:06 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-08-06 07:25:35 (GMT)
commit33a798c880f9a8bed1fe95531349e5e5ef1e0cd2 (patch)
treee61b0b1fcdb9efdc8fa87b05a90c3959afa929be /setup.c
parent4e0b2bbc578f8729cf43939acb36e8db02ed8825 (diff)
downloadgit-33a798c880f9a8bed1fe95531349e5e5ef1e0cd2.zip
git-33a798c880f9a8bed1fe95531349e5e5ef1e0cd2.tar.gz
git-33a798c880f9a8bed1fe95531349e5e5ef1e0cd2.tar.bz2
setup.c:verify_non_filename(): don't die unnecessarily while disambiguating
If you have a working tree _file_ "foo", attempt to refer to a branch "foo/bar" without -- to disambiguate, like this: $ git log foo/bar tried to make sure that foo/bar cannot be naming a working tree file "foo/bar" (in which case we would say "which one do you want? A rev or a working tree file? clarify with -- please"). We run lstat("foo/bar") to check that. If it does not succeed, there is no ambiguity. That is good. But we also checked the error status for the lstat() and expected it to fail with ENOENT. In this particular case, however, it fails with ENOTDIR. That should be treated as "expected error" as well. Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 a45ea83..2b8e8c0 100644
--- a/setup.c
+++ b/setup.c
@@ -103,7 +103,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));
}