diff options
| author |  Michael Haggerty <mhagger@alum.mit.edu> | 2016-05-05 14:09:41 +0200 |
|---|---|---|
| committer | Michael Haggerty <mhagger@alum.mit.edu> | 2016-05-05 16:37:04 +0200 |
| commit | e167a5673e25b960dce118fb967d54da30b69def (patch) | |
| tree | b3c53b071f76ae1c3c50fd49b531a644b06572e9 /t/t1404-update-ref-df-conflicts.sh | |
| parent | commit_ref(): if there is an empty dir in the way, delete it (diff) | |
| download | tgif-e167a5673e25b960dce118fb967d54da30b69def.tar.xz | |
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>
Diffstat (limited to 't/t1404-update-ref-df-conflicts.sh')
| -rwxr-xr-x | t/t1404-update-ref-df-conflicts.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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 && |