Merge branch 'dl/complete-cherry-pick-revert-skip'

diff --git a/t/t5530-upload-pack-error.sh b/t/t5530-upload-pack-error.sh
index 4f6e32b04c48b7723a2b9dc172cd2104c3349e0b..a1d3031d40dcc3d9234c3a5f37c4130c78f7f499 100755 (executable)
--- a/t/t5530-upload-pack-error.sh
+++ b/t/t5530-upload-pack-error.sh
@@ -57,13 +57,25 @@ test_expect_success 'upload-pack fails due to error in rev-list' '
        grep "bad tree object" output.err
 '
 
-test_expect_success 'upload-pack error message when bad ref requested' '
+test_expect_success 'upload-pack fails due to bad want (no object)' '
 
        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 bad want (not tip)' '
+
+       oid=$(echo an object we have | git hash-object -w --stdin) &&
+       printf "0045want %s multi_ack_detailed\n00000009done\n0000" \
+               "$oid" >input &&
+       test_must_fail git upload-pack . <input >output 2>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' '