t1403: split 'show-ref --exists' tests into a separate file

The test file for git-show-ref(1), `t1403-show-ref.sh`, contains a group
of tests for the '--exists' flag. To improve organization and to prepare
for refactoring these tests to be shareable, move the '--exists' tests
and their corresponding setup logic into a self-contained test suite,
`t1422-show-ref-exists.sh`.

This is a pure code-movement refactoring with no change in test coverage
or behavior.

Mentored-by: Patrick Steinhardt <ps@pks.im>
Mentored-by: shejialuo <shejialuo@gmail.com>
Signed-off-by: Meet Soni <meetsoni3017@gmail.com>
Acked-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/meson.build b/t/meson.build
index daf01fb5d0a290e0129c8ed7d02a405994c6e1d6..4d6bc3d38e28a152777c33828cde9c5664ac7404 100644 (file)
--- a/t/meson.build
+++ b/t/meson.build
@@ -205,6 +205,7 @@ integration_tests = [
   't1419-exclude-refs.sh',
   't1420-lost-found.sh',
   't1421-reflog-write.sh',
+  't1422-show-ref-exists.sh',
   't1430-bad-ref-name.sh',
   't1450-fsck.sh',
   't1451-fsck-buffer.sh',
@@ -1216,4 +1217,4 @@ if perl.found() and time.found()
       timeout: 0,
     )
   endforeach
-endif
\ No newline at end of file
+endif

diff --git a/t/t1403-show-ref.sh b/t/t1403-show-ref.sh
index 9da3650e91bac5481300c13c3a0f668d48985de6..36c903ca1901bfd38577310ed3f42201f75fac63 100755 (executable)
--- a/t/t1403-show-ref.sh
+++ b/t/t1403-show-ref.sh
@@ -228,69 +228,4 @@ test_expect_success 'show-ref sub-modes are mutually exclusive' '
        grep "cannot be used together" err
 '
 
-test_expect_success '--exists with existing reference' '
-       git show-ref --exists refs/heads/$GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
-'
-
-test_expect_success '--exists with missing reference' '
-       test_expect_code 2 git show-ref --exists refs/heads/does-not-exist
-'
-
-test_expect_success '--exists does not use DWIM' '
-       test_expect_code 2 git show-ref --exists $GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME 2>err &&
-       grep "reference does not exist" err
-'
-
-test_expect_success '--exists with HEAD' '
-       git show-ref --exists HEAD
-'
-
-test_expect_success '--exists with bad reference name' '
-       test_when_finished "git update-ref -d refs/heads/bad...name" &&
-       new_oid=$(git rev-parse HEAD) &&
-       test-tool ref-store main update-ref msg refs/heads/bad...name $new_oid $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
-       git show-ref --exists refs/heads/bad...name
-'
-
-test_expect_success '--exists with arbitrary symref' '
-       test_when_finished "git symbolic-ref -d refs/symref" &&
-       git symbolic-ref refs/symref refs/heads/$GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME &&
-       git show-ref --exists refs/symref
-'
-
-test_expect_success '--exists with dangling symref' '
-       test_when_finished "git symbolic-ref -d refs/heads/dangling" &&
-       git symbolic-ref refs/heads/dangling refs/heads/does-not-exist &&
-       git show-ref --exists refs/heads/dangling
-'
-
-test_expect_success '--exists with nonexistent object ID' '
-       test-tool ref-store main update-ref msg refs/heads/missing-oid $(test_oid 001) $ZERO_OID REF_SKIP_OID_VERIFICATION &&
-       git show-ref --exists refs/heads/missing-oid
-'
-
-test_expect_success '--exists with non-commit object' '
-       tree_oid=$(git rev-parse HEAD^{tree}) &&
-       test-tool ref-store main update-ref msg refs/heads/tree ${tree_oid} $ZERO_OID REF_SKIP_OID_VERIFICATION &&
-       git show-ref --exists refs/heads/tree
-'
-
-test_expect_success '--exists with directory fails with generic error' '
-       cat >expect <<-EOF &&
-       error: reference does not exist
-       EOF
-       test_expect_code 2 git show-ref --exists refs/heads 2>err &&
-       test_cmp expect err
-'
-
-test_expect_success '--exists with non-existent special ref' '
-       test_expect_code 2 git show-ref --exists FETCH_HEAD
-'
-
-test_expect_success '--exists with existing special ref' '
-       test_when_finished "rm .git/FETCH_HEAD" &&
-       git rev-parse HEAD >.git/FETCH_HEAD &&
-       git show-ref --exists FETCH_HEAD
-'
-
 test_done

diff --git a/t/t1422-show-ref-exists.sh b/t/t1422-show-ref-exists.sh
new file mode 100644 (file)
index 0000000..0eccb2d
--- /dev/null
+++ b/t/t1422-show-ref-exists.sh
@@ -0,0 +1,83 @@
+#!/bin/sh
+
+test_description='show-ref --exists'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+. ./test-lib.sh
+
+test_expect_success setup '
+       test_commit --annotate A &&
+       git checkout -b side &&
+       test_commit --annotate B &&
+       git checkout main &&
+       test_commit C &&
+       git branch B A^0
+'
+
+test_expect_success '--exists with existing reference' '
+       git show-ref --exists refs/heads/$GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+'
+
+test_expect_success '--exists with missing reference' '
+       test_expect_code 2 git show-ref --exists refs/heads/does-not-exist
+'
+
+test_expect_success '--exists does not use DWIM' '
+       test_expect_code 2 git show-ref --exists $GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME 2>err &&
+       grep "reference does not exist" err
+'
+
+test_expect_success '--exists with HEAD' '
+       git show-ref --exists HEAD
+'
+
+test_expect_success '--exists with bad reference name' '
+       test_when_finished "git update-ref -d refs/heads/bad...name" &&
+       new_oid=$(git rev-parse HEAD) &&
+       test-tool ref-store main update-ref msg refs/heads/bad...name $new_oid $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
+       git show-ref --exists refs/heads/bad...name
+'
+
+test_expect_success '--exists with arbitrary symref' '
+       test_when_finished "git symbolic-ref -d refs/symref" &&
+       git symbolic-ref refs/symref refs/heads/$GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME &&
+       git show-ref --exists refs/symref
+'
+
+test_expect_success '--exists with dangling symref' '
+       test_when_finished "git symbolic-ref -d refs/heads/dangling" &&
+       git symbolic-ref refs/heads/dangling refs/heads/does-not-exist &&
+       git show-ref --exists refs/heads/dangling
+'
+
+test_expect_success '--exists with nonexistent object ID' '
+       test-tool ref-store main update-ref msg refs/heads/missing-oid $(test_oid 001) $ZERO_OID REF_SKIP_OID_VERIFICATION &&
+       git show-ref --exists refs/heads/missing-oid
+'
+
+test_expect_success '--exists with non-commit object' '
+       tree_oid=$(git rev-parse HEAD^{tree}) &&
+       test-tool ref-store main update-ref msg refs/heads/tree ${tree_oid} $ZERO_OID REF_SKIP_OID_VERIFICATION &&
+       git show-ref --exists refs/heads/tree
+'
+
+test_expect_success '--exists with directory fails with generic error' '
+       cat >expect <<-EOF &&
+       error: reference does not exist
+       EOF
+       test_expect_code 2 git show-ref --exists refs/heads 2>err &&
+       test_cmp expect err
+'
+
+test_expect_success '--exists with non-existent special ref' '
+       test_expect_code 2 git show-ref --exists FETCH_HEAD
+'
+
+test_expect_success '--exists with existing special ref' '
+       test_when_finished "rm .git/FETCH_HEAD" &&
+       git rev-parse HEAD >.git/FETCH_HEAD &&
+       git show-ref --exists FETCH_HEAD
+'
+
+test_done