undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hook tests: use a modern style for "pre-push" tests

Browse Source 
Indent the here-docs and use "test_cmp" instead of "diff" in tests
added in ec55559f93 (push: Add support for pre-push hooks,
2013-01-13). Let's also use the more typical "expect" instead of
"expected" to be consistent with the rest of the test file.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ævar Arnfjörð Bjarmason 2022-02-18 21:52:59 +01:00 committed by Junio C Hamano
parent bbd837f040
commit 4454015767
1 changed files with 36 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
t/t5571-pre-push-hook.sh
View File

@ -61,15 +61,15 @@ echo "$2" >>actual
cat >>actual cat >>actual
EOF EOF
cat >expected <<EOF
parent1
repo1
refs/heads/main $COMMIT2 refs/heads/foreign $COMMIT1
EOF
test_expect_success 'push with hook' ' test_expect_success 'push with hook' '
cat >expect <<-EOF &&
parent1
repo1
refs/heads/main $COMMIT2 refs/heads/foreign $COMMIT1
EOF
git push parent1 main:foreign && git push parent1 main:foreign &&
diff expected actual test_cmp expect actual
' '
test_expect_success 'add a branch' ' test_expect_success 'add a branch' '
@ -80,49 +80,48 @@ test_expect_success 'add a branch' '
COMMIT3="$(git rev-parse HEAD)" COMMIT3="$(git rev-parse HEAD)"
export COMMIT3 export COMMIT3
cat >expected <<EOF
parent1
repo1
refs/heads/other $COMMIT3 refs/heads/foreign $COMMIT2
EOF
test_expect_success 'push to default' ' test_expect_success 'push to default' '
cat >expect <<-EOF &&
parent1
repo1
refs/heads/other $COMMIT3 refs/heads/foreign $COMMIT2
EOF
git push && git push &&
diff expected actual test_cmp expect actual
' '
cat >expected <<EOF
parent1
repo1
refs/tags/one $COMMIT1 refs/tags/tag1 $ZERO_OID
HEAD~ $COMMIT2 refs/heads/prev $ZERO_OID
EOF
test_expect_success 'push non-branches' ' test_expect_success 'push non-branches' '
git push parent1 one:tag1 HEAD~:refs/heads/prev && cat >expect <<-EOF &&
diff expected actual parent1
' repo1
refs/tags/one $COMMIT1 refs/tags/tag1 $ZERO_OID
HEAD~ $COMMIT2 refs/heads/prev $ZERO_OID
EOF
cat >expected <<EOF git push parent1 one:tag1 HEAD~:refs/heads/prev &&
parent1 test_cmp expect actual
repo1 '
(delete) $ZERO_OID refs/heads/prev $COMMIT2
EOF
test_expect_success 'push delete' ' test_expect_success 'push delete' '
cat >expect <<-EOF &&
parent1
repo1
(delete) $ZERO_OID refs/heads/prev $COMMIT2
EOF
git push parent1 :prev && git push parent1 :prev &&
diff expected actual test_cmp expect actual
' '
cat >expected <<EOF
repo1
repo1
HEAD $COMMIT3 refs/heads/other $ZERO_OID
EOF
test_expect_success 'push to URL' ' test_expect_success 'push to URL' '
cat >expect <<-EOF &&
repo1
repo1
HEAD $COMMIT3 refs/heads/other $ZERO_OID
EOF
git push repo1 HEAD && git push repo1 HEAD &&
diff expected actual test_cmp expect actual
' '
test_expect_success 'set up many-ref tests' ' test_expect_success 'set up many-ref tests' '