Am 09.04.2018 um 03:42 schrieb Harald Nordgren:
> diff --git a/t/t5512-ls-remote.sh b/t/t5512-ls-remote.sh
> index 02106c922..83cd35c39 100755
> --- a/t/t5512-ls-remote.sh
> +++ b/t/t5512-ls-remote.sh

> @@ -170,14 +206,18 @@ test_expect_success 'overrides work between mixed 
> transfer/upload-pack hideRefs'
>       grep refs/tags/magic actual
>   '
>   
> +git fetch origin
>   test_expect_success 'ls-remote --symref' '
> -     cat >expect <<-\EOF &&
> +     cat >expect <<-EOF &&
>       ref: refs/heads/master  HEAD
> -     1bd44cb9d13204b0fe1958db0082f5028a16eb3a        HEAD
> -     1bd44cb9d13204b0fe1958db0082f5028a16eb3a        refs/heads/master
> -     1bd44cb9d13204b0fe1958db0082f5028a16eb3a        refs/remotes/origin/HEAD
> -     1bd44cb9d13204b0fe1958db0082f5028a16eb3a        
> refs/remotes/origin/master
> -     1bd44cb9d13204b0fe1958db0082f5028a16eb3a        refs/tags/mark
> +     $(git rev-parse HEAD)   HEAD
> +     $(git rev-parse refs/heads/master)      refs/heads/master
> +     $(git rev-parse HEAD)   refs/remotes/origin/HEAD
> +     $(git rev-parse refs/remotes/origin/master)     
> refs/remotes/origin/master
> +     $(git rev-parse refs/tags/mark) refs/tags/mark
> +     $(git rev-parse refs/tags/mark1.1)      refs/tags/mark1.1
> +     $(git rev-parse refs/tags/mark1.10)     refs/tags/mark1.10
> +     $(git rev-parse refs/tags/mark1.2)      refs/tags/mark1.2
>       EOF
>       git ls-remote --symref >actual &&
>       test_cmp expect actual

Why is fetch called outside of the test?  Its output is shown among the
test messages, where it doesn't belong:

    ok 23 - overrides work between mixed transfer/upload-pack hideRefs
    From /home/lsr/src/git/t/trash directory.t5512-ls-remote/
     * [new branch]      master     -> origin/master
    ok 24 - ls-remote --symref

-- >8 --
Subject: [PATCH] t5512: run git fetch inside test

Do the preparatory fetch inside the test of ls-remote --symref to avoid
cluttering the test output and to be able to catch unexpected fetch
failures.

Signed-off-by: Rene Scharfe <l....@web.de>
---
 t/t5512-ls-remote.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/t/t5512-ls-remote.sh b/t/t5512-ls-remote.sh
index 83cd35c391..6a949484d0 100755
--- a/t/t5512-ls-remote.sh
+++ b/t/t5512-ls-remote.sh
@@ -206,8 +206,8 @@ test_expect_success 'overrides work between mixed 
transfer/upload-pack hideRefs'
        grep refs/tags/magic actual
 '
 
-git fetch origin
 test_expect_success 'ls-remote --symref' '
+       git fetch origin &&
        cat >expect <<-EOF &&
        ref: refs/heads/master  HEAD
        $(git rev-parse HEAD)   HEAD
-- 
2.17.0

Reply via email to