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>
This commit is contained in:
parent
4e0b2bbc57
commit
33a798c880
2
setup.c
2
setup.c
@ -103,7 +103,7 @@ void verify_non_filename(const char *prefix, const char *arg)
|
|||||||
if (!lstat(name, &st))
|
if (!lstat(name, &st))
|
||||||
die("ambiguous argument '%s': both revision and filename\n"
|
die("ambiguous argument '%s': both revision and filename\n"
|
||||||
"Use '--' to separate filenames from revisions", arg);
|
"Use '--' to separate filenames from revisions", arg);
|
||||||
if (errno != ENOENT)
|
if (errno != ENOENT && errno != ENOTDIR)
|
||||||
die("'%s': %s", arg, strerror(errno));
|
die("'%s': %s", arg, strerror(errno));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user