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>
This commit is contained in:

committed by
Junio C Hamano

parent
5667141e3b
commit
2c5691d6cf
@ -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" '
|
||||
|
Reference in New Issue
Block a user