tree 79414a94828c3d321ddd2bd6b2d19ef7d0e242e1
parent a9be29c9817067128a2818a609450db6e6722ffd
author Johannes Schindelin <johannes.schindelin@gmx.de> 1524659369 +0200
committer Junio C Hamano <gitster@pobox.com> 1524713323 +0900

sequencer: handle post-rewrite for merge commands

In the previous patches, we implemented the basic functionality of the
`git rebase -i --rebase-merges` command, in particular the `merge`
command to create merge commits in the sequencer.

The interactive rebase is a lot more these days, though, than a simple
cherry-pick in a loop. For example, it calls the post-rewrite hook (if
any) after rebasing with a mapping of the old->new commits.

This patch implements the post-rewrite handling for the `merge` command
we just introduced. The other commands that were added recently (`label`
and `reset`) do not create new commits, therefore post-rewrite hooks do
not need to handle them.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>