Imported Upstream version 2.25.4

[platform/upstream/git.git] / t / t7505-prepare-commit-msg-hook.sh

diff --git a/t/t7505-prepare-commit-msg-hook.sh b/t/t7505-prepare-commit-msg-hook.sh
index ba8bd1b..94f85cd 100755 (executable)
--- a/t/t7505-prepare-commit-msg-hook.sh
+++ b/t/t7505-prepare-commit-msg-hook.sh
@@ -241,13 +241,7 @@ test_rebase () {
                        git add b &&
                        git rebase --continue
                ) &&
-               if test "$mode" = -p # reword amended after pick
-               then
-                       n=18
-               else
-                       n=17
-               fi &&
-               git log --pretty=%s -g -n$n HEAD@{1} >actual &&
+               git log --pretty=%s -g -n18 HEAD@{1} >actual &&
                test_cmp "$TEST_DIRECTORY/t7505/expected-rebase${mode:--i}" actual
        '
 }