Jonathan Tan <jonathanta...@google.com> writes:

> diff --git a/t/t5702-protocol-v2.sh b/t/t5702-protocol-v2.sh
> index db4ae09f2f..6dbe2e9584 100755
> --- a/t/t5702-protocol-v2.sh
> +++ b/t/t5702-protocol-v2.sh
> @@ -656,6 +656,60 @@ test_expect_success 'when server does not send "ready", 
> expect FLUSH' '
>       test_i18ngrep "expected no other sections to be sent after no .ready." 
> err
>  '
>  
> +test_expect_success 'part of packfile response provided as URI' '
> ...
> +             if test "$(grep "^[0-9a-f]\{40\} " out | wc -l)" = 1
> +             then

Against this, test-lint-shell-syntax barks.  You'd have seen it if
you did "make test".

I am not sure hard-coding 40 here is a good idea for longer term, as
we are *not* testing that the output from "verify-pack --verbose"
shows the full object name in SHA-1 hash.

Perhaps squash something like this in ("16" is of course negotiable)?

 t/t5702-protocol-v2.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/t/t5702-protocol-v2.sh b/t/t5702-protocol-v2.sh
index 6dbe2e9584..e9950f0853 100755
--- a/t/t5702-protocol-v2.sh
+++ b/t/t5702-protocol-v2.sh
@@ -694,7 +694,10 @@ test_expect_success 'part of packfile response provided as 
URI' '
        for idx in http_child/.git/objects/pack/*.idx
        do
                git verify-pack --verbose $idx >out &&
-               if test "$(grep "^[0-9a-f]\{40\} " out | wc -l)" = 1
+               {
+                       grep "^[0-9a-f]\{16,\} " out || :
+               } >out.objectlist &&
+               if test_line_count = 1 out.objectlist
                then
                        if grep $(cat h) out
                        then

Reply via email to