From: Deveshi Dwivedi <deveshigurgaon@gmail.com>
To: git@vger.kernel.org
Cc: Deveshi Dwivedi <deveshigurgaon@gmail.com>
Subject: [PATCH 1/2] t5403:introduce check_post_checkout helper function
Date: Sun, 11 Jan 2026 07:29:49 +0000 [thread overview]
Message-ID: <20260111072950.9463-2-deveshigurgaon@gmail.com> (raw)
In-Reply-To: <20260111072950.9463-1-deveshigurgaon@gmail.com>
The test file repeatedly uses the same four-line pattern to validate
post-checkout hook arguments: read the args file, then test each of
the three values individually.
Introduce a check_post_checkout helper function that encapsulates this
pattern. This patch does not change test behavior; it prepares the
code for improvement in the next step.
Signed-off-by: Deveshi Dwivedi <deveshigurgaon@gmail.com>
---
t/t5403-post-checkout-hook.sh | 45 +++++++++++++++++++----------------
1 file changed, 24 insertions(+), 21 deletions(-)
diff --git a/t/t5403-post-checkout-hook.sh b/t/t5403-post-checkout-hook.sh
index 1462e3365b..63a2221441 100755
--- a/t/t5403-post-checkout-hook.sh
+++ b/t/t5403-post-checkout-hook.sh
@@ -9,6 +9,13 @@ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
. ./test-lib.sh
+# Helper function to check post-checkout hook arguments
+check_post_checkout () {
+ test "$#" = 4 || BUG "check_post_checkout takes 4 args"
+ read old new flag <"$1" &&
+ test "$old" = "$2" && test "$new" = "$3" && test "$flag" = "$4"
+}
+
test_expect_success setup '
test_hook --setup post-checkout <<-\EOF &&
echo "$@" >.git/post-checkout.args
@@ -23,29 +30,30 @@ test_expect_success setup '
test_expect_success 'post-checkout receives the right arguments with HEAD unchanged ' '
test_when_finished "rm -f .git/post-checkout.args" &&
git checkout main &&
- read old new flag <.git/post-checkout.args &&
- test $old = $new && test $flag = 1
+ check_post_checkout .git/post-checkout.args \
+ "$(git rev-parse HEAD)" "$(git rev-parse HEAD)" 1
'
test_expect_success 'post-checkout args are correct with git checkout -b ' '
test_when_finished "rm -f .git/post-checkout.args" &&
git checkout -b new1 &&
- read old new flag <.git/post-checkout.args &&
- test $old = $new && test $flag = 1
+ check_post_checkout .git/post-checkout.args \
+ "$(git rev-parse HEAD)" "$(git rev-parse HEAD)" 1
'
test_expect_success 'post-checkout receives the right args with HEAD changed ' '
test_when_finished "rm -f .git/post-checkout.args" &&
+ old=$(git rev-parse HEAD) &&
git checkout two &&
- read old new flag <.git/post-checkout.args &&
- test $old != $new && test $flag = 1
+ check_post_checkout .git/post-checkout.args \
+ "$old" "$(git rev-parse HEAD)" 1
'
test_expect_success 'post-checkout receives the right args when not switching branches ' '
test_when_finished "rm -f .git/post-checkout.args" &&
git checkout main -- three.t &&
- read old new flag <.git/post-checkout.args &&
- test $old = $new && test $flag = 0
+ check_post_checkout .git/post-checkout.args \
+ "$(git rev-parse HEAD)" "$(git rev-parse HEAD)" 0
'
test_rebase () {
@@ -55,10 +63,8 @@ test_rebase () {
git checkout -B rebase-test main &&
rm -f .git/post-checkout.args &&
git rebase $args rebase-on-me &&
- read old new flag <.git/post-checkout.args &&
- test_cmp_rev main $old &&
- test_cmp_rev rebase-on-me $new &&
- test $flag = 1
+ check_post_checkout .git/post-checkout.args \
+ "$(git rev-parse main)" "$(git rev-parse rebase-on-me)" 1
'
test_expect_success "post-checkout is triggered on rebase $args with fast-forward" '
@@ -66,10 +72,8 @@ test_rebase () {
git checkout -B ff-rebase-test rebase-on-me^ &&
rm -f .git/post-checkout.args &&
git rebase $args rebase-on-me &&
- read old new flag <.git/post-checkout.args &&
- test_cmp_rev rebase-on-me^ $old &&
- test_cmp_rev rebase-on-me $new &&
- test $flag = 1
+ check_post_checkout .git/post-checkout.args \
+ "$(git rev-parse rebase-on-me^)" "$(git rev-parse rebase-on-me)" 1
'
test_expect_success "rebase $args fast-forward branch checkout runs post-checkout hook" '
@@ -79,10 +83,8 @@ test_rebase () {
git checkout two &&
rm -f .git/post-checkout.args &&
git rebase $args HEAD rebase-fast-forward &&
- read old new flag <.git/post-checkout.args &&
- test_cmp_rev two $old &&
- test_cmp_rev three $new &&
- test $flag = 1
+ check_post_checkout .git/post-checkout.args \
+ "$(git rev-parse two)" "$(git rev-parse three)" 1
'
test_expect_success "rebase $args checkout does not remove untracked files" '
@@ -109,7 +111,8 @@ test_expect_success 'post-checkout hook is triggered by clone' '
echo "$@" >"$GIT_DIR/post-checkout.args"
EOF
git clone --template=templates . clone3 &&
- test_path_is_file clone3/.git/post-checkout.args
+ check_post_checkout clone3/.git/post-checkout.args \
+ "$(test_oid zero)" "$(git -C clone3 rev-parse HEAD)" 1
'
test_done
--
2.52.0.230.gd8af7cadaa
next prev parent reply other threads:[~2026-01-11 7:30 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-01-11 7:29 [PATCH 0/2] t5403: improve post-checkout hook testing Deveshi Dwivedi
2026-01-11 7:29 ` Deveshi Dwivedi [this message]
2026-01-11 7:53 ` [PATCH 1/2] t5403:introduce check_post_checkout helper function Eric Sunshine
2026-01-11 11:01 ` Pushkar Singh
2026-01-12 6:44 ` Deveshi Dwivedi
2026-01-11 12:10 ` [PATCH] t5403: document check_post_checkout helper Pushkar Singh
2026-01-11 7:29 ` [PATCH 2/2] t5403: use test_cmp for post-checkout argument checks Deveshi Dwivedi
2026-01-12 6:52 ` [PATCH v2 0/2] t5403: improve post-checkout hook testing Deveshi Dwivedi
2026-01-12 6:53 ` [PATCH v2 1/2] t5403:introduce check_post_checkout helper function Deveshi Dwivedi
2026-01-12 14:48 ` Junio C Hamano
2026-01-12 6:53 ` [PATCH v2 2/2] t5403: use test_cmp for post-checkout argument checks Deveshi Dwivedi
2026-01-12 16:36 ` [PATCH v3 0/2] t5403: improve post-checkout hook testing Deveshi Dwivedi
2026-01-12 16:36 ` [PATCH v3 1/2] t5403:introduce check_post_checkout helper function Deveshi Dwivedi
2026-01-12 16:36 ` [PATCH v3 2/2] t5403: use test_cmp for post-checkout argument checks Deveshi Dwivedi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260111072950.9463-2-deveshigurgaon@gmail.com \
--to=deveshigurgaon@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox