sequencer: handle post-rewrite for merge commands

diff --git a/sequencer.c b/sequencer.c
index e9297122633b83cce5bc880d366c36c6c1d8c574..558efc1af6e20e8abfe664d5c647e14216dc127f 100644 (file)
--- a/sequencer.c
+++ b/sequencer.c
@@ -3074,7 +3074,10 @@ static int pick_commits(struct todo_list *todo_list, struct replay_opts *opts)
                                            item->arg, item->arg_len,
                                            item->flags, opts)) < 0)
                                reschedule = 1;
-                       else if (res > 0)
+                       else if (item->commit)
+                               record_in_rewritten(&item->commit->object.oid,
+                                                   peek_command(todo_list, 1));
+                       if (res > 0)
                                /* failed with merge conflicts */
                                return error_with_patch(item->commit,
                                                        item->arg,