diff options
| author | Jeff King <peff@peff.net> | 2019-04-13 05:53:09 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-04-15 05:00:51 (GMT) |
| commit | 6963a4e4e1fe7b4668a954eeb05feab98d625ddc (patch) | |
| tree | bdca47e57534aaf3a0eb05ad1550b2dd0527eda4 | |
| parent | 98024d1cb6cc2b6d9a0672c60d0f8efcda5b5555 (diff) | |
| download | git-6963a4e4e1fe7b4668a954eeb05feab98d625ddc.zip git-6963a4e4e1fe7b4668a954eeb05feab98d625ddc.tar.gz git-6963a4e4e1fe7b4668a954eeb05feab98d625ddc.tar.bz2 | |
t5530: check protocol response for "not our ref"
Back in 9f9aa76130 (upload-pack: Improve error message when bad ref
requested, 2010-07-31), we added a test to make sure that we die with a
sensible message when the client asks for an object we don't have.
Much later, in bdb31eada7 (upload-pack: report "not our ref" to client,
2017-02-23), we started reporting that information via an "ERR" line in
the protocol. Let's check that part, as well.
While we're touching this test, let's drop the "-q" on the grep calls.
Our usual test style just relies on --verbose to control output.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t5530-upload-pack-error.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/t/t5530-upload-pack-error.sh b/t/t5530-upload-pack-error.sh index 4f6e32b..295bd0c 100755 --- a/t/t5530-upload-pack-error.sh +++ b/t/t5530-upload-pack-error.sh @@ -62,8 +62,9 @@ test_expect_success 'upload-pack error message when bad ref requested' ' printf "0045want %s multi_ack_detailed\n00000009done\n0000" \ "deadbeefdeadbeefdeadbeefdeadbeefdeadbeef" >input && test_must_fail git upload-pack . <input >output 2>output.err && - grep -q "not our ref" output.err && - ! grep -q multi_ack_detailed output.err + grep "not our ref" output.err && + grep "ERR" output && + ! grep multi_ack_detailed output.err ' test_expect_success 'upload-pack fails due to error in pack-objects enumeration' ' |