diff options
Diffstat (limited to 'third_party/git/t/t7505-prepare-commit-msg-hook.sh')
| -rwxr-xr-x | third_party/git/t/t7505-prepare-commit-msg-hook.sh | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/third_party/git/t/t7505-prepare-commit-msg-hook.sh b/third_party/git/t/t7505-prepare-commit-msg-hook.sh index 94f85cdf83..ba8bd1b514 100755 --- a/third_party/git/t/t7505-prepare-commit-msg-hook.sh +++ b/third_party/git/t/t7505-prepare-commit-msg-hook.sh @@ -241,7 +241,13 @@ test_rebase () { git add b && git rebase --continue ) && - git log --pretty=%s -g -n18 HEAD@{1} >actual && + 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 && test_cmp "$TEST_DIRECTORY/t7505/expected-rebase${mode:--i}" actual ' } |