diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-03-31 22:09:32 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-31 22:09:32 (GMT) |
| commit | 970957dbad9361de75bf712cd2049853189b428f (patch) | |
| tree | 4756494c6424a4f91f5e3f35348261278162f4bf /t | |
| parent | 4318d3ba8fcb136a6ba3beaebaac8f47086bbf5f (diff) | |
| parent | e01de1c9122c3cba118da19fe0ba0ce913fa7285 (diff) | |
| download | git-970957dbad9361de75bf712cd2049853189b428f.zip git-970957dbad9361de75bf712cd2049853189b428f.tar.gz git-970957dbad9361de75bf712cd2049853189b428f.tar.bz2 | |
Merge branch 'jc/maint-refs-dangling' into maint
* jc/maint-refs-dangling:
refs: ref entry with NULL sha1 is can be a dangling symref
Diffstat (limited to 't')
| -rwxr-xr-x | t/t5505-remote.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh index a82c5ff..2692050 100755 --- a/t/t5505-remote.sh +++ b/t/t5505-remote.sh @@ -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 |