Merge branch 'js/retire-preserve-merges'

[thirdparty/git.git] / sequencer.h

diff --git a/sequencer.h b/sequencer.h
index 60a156ea906273b2bf7ba5a833a55e68dc2dafa2..05a7d2ba6b392c37b106bea6af5f0e1912dffd9e 100644 (file)
--- a/sequencer.h
+++ b/sequencer.h
@@ -116,10 +116,11 @@ struct todo_list {
        struct todo_item *items;
        int nr, alloc, current;
        int done_nr, total_nr;
-       struct stat_data stat;
 };
 
-#define TODO_LIST_INIT { STRBUF_INIT }
+#define TODO_LIST_INIT { \
+       .buf = STRBUF_INIT, \
+}
 
 int todo_list_parse_insn_buffer(struct repository *r, char *buf,
                                struct todo_list *todo_list);
@@ -156,6 +157,7 @@ int sequencer_remove_state(struct replay_opts *opts);
  */
 #define TODO_LIST_ROOT_WITH_ONTO (1U << 6)
 #define TODO_LIST_REAPPLY_CHERRY_PICKS (1U << 7)
+#define TODO_LIST_WARN_SKIPPED_CHERRY_PICKS (1U << 8)
 
 int sequencer_make_script(struct repository *r, struct strbuf *out, int argc,
                          const char **argv, unsigned flags);