From: Dennis Stosberg <dennis@stosberg.net>
Date: Mon, 2 Oct 2006 17:23:53 +0000 (+0200)
Subject: lock_ref_sha1_basic does not remove empty directories on BSD
X-Git-Tag: v1.4.4-rc1~44^2~13^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7a21632fa346df58d94d32f09625025931ef13ec;p=git.git

lock_ref_sha1_basic does not remove empty directories on BSD

lock_ref_sha1_basic relies on errno beeing set to EISDIR by the
call to read() in resolve_ref() to detect directories.  But calling
read() on a directory under NetBSD returns EPERM, and even succeeds
for local filesystems on FreeBSD.

Signed-off-by: Dennis Stosberg <dennis@stosberg.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/refs.c b/refs.c
index 5e653141c..98327d798 100644
--- a/refs.c
+++ b/refs.c
@@ -42,6 +42,12 @@ const char *resolve_ref(const char *path, unsigned char *sha1, int reading)
 			}
 		}
 
+		/* Is it a directory? */
+		if (S_ISDIR(st.st_mode)) {
+			errno = EISDIR;
+			return NULL;
+		}
+
 		/*
 		 * Anything else, just open it and try to use it as
 		 * a ref