rebase: strip unused code in git-rebase--preserve-merges.sh

diff --git a/sequencer.h b/sequencer.h
index d9570d92b11d15e6046e4b8473cb5f8a450ea64f..4b2717881fa1c6f5011cddd6a5f1c28761d8e8ca 100644 (file)
--- a/sequencer.h
+++ b/sequencer.h
@@ -44,6 +44,10 @@ struct replay_opts {
        char **xopts;
        size_t xopts_nr, xopts_alloc;
 
+       /* placeholder commit for -i --root */
+       struct object_id squash_onto;
+       int have_squash_onto;
+
        /* Only used by REPLAY_NONE */
        struct rev_info *revs;
 };