summaryrefslogtreecommitdiff
path: root/diff-files.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-05-20 16:48:38 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-20 17:08:56 (GMT)
commit411746940f02f6fb90c4b6b97c6f07cee599c2e1 (patch)
tree665a48af9e192ed84d2707c95d4c0d9c45eb45ad /diff-files.c
parent63713028cd2c747b225c110193f63caff0f58aeb (diff)
downloadgit-411746940f02f6fb90c4b6b97c6f07cee599c2e1.zip
git-411746940f02f6fb90c4b6b97c6f07cee599c2e1.tar.gz
git-411746940f02f6fb90c4b6b97c6f07cee599c2e1.tar.bz2
[PATCH] Diff-files fix with more tests.
The same check we added earlier to update-cache to catch ENOTDIR turns out to be missing from diff-files. This causes a difference not being reported when you have DF/DF (a file in a subdirectory) in the cache and DF is a file on the filesystem. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'diff-files.c')
-rw-r--r--diff-files.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/diff-files.c b/diff-files.c
index 414b36e..eb99c3c 100644
--- a/diff-files.c
+++ b/diff-files.c
@@ -108,7 +108,7 @@ int main(int argc, char **argv)
}
if (lstat(ce->name, &st) < 0) {
- if (errno != ENOENT) {
+ if (errno != ENOENT && errno != ENOTDIR) {
perror(ce->name);
continue;
}