From 4a72486de97b5c6b0979b2b51e50c268bdb0d4f6 Mon Sep 17 00:00:00 2001 From: Phillip Wood Date: Tue, 16 Apr 2019 11:18:42 +0100 Subject: fix cherry-pick/revert status after commit If the user commits a conflict resolution using `git commit` in the middle of a sequence of cherry-picks/reverts then `git status` missed the fact that a cherry-pick/revert is still in progress. Signed-off-by: Phillip Wood Signed-off-by: Junio C Hamano --- sequencer.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'sequencer.h') diff --git a/sequencer.h b/sequencer.h index 6c7cf8d72f..c4b79165d3 100644 --- a/sequencer.h +++ b/sequencer.h @@ -145,3 +145,5 @@ void parse_strategy_opts(struct replay_opts *opts, char *raw_opts); int write_basic_state(struct replay_opts *opts, const char *head_name, const char *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); -- cgit v1.2.3