Signed-off-by: Ramsay Jones <ramsay@xxxxxxxxxxxxxxxxxxxx> --- Hi Miklos, If you need to re-roll your 'mv/cherry-pick-s' branch, could you please squash this into the relevant patch (commit 5ed75e2a3f, "cherry-pick: don't forget -s on failure", 14-09-2017). [noticed by sparse]. Thanks! ATB, Ramsay Jones sequencer.c | 2 +- sequencer.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/sequencer.c b/sequencer.c index 53b5100a7..b8c0ed170 100644 --- a/sequencer.c +++ b/sequencer.c @@ -26,7 +26,7 @@ #define GIT_REFLOG_ACTION "GIT_REFLOG_ACTION" -const char sign_off_header[] = "Signed-off-by: "; +static const char sign_off_header[] = "Signed-off-by: "; static const char cherry_picked_prefix[] = "(cherry picked from commit "; GIT_PATH_FUNC(git_path_seq_dir, "sequencer") diff --git a/sequencer.h b/sequencer.h index 77cb174b2..688b0276d 100644 --- a/sequencer.h +++ b/sequencer.h @@ -53,8 +53,6 @@ int check_todo_list(void); int skip_unnecessary_picks(void); int rearrange_squash(void); -extern const char sign_off_header[]; - void append_signoff(struct strbuf *msgbuf, int ignore_footer, unsigned flag); void append_conflicts_hint(struct strbuf *msgbuf); int git_sequencer_config(const char *k, const char *v, void *cb); -- 2.15.0
