t5403: refactor rebase post-checkout hook tests

These tests only test the default backend and do not check that the
arguments passed to the hook are correct. Fix this by running the
tests with both backends and adding checks for the hook arguments.

Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t5403-post-checkout-hook.sh b/t/t5403-post-checkout-hook.sh
index 1ec9e23be759374258daadf705acd29cb02ff65b..272b02687ba95403f487f6b6dde668a6be4361b1 100755 (executable)
--- a/t/t5403-post-checkout-hook.sh
+++ b/t/t5403-post-checkout-hook.sh
@@ -49,23 +49,33 @@ test_expect_success 'post-checkout receives the right args when not switching br
        test $old = $new && test $flag = 0
 '
 
-test_expect_success 'post-checkout is triggered on rebase' '
-       test_when_finished "rm -f .git/post-checkout.args" &&
-       git checkout -b rebase-test main &&
-       rm -f .git/post-checkout.args &&
-       git rebase rebase-on-me &&
-       read old new flag <.git/post-checkout.args &&
-       test $old != $new && test $flag = 1
-'
+test_rebase () {
+       args="$*" &&
+       test_expect_success "post-checkout is triggered on rebase $args" '
+               test_when_finished "rm -f .git/post-checkout.args" &&
+               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
+       '
 
-test_expect_success 'post-checkout is triggered on rebase with fast-forward' '
-       test_when_finished "rm -f .git/post-checkout.args" &&
-       git checkout -b ff-rebase-test rebase-on-me^ &&
-       rm -f .git/post-checkout.args &&
-       git rebase rebase-on-me &&
-       read old new flag <.git/post-checkout.args &&
-       test $old != $new && test $flag = 1
-'
+       test_expect_success "post-checkout is triggered on rebase $args with fast-forward" '
+               test_when_finished "rm -f .git/post-checkout.args" &&
+               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
+       '
+}
+
+test_rebase --apply &&
+test_rebase --merge
 
 test_expect_success 'post-checkout hook is triggered by clone' '
        mkdir -p templates/hooks &&