rebase -i: demonstrate incorrect behavior of post-rewrite
authorMatthieu Moy <Matthieu.Moy@imag.fr>
Fri, 22 May 2015 13:15:50 +0000 (13:15 +0000)
committerJunio C Hamano <gitster@pobox.com>
Fri, 22 May 2015 15:39:01 +0000 (08:39 -0700)
commit1d968ca69809ffb7b9105a4785aa0bc3b37b1434
tree8752b83e629304d5a64cb13406fcb3dd1b4e1aef
parent282616c72d1d08a77ca4fe1186cb708c38408d87
rebase -i: demonstrate incorrect behavior of post-rewrite

The 'exec' command is sending the current commit to stopped-sha, which is
supposed to contain the original commit (before rebase). As a result, if
an 'exec' command fails, the next 'git rebase --continue' will send the
current commit as <old-sha1> to the post-rewrite hook.

The test currently fails with :

  --- expected.data       2015-05-21 17:55:29.000000000 +0000
  +++ [...]post-rewrite.data      2015-05-21 17:55:29.000000000 +0000
  @@ -1,2 +1,3 @@
   2362ae8e1b1b865e6161e6f0e165ffb974abf018 488028e9fac0b598b70cbeb594258a917e3f6fab
  +488028e9fac0b598b70cbeb594258a917e3f6fab 488028e9fac0b598b70cbeb594258a917e3f6fab
   babc8a4c7470895886fc129f1a015c486d05a351 8edffcc4e69a4e696a1d4bab047df450caf99507

Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t5407-post-rewrite-hook.sh