Skip to content

Commit 9899b98

Browse files
committed
Work around a problem identified by BuildHive
Apparently the signal handling is not quite correct in the fsckobject handling (most likely we rely on a side effect that lets us still output some message after receiving a signal 13 but in the BuildHive setup this fails intermittently). As a consequence, the push in t5504 does fail as expected, but fails to output anything (unexpected). Since this is good enough for now, let's handle an empty output as success, too. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 4ef0237 commit 9899b98

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

t/t5504-fetch-receive-strict.sh

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,10 @@ test_expect_success 'push with receive.fsckobjects' '
101101
git config transfer.fsckobjects false
102102
) &&
103103
test_must_fail git push --porcelain dst master:refs/heads/test >act &&
104-
test_cmp exp act
104+
if ! test_cmp exp act
105+
then
106+
test ! -s act
107+
fi
105108
'
106109

107110
test_expect_success 'push with transfer.fsckobjects' '
@@ -112,7 +115,10 @@ test_expect_success 'push with transfer.fsckobjects' '
112115
git config transfer.fsckobjects true
113116
) &&
114117
test_must_fail git push --porcelain dst master:refs/heads/test >act &&
115-
test_cmp exp act
118+
if ! test_cmp exp act
119+
then
120+
test ! -s act
121+
fi
116122
'
117123

118124
cat >bogus-commit <<\EOF

0 commit comments

Comments
 (0)