diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-10-08 11:43:10 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-10-08 11:43:10 -0700 |
| commit | d519e4594c17ea30e33432dd712d2d0887aaf8c7 (patch) | |
| tree | 057cc6fe6dc0733969441d80201ba1f13f5496d6 | |
| parent | Merge branch 'jc/merge-bases-paint-fix' (diff) | |
| parent | t1450: the order the objects are checked is undefined (diff) | |
| download | git-d519e4594c17ea30e33432dd712d2d0887aaf8c7.tar.gz git-d519e4594c17ea30e33432dd712d2d0887aaf8c7.zip | |
Merge branch 'jc/maint-t1450-fsck-order-fix'
The fsck test assumed too much on what kind of error it will
detect. The only important thing is the inconsistency is detected
as an error.
* jc/maint-t1450-fsck-order-fix:
t1450: the order the objects are checked is undefined
| -rwxr-xr-x | t/t1450-fsck.sh | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/t/t1450-fsck.sh b/t/t1450-fsck.sh index bf7a2cd6fb..08aa24ca15 100755 --- a/t/t1450-fsck.sh +++ b/t/t1450-fsck.sh @@ -177,9 +177,7 @@ test_expect_success 'tag pointing to something else than its type' ' test_when_finished "remove_object $tag" && echo $tag >.git/refs/tags/wrong && test_when_finished "git update-ref -d refs/tags/wrong" && - test_must_fail git fsck --tags 2>out && - cat out && - grep "error in tag.*broken links" out + test_must_fail git fsck --tags ' test_expect_success 'cleaned up' ' |