# [PATCH] sequencer: make sign_off_header a file local symbol 4 messages from 2017-11-20 to 2017-11-21. Participants: Ramsay Jones, Junio C Hamano. Thread: https://gitlist.dev/t/47256 ## Ramsay Jones, 2017-11-20 20:27 Subject: [PATCH] sequencer: make sign_off_header a file local symbol Message-ID: URL: https://gitlist.dev/e/cc945f53-9452-9165-96c2-ab7f5f46c146%40ramsayjones.plus.com ``` Signed-off-by: Ramsay Jones --- 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 ``` ## Junio C Hamano, 2017-11-21 01:06 Subject: Re: [PATCH] sequencer: make sign_off_header a file local symbol Message-ID: URL: https://gitlist.dev/e/xmqqy3n0jv98.fsf%40gitster.mtv.corp.google.com In-Reply-To: ``` Ramsay Jones writes: > Signed-off-by: Ramsay Jones > --- > > 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). What automated procedure are you using to produce these comments? The commit is from 14-09-2012, not from a few months ago, and is part of Git 1.8.0 and upwards, which won't be rerolled. Please add a check to see if the culprit is already in 'next' or something. Will queue as _your_ fix, not a potential squash into another commit. Thanks, as always, for your attention to detail. > 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); ``` ## Junio C Hamano, 2017-11-21 03:10 Subject: Re: [PATCH] sequencer: make sign_off_header a file local symbol Message-ID: URL: https://gitlist.dev/e/xmqq8tf0jpia.fsf%40gitster.mtv.corp.google.com In-Reply-To: ``` Junio C Hamano writes: > Ramsay Jones writes: > >> Signed-off-by: Ramsay Jones >> --- >> >> 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). > > What automated procedure are you using to produce these comments? > > The commit is from 14-09-2012, not from a few months ago, and is > part of Git 1.8.0 and upwards, which won't be rerolled. Please add > a check to see if the culprit is already in 'next' or something. > > Will queue as _your_ fix, not a potential squash into another > commit. > > Thanks, as always, for your attention to detail. Yuck. Somebody in flight does use this symbol from elsewhere, so it cannot be made static. Let's drop this patch for now. ``` ## Ramsay Jones, 2017-11-21 10:52 Subject: Re: [PATCH] sequencer: make sign_off_header a file local symbol Message-ID: URL: https://gitlist.dev/e/d9d05477-5d2f-04fc-adee-10d18bc0947d%40ramsayjones.plus.com In-Reply-To: ``` On 21/11/17 01:06, Junio C Hamano wrote: > Ramsay Jones writes: > >> Signed-off-by: Ramsay Jones >> --- >> >> 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). > > What automated procedure are you using to produce these comments? Err, no automated procedure, hence the idiocy ... :( > The commit is from 14-09-2012, not from a few months ago, and is > part of Git 1.8.0 and upwards, which won't be rerolled. Please add > a check to see if the culprit is already in 'next' or something. Yes, sorry, I wasn't paying attention. The actual commit which caused the 'static-check.pl' script to bark, was d0aaa46fd3 ("commit: move empty message checks to libgit", 10-11-2017) in the 'pu' branch. This commit removes the last use of 'sign_off_header' outside of sequencer.c (from builtin/commit.c). > Will queue as _your_ fix, not a potential squash into another > commit. The above commit is in the 'pw/sequencer-in-process-commit' branch. Sorry for the confusion. (Sorry Miklos). > Thanks, as always, for your attention to detail. Ahem. :D ATB, Ramsay Jones ```