Merge branch 'jc/maint-refs-dangling'

* jc/maint-refs-dangling:
  refs: ref entry with NULL sha1 is can be a dangling symref
This commit is contained in:
Junio C Hamano
2010-03-24 16:25:34 -07:00
2 changed files with 10 additions and 7 deletions

View File

@ -507,15 +507,15 @@ test_expect_success 'remote prune to cause a dangling symref' '
(
cd seven &&
git remote prune origin
) 2>err &&
) >err 2>&1 &&
grep "has become dangling" err &&
: And the dangling symref will not cause other annoying errors
: And the dangling symref will not cause other annoying errors &&
(
cd seven &&
git branch -a
) 2>err &&
! grep "points nowhere" err
! grep "points nowhere" err &&
(
cd seven &&
test_must_fail git branch nomore origin