archive.c: convert to use struct object_id

diff --git a/sequencer.h b/sequencer.h
index 1fc22dcabe132cd437e7b0d3c56588c8cd7e63f2..5ed5cb1d97ced70a9ebffd1dad524a12e7f7810a 100644 (file)
--- a/sequencer.h
+++ b/sequencer.h
@@ -37,6 +37,8 @@ struct replay_opts {
 
        int mainline;
 
+       const char *gpg_sign;
+
        /* Merge strategy */
        const char *strategy;
        const char **xopts;
@@ -51,5 +53,6 @@ int sequencer_pick_revisions(struct replay_opts *opts);
 extern const char sign_off_header[];
 
 void append_signoff(struct strbuf *msgbuf, int ignore_footer, unsigned flag);
+void append_conflicts_hint(struct strbuf *msgbuf);
 
 #endif