revision.c: reduce implicit dependency the_repository

diff --git a/sequencer.h b/sequencer.h
index 4b2717881fa1c6f5011cddd6a5f1c28761d8e8ca..c751c9d6e4f78e7d9e2700dcc3fb3157961fb049 100644 (file)
--- a/sequencer.h
+++ b/sequencer.h
@@ -1,6 +1,11 @@
 #ifndef SEQUENCER_H
 #define SEQUENCER_H
 
+#include "cache.h"
+#include "strbuf.h"
+
+struct commit;
+
 const char *git_path_commit_editmsg(void);
 const char *git_path_seq_dir(void);
 
@@ -44,6 +49,10 @@ struct replay_opts {
        char **xopts;
        size_t xopts_nr, xopts_alloc;
 
+       /* 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;
@@ -51,7 +60,7 @@ struct replay_opts {
        /* Only used by REPLAY_NONE */
        struct rev_info *revs;
 };
-#define REPLAY_OPTS_INIT { -1 }
+#define REPLAY_OPTS_INIT { .action = -1, .current_fixups = STRBUF_INIT }
 
 /* Call this to setup defaults before parsing command line options */
 void sequencer_init_config(struct replay_opts *opts);