path: root/sequencer.h
diff options
authorJunio C Hamano <>2019-05-13 14:50:35 (GMT)
committerJunio C Hamano <>2019-05-13 14:50:35 (GMT)
commitb51a0fdc3822c2ef260f6d496b6df6d33b101e8a (patch)
tree62b916b74af5ee6f51b6e924d9d7a65311085420 /sequencer.h
parent7ba06bc3d026cee54437db5cfddfffe7b4d7a187 (diff)
parent4a72486de97b5c6b0979b2b51e50c268bdb0d4f6 (diff)
Merge branch 'pw/clean-sequencer-state-upon-final-commit'
"git chery-pick" (and "revert" that shares the same runtime engine) that deals with multiple commits got confused when the final step gets stopped with a conflict and the user concluded the sequence with "git commit". Attempt to fix it by cleaning up the state files used by these commands in such a situation. * pw/clean-sequencer-state-upon-final-commit: fix cherry-pick/revert status after commit commit/reset: try to clean up sequencer state
Diffstat (limited to 'sequencer.h')
1 files changed, 3 insertions, 0 deletions
diff --git a/sequencer.h b/sequencer.h
index f4a8f4e..0c494b8 100644
--- a/sequencer.h
+++ b/sequencer.h
@@ -200,3 +200,6 @@ int read_author_script(const char *path, char **name, char **email, char **date,
void parse_strategy_opts(struct replay_opts *opts, char *raw_opts);
int write_basic_state(struct replay_opts *opts, const char *head_name,
struct commit *onto, const char *orig_head);
+void sequencer_post_commit_cleanup(struct repository *r);
+int sequencer_get_last_command(struct repository* r,
+ enum replay_action *action);