diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-10-11 14:24:46 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-10-11 14:24:47 +0900 |
| commit | 4608a029b490a87469680ee7d055a6d7cb5912c6 (patch) | |
| tree | 6bc53915b66001d83e2fa1c6c7aa738545d713df /t/t7505-prepare-commit-msg-hook.sh | |
| parent | Merge branch 'tk/git-svn-trim-author-name' (diff) | |
| parent | sequencer: simplify root commit creation (diff) | |
| download | tgif-4608a029b490a87469680ee7d055a6d7cb5912c6.tar.xz | |
Merge branch 'pw/rebase-i-show-HEAD-to-reword'
"git rebase -i" showed a wrong HEAD while "reword" open the editor.
* pw/rebase-i-show-HEAD-to-reword:
sequencer: simplify root commit creation
rebase -i: check for updated todo after squash and reword
rebase -i: always update HEAD before rewording
Diffstat (limited to 't/t7505-prepare-commit-msg-hook.sh')
| -rwxr-xr-x | t/t7505-prepare-commit-msg-hook.sh | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/t/t7505-prepare-commit-msg-hook.sh b/t/t7505-prepare-commit-msg-hook.sh index ba8bd1b514..94f85cdf83 100755 --- 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 ' } |