Merge branch 'js/update-index-ignore-removal-for-skip-worktree'

[thirdparty/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 ba8bd1b51497df1aedf2280210a98b389f12b9e7..94f85cdf831790a27ac2878bf483a6a0c0f1c441 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
        '
 }