fetch: split out tests for output format

We're about to introduce a new porcelain mode for the output of
git-fetch(1). As part of that we'll be introducing a set of new tests
that only relate to the output of this command.

Split out tests that exercise the output format of git-fetch(1) so that
it becomes easier to verify this functionality as a standalone unit. As
the tests assume that the default branch is called "main" we set up the
corresponding GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME environment variable
accordingly.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh
index dc44da9c7978ab37e503614cb7524e8c6ba81632..4f289063ced85dc2beabde28788c191a20bf9634 100755 (executable)
--- a/t/t5510-fetch.sh
+++ b/t/t5510-fetch.sh
@@ -1118,59 +1118,6 @@ test_expect_success 'fetching with auto-gc does not lock up' '
        )
 '
 
-test_expect_success 'fetch aligned output' '
-       git clone . full-output &&
-       test_commit looooooooooooong-tag &&
-       (
-               cd full-output &&
-               git -c fetch.output=full fetch origin >actual 2>&1 &&
-               grep -e "->" actual | cut -c 22- >../actual
-       ) &&
-       cat >expect <<-\EOF &&
-       main                 -> origin/main
-       looooooooooooong-tag -> looooooooooooong-tag
-       EOF
-       test_cmp expect actual
-'
-
-test_expect_success 'fetch compact output' '
-       git clone . compact &&
-       test_commit extraaa &&
-       (
-               cd compact &&
-               git -c fetch.output=compact fetch origin >actual 2>&1 &&
-               grep -e "->" actual | cut -c 22- >../actual
-       ) &&
-       cat >expect <<-\EOF &&
-       main       -> origin/*
-       extraaa    -> *
-       EOF
-       test_cmp expect actual
-'
-
-test_expect_success '--no-show-forced-updates' '
-       mkdir forced-updates &&
-       (
-               cd forced-updates &&
-               git init &&
-               test_commit 1 &&
-               test_commit 2
-       ) &&
-       git clone forced-updates forced-update-clone &&
-       git clone forced-updates no-forced-update-clone &&
-       git -C forced-updates reset --hard HEAD~1 &&
-       (
-               cd forced-update-clone &&
-               git fetch --show-forced-updates origin 2>output &&
-               test_i18ngrep "(forced update)" output
-       ) &&
-       (
-               cd no-forced-update-clone &&
-               git fetch --no-show-forced-updates origin 2>output &&
-               test_i18ngrep ! "(forced update)" output
-       )
-'
-
 for section in fetch transfer
 do
        test_expect_success "$section.hideRefs affects connectivity check" '

diff --git a/t/t5574-fetch-output.sh b/t/t5574-fetch-output.sh
new file mode 100755 (executable)
index 0000000..f91b654
--- /dev/null
+++ b/t/t5574-fetch-output.sh
@@ -0,0 +1,63 @@
+#!/bin/sh
+
+test_description='git fetch output format'
+
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+. ./test-lib.sh
+
+test_expect_success 'fetch aligned output' '
+       git clone . full-output &&
+       test_commit looooooooooooong-tag &&
+       (
+               cd full-output &&
+               git -c fetch.output=full fetch origin >actual 2>&1 &&
+               grep -e "->" actual | cut -c 22- >../actual
+       ) &&
+       cat >expect <<-\EOF &&
+       main                 -> origin/main
+       looooooooooooong-tag -> looooooooooooong-tag
+       EOF
+       test_cmp expect actual
+'
+
+test_expect_success 'fetch compact output' '
+       git clone . compact &&
+       test_commit extraaa &&
+       (
+               cd compact &&
+               git -c fetch.output=compact fetch origin >actual 2>&1 &&
+               grep -e "->" actual | cut -c 22- >../actual
+       ) &&
+       cat >expect <<-\EOF &&
+       main       -> origin/*
+       extraaa    -> *
+       EOF
+       test_cmp expect actual
+'
+
+test_expect_success '--no-show-forced-updates' '
+       mkdir forced-updates &&
+       (
+               cd forced-updates &&
+               git init &&
+               test_commit 1 &&
+               test_commit 2
+       ) &&
+       git clone forced-updates forced-update-clone &&
+       git clone forced-updates no-forced-update-clone &&
+       git -C forced-updates reset --hard HEAD~1 &&
+       (
+               cd forced-update-clone &&
+               git fetch --show-forced-updates origin 2>output &&
+               test_i18ngrep "(forced update)" output
+       ) &&
+       (
+               cd no-forced-update-clone &&
+               git fetch --no-show-forced-updates origin 2>output &&
+               test_i18ngrep ! "(forced update)" output
+       )
+'
+
+test_done