sequencer (rebase -i): handle the stopped-sha file

dscho · dscho · commit 564a8b304db0 · 2016-04-19T12:33:35.000+02:00
In interactive rebases, the `stopped-sha` file is written when a commit
could not be cherry-picked, to allow recording the commit together with
its replacement when continuing. This information will be used to
rewrite notes at the end of the interactive rebase.

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

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