diff options
author | Phillip Wood <phillip.wood@dunelm.org.uk> | 2019-04-16 13:18:42 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-04-17 05:31:39 +0300 |
commit | 4a72486de97b5c6b0979b2b51e50c268bdb0d4f6 (patch) | |
tree | 59f14e26ef0542b206a0e991f0a9ac7a582f466a /sequencer.h | |
parent | b07d9bfd171d881a02d110b68673c58cb63e9f62 (diff) |
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 <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sequencer.h')
-rw-r--r-- | sequencer.h | 2 |
1 files changed, 2 insertions, 0 deletions
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); |