kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'dd/t5403-modernise' into jch 

Test clean-up.

* dd/t5403-modernise:
  t5403: use test_cmp for post-checkout argument checks
  t5403: introduce check_post_checkout helper function
seen
Junio C Hamano 2026-01-13 10:22:28 -08:00
parent 4279dea14c 7a747f972d
commit 379ee0be81
1 changed files with 30 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
t/t5403-post-checkout-hook.sh
View File

@ -9,9 +9,20 @@ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME

. ./test-lib.sh

# Usage: check_post_checkout <file> <old-ref> <new-ref> <flag>
#
# Verify that the post-checkout hook arguments in <file> match the expected
# values: <old-ref> for the previous HEAD, <new-ref> for the new HEAD, and
# <flag> indicating whether this was a branch checkout (1) or file checkout (0).
check_post_checkout () {
test "$#" = 4 || BUG "check_post_checkout takes 4 args"
echo "old=$2 new=$3 flag=$4" >expect &&
test_cmp expect "$1"
}

test_expect_success setup '
test_hook --setup post-checkout <<-\EOF &&
echo "$@" >.git/post-checkout.args
echo "old=$1 new=$2 flag=$3" >.git/post-checkout.args
EOF
test_commit one &&
test_commit two &&
@ -23,29 +34,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 +67,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 +76,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 +87,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" '
@ -106,10 +112,11 @@ test_rebase --merge
test_expect_success 'post-checkout hook is triggered by clone' '
mkdir -p templates/hooks &&
write_script templates/hooks/post-checkout <<-\EOF &&
echo "$@" >"$GIT_DIR/post-checkout.args"
echo "old=$1 new=$2 flag=$3" >"$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