Ramsay JonesCommit d0aaa46fd3 ("commit: move empty message checks to libgit", 2017-11-10) removes the last use of 'sign_off_header' outside of the "sequencer.c" source file. Remove the extern declaration from the header file and mark the definition of the symbol with the static keyword.
Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com> ---
Hi Junio,
Now that the 'pw/sequencer-in-process-commit' branch has graduated to 'next', the static-check.pl script is barking on that branch. This patch applies to the next (and pu) branches without conflict. You mentioned that the previous version of this patch (see [1]) conflicted with an in-flight patch series. ('ot/pretty' and 'lb/rebase-i-short-command-names' have nearby changes, but don't conflict).
Was this an 'not in any integration branch, but I'm still holding onto it' topic branch? If it is still a problem, please just ignore this patch.
Thanks!
[1] https://public-inbox.org/git/%3Cd9d05477-5d2f-04fc-adee-10d18bc0947d@ramsayjones.plus.com%3E/
ATB, Ramsay Jones
sequencer.c | 2 +- sequencer.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-)
Show changes to 2 files +1 −3
sequencer.c, sequencer.h
diff --git a/sequencer.c b/sequencer.c index 0f17b4d32..8c2af94ed 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