diff options
Diffstat (limited to 'sequencer.h')
| -rw-r--r-- | sequencer.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sequencer.h b/sequencer.h index 4b2717881f..c5787c6b56 100644 --- a/sequencer.h +++ b/sequencer.h @@ -44,6 +44,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 +55,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); |