From: Michael Haggerty <mhagger@alum.mit.edu>
Date: Thu, 5 May 2016 12:09:41 +0000 (+0200)
Subject: read_raw_ref(): don't get confused by an empty directory
X-Git-Tag: v2.10.0-rc0~98^2~30
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e167a5673e25b960dce118fb967d54da30b69def;p=thirdparty%2Fgit.git

read_raw_ref(): don't get confused by an empty directory

Even if there is an empty directory where we look for the loose version
of a reference, check for a packed reference before giving up. This
fixes the failing test that was introduced two commits ago.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
---

diff --git a/refs/files-backend.c b/refs/files-backend.c
index ad9cd86457..0cc116d67c 100644
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -1477,7 +1477,16 @@ stat_ref:
 
 	/* Is it a directory? */
 	if (S_ISDIR(st.st_mode)) {
-		errno = EISDIR;
+		/*
+		 * Even though there is a directory where the loose
+		 * ref is supposed to be, there could still be a
+		 * packed ref:
+		 */
+		if (resolve_missing_loose_ref(refname, sha1, flags)) {
+			errno = EISDIR;
+			goto out;
+		}
+		ret = 0;
 		goto out;
 	}
 
diff --git a/t/t1404-update-ref-df-conflicts.sh b/t/t1404-update-ref-df-conflicts.sh
index 16752a999f..6d869d1285 100755
--- a/t/t1404-update-ref-df-conflicts.sh
+++ b/t/t1404-update-ref-df-conflicts.sh
@@ -106,7 +106,7 @@ test_expect_success 'one new ref is a simple prefix of another' '
 
 '
 
-test_expect_failure 'empty directory should not fool rev-parse' '
+test_expect_success 'empty directory should not fool rev-parse' '
 	prefix=refs/e-rev-parse &&
 	git update-ref $prefix/foo $C &&
 	git pack-refs --all &&