Start the 2.46 cycle

[thirdparty/git.git] / sequencer.h

diff --git a/sequencer.h b/sequencer.h
index dcef7bb99c08b0f8e5a29905f8f3a4d6d2d34a45..a309ddd712be549f3dd9dc370abe03ace470e4c7 100644 (file)
--- a/sequencer.h
+++ b/sequencer.h
@@ -14,6 +14,8 @@ const char *rebase_path_todo(void);
 const char *rebase_path_todo_backup(void);
 const char *rebase_path_dropped(void);
 
+extern const char *rebase_resolvemsg;
+
 #define APPEND_SIGNOFF_DEDUP (1u << 0)
 
 enum replay_action {
@@ -29,6 +31,9 @@ enum commit_msg_cleanup_mode {
        COMMIT_MSG_CLEANUP_ALL
 };
 
+struct replay_ctx;
+struct replay_ctx* replay_ctx_new(void);
+
 struct replay_opts {
        enum replay_action action;
 
@@ -66,10 +71,6 @@ struct replay_opts {
        /* Reflog */
        char *reflog_action;
 
-       /* Used by fixup/squash */
-       struct strbuf current_fixups;
-       int current_fixup_count;
-
        /* placeholder commit for -i --root */
        struct object_id squash_onto;
        int have_squash_onto;
@@ -78,13 +79,13 @@ struct replay_opts {
        struct rev_info *revs;
 
        /* Private use */
-       const char *reflog_message;
+       struct replay_ctx *ctx;
 };
 #define REPLAY_OPTS_INIT {                     \
        .edit = -1,                             \
        .action = -1,                           \
-       .current_fixups = STRBUF_INIT,          \
        .xopts = STRVEC_INIT,                   \
+       .ctx = replay_ctx_new(),                \
 }
 
 /*