summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-03-01 20:59:41 -0800
committerJunio C Hamano <gitster@pobox.com>2012-03-01 20:59:41 -0800
commit7bb3beaf4fe81176aa2946e639ee75b1a9d4744c (patch)
treef0fdff1204804a10730199a207fdda18124e90ef /t
parent66b8800e53b20cda13446b462531641884089a77 (diff)
parentc6a13b2c86b71cb25011094ff2dee3d7769991a2 (diff)
downloadgit-7bb3beaf4fe81176aa2946e639ee75b1a9d4744c.tar.gz
Merge branch 'cb/fsck-squelch-dangling'
* cb/fsck-squelch-dangling: fsck: --no-dangling omits "dangling object" information
Diffstat (limited to 't')
-rwxr-xr-xt/t1450-fsck.sh6
1 files changed, 1 insertions, 5 deletions
diff --git a/t/t1450-fsck.sh b/t/t1450-fsck.sh
index 5b8ebd8053..5b79c51b8c 100755
--- a/t/t1450-fsck.sh
+++ b/t/t1450-fsck.sh
@@ -27,12 +27,8 @@ test_expect_success 'loose objects borrowed from alternate are not missing' '
git init &&
echo ../../../.git/objects >.git/objects/info/alternates &&
test_commit C fileC one &&
- git fsck >../out 2>&1
+ git fsck --no-dangling >../actual 2>&1
) &&
- {
- grep -v dangling out >actual ||
- :
- } &&
test_cmp empty actual
'