From e167a5673e25b960dce118fb967d54da30b69def Mon Sep 17 00:00:00 2001 From: Michael Haggerty Date: Thu, 5 May 2016 14:09:41 +0200 Subject: 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 --- t/t1404-update-ref-df-conflicts.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 't/t1404-update-ref-df-conflicts.sh') 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 && -- cgit v1.2.1