sequencer (rebase -i): clean up some files before each step

dscho · dscho · commit 1b3255e1e9d6 · 2016-04-19T12:33:33.000+02:00
Certain files are kept in the state directory to indicate e.g. that a
commit wants to be amended, or which author to record after a merge
conflict was resolved.

These files need to be removed before the executing the *next* command,
of course.

Signed-off-by: Johannes Schindelin &lt;johannes.schindelin@gmx.de&gt;
diff --git a/sequencer.c b/sequencer.c
@@ -1514,6 +1514,7 @@ static int pick_commits(struct todo_list *todo_list, struct replay_opts *opts)
 			unlink(git_path_rebase_msg());
 			unlink(author_script());
 			unlink(stopped_sha());
+			unlink(git_path_rebase_amend());
 		}
 		if (item->command <= TODO_SQUASH) {
 			res = do_pick_commit(item->command, item->commit,

Original file line number	Diff line number	Diff line change
`@@ -1514,6 +1514,7 @@ static int pick_commits(struct todo_list todo_list, struct replay_opts opts)`
`1514`	`1514`	`unlink(git_path_rebase_msg());`
`1515`	`1515`	`unlink(author_script());`
`1516`	`1516`	`unlink(stopped_sha());`
	`1517`	`+ unlink(git_path_rebase_amend());`
`1517`	`1518`	`}`
`1518`	`1519`	`if (item->command <= TODO_SQUASH) {`
`1519`	`1520`	`res = do_pick_commit(item->command, item->commit,`