{"thread":{"id":"47256","subject":"[PATCH] sequencer: make sign_off_header a file local symbol","startedAt":"2017-11-20T20:27:14Z","lastAt":"2017-11-21T11:00:08Z","messageCount":4,"participants":["Ramsay Jones","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"332937","messageId":"cc945f53-9452-9165-96c2-ab7f5f46c146@ramsayjones.plus.com","threadId":"47256","inReplyTo":null,"subject":"[PATCH] sequencer: make sign_off_header a file local symbol","fromName":"Ramsay Jones","fromEmail":"ramsay@ramsayjones.plus.com","sentAt":"2017-11-20T20:27:07Z","receivedAt":"2017-11-20T20:27:14Z","isPatch":true,"sender":{"key":"ramsay@ramsayjones.plus.com","avatar":"https://avatars.githubusercontent.com/u/33702710?v=4"},"body":"\nSigned-off-by: Ramsay Jones \n---\n\nHi Miklos,\n\nIf you need to re-roll your 'mv/cherry-pick-s' branch, could you\nplease squash this into the relevant patch (commit 5ed75e2a3f,\n\"cherry-pick: don't forget -s on failure\", 14-09-2017).\n\n[noticed by sparse].\n\nThanks!\n\nATB,\nRamsay Jones\n\n sequencer.c | 2 +-\n sequencer.h | 2 --\n 2 files changed, 1 insertion(+), 3 deletions(-)\n\ndiff --git a/sequencer.c b/sequencer.c\nindex 53b5100a7..b8c0ed170 100644\n--- a/sequencer.c\n+++ b/sequencer.c\n@@ -26,7 +26,7 @@\n \n #define GIT_REFLOG_ACTION \"GIT_REFLOG_ACTION\"\n \n-const char sign_off_header[] = \"Signed-off-by: \";\n+static const char sign_off_header[] = \"Signed-off-by: \";\n static const char cherry_picked_prefix[] = \"(cherry picked from commit \";\n \n GIT_PATH_FUNC(git_path_seq_dir, \"sequencer\")\ndiff --git a/sequencer.h b/sequencer.h\nindex 77cb174b2..688b0276d 100644\n--- a/sequencer.h\n+++ b/sequencer.h\n@@ -53,8 +53,6 @@ int check_todo_list(void);\n int skip_unnecessary_picks(void);\n int rearrange_squash(void);\n \n-extern const char sign_off_header[];\n-\n void append_signoff(struct strbuf *msgbuf, int ignore_footer, unsigned flag);\n void append_conflicts_hint(struct strbuf *msgbuf);\n int git_sequencer_config(const char *k, const char *v, void *cb);\n-- \n2.15.0\n"},{"id":"333034","messageId":"xmqqy3n0jv98.fsf@gitster.mtv.corp.google.com","threadId":"47256","inReplyTo":"cc945f53-9452-9165-96c2-ab7f5f46c146@ramsayjones.plus.com","subject":"Re: [PATCH] sequencer: make sign_off_header a file local symbol","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2017-11-21T01:06:11Z","receivedAt":"2017-11-21T01:06:19Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Ramsay Jones writes:\n\n> Signed-off-by: Ramsay Jones \n> ---\n>\n> Hi Miklos,\n>\n> If you need to re-roll your 'mv/cherry-pick-s' branch, could you\n> please squash this into the relevant patch (commit 5ed75e2a3f,\n> \"cherry-pick: don't forget -s on failure\", 14-09-2017).\n\nWhat automated procedure are you using to produce these comments?\n\nThe commit is from 14-09-2012, not from a few months ago, and is\npart of Git 1.8.0 and upwards, which won't be rerolled. Please add\na check to see if the culprit is already in 'next' or something.\n\nWill queue as _your_ fix, not a potential squash into another\ncommit.\n\nThanks, as always, for your attention to detail.\n\n\n\n\n\n> sequencer.c | 2 +-\n> sequencer.h | 2 --\n> 2 files changed, 1 insertion(+), 3 deletions(-)\n>\n> diff --git a/sequencer.c b/sequencer.c\n> index 53b5100a7..b8c0ed170 100644\n> --- a/sequencer.c\n> +++ b/sequencer.c\n> @@ -26,7 +26,7 @@\n> \n> #define GIT_REFLOG_ACTION \"GIT_REFLOG_ACTION\"\n> \n> -const char sign_off_header[] = \"Signed-off-by: \";\n> +static const char sign_off_header[] = \"Signed-off-by: \";\n> static const char cherry_picked_prefix[] = \"(cherry picked from commit \";\n> \n> GIT_PATH_FUNC(git_path_seq_dir, \"sequencer\")\n> diff --git a/sequencer.h b/sequencer.h\n> index 77cb174b2..688b0276d 100644\n> --- a/sequencer.h\n> +++ b/sequencer.h\n> @@ -53,8 +53,6 @@ int check_todo_list(void);\n> int skip_unnecessary_picks(void);\n> int rearrange_squash(void);\n> \n> -extern const char sign_off_header[];\n> -\n> void append_signoff(struct strbuf *msgbuf, int ignore_footer, unsigned flag);\n> void append_conflicts_hint(struct strbuf *msgbuf);\n> int git_sequencer_config(const char *k, const char *v, void *cb);\n"},{"id":"333045","messageId":"xmqq8tf0jpia.fsf@gitster.mtv.corp.google.com","threadId":"47256","inReplyTo":"xmqqy3n0jv98.fsf@gitster.mtv.corp.google.com","subject":"Re: [PATCH] sequencer: make sign_off_header a file local symbol","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2017-11-21T03:10:21Z","receivedAt":"2017-11-21T03:10:29Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Junio C Hamano writes:\n\n> Ramsay Jones writes:\n>\n>> Signed-off-by: Ramsay Jones \n>> ---\n>>\n>> Hi Miklos,\n>>\n>> If you need to re-roll your 'mv/cherry-pick-s' branch, could you\n>> please squash this into the relevant patch (commit 5ed75e2a3f,\n>> \"cherry-pick: don't forget -s on failure\", 14-09-2017).\n>\n> What automated procedure are you using to produce these comments?\n>\n> The commit is from 14-09-2012, not from a few months ago, and is\n> part of Git 1.8.0 and upwards, which won't be rerolled. Please add\n> a check to see if the culprit is already in 'next' or something.\n>\n> Will queue as _your_ fix, not a potential squash into another\n> commit.\n>\n> Thanks, as always, for your attention to detail.\n\nYuck. Somebody in flight does use this symbol from elsewhere, so it\ncannot be made static. Let's drop this patch for now.\n"},{"id":"333088","messageId":"d9d05477-5d2f-04fc-adee-10d18bc0947d@ramsayjones.plus.com","threadId":"47256","inReplyTo":"xmqqy3n0jv98.fsf@gitster.mtv.corp.google.com","subject":"Re: [PATCH] sequencer: make sign_off_header a file local symbol","fromName":"Ramsay Jones","fromEmail":"ramsay@ramsayjones.plus.com","sentAt":"2017-11-21T10:52:29Z","receivedAt":"2017-11-21T11:00:08Z","isPatch":true,"sender":{"key":"ramsay@ramsayjones.plus.com","avatar":"https://avatars.githubusercontent.com/u/33702710?v=4"},"body":"\n\nOn 21/11/17 01:06, Junio C Hamano wrote:\n> Ramsay Jones writes:\n> \n>> Signed-off-by: Ramsay Jones \n>> ---\n>>\n>> Hi Miklos,\n>>\n>> If you need to re-roll your 'mv/cherry-pick-s' branch, could you\n>> please squash this into the relevant patch (commit 5ed75e2a3f,\n>> \"cherry-pick: don't forget -s on failure\", 14-09-2017).\n> \n> What automated procedure are you using to produce these comments?\n\nErr, no automated procedure, hence the idiocy ... :(\n\n> The commit is from 14-09-2012, not from a few months ago, and is\n> part of Git 1.8.0 and upwards, which won't be rerolled. Please add\n> a check to see if the culprit is already in 'next' or something.\n\nYes, sorry, I wasn't paying attention. The actual commit which caused\nthe 'static-check.pl' script to bark, was d0aaa46fd3 (\"commit: move empty\nmessage checks to libgit\", 10-11-2017) in the 'pu' branch. This commit\nremoves the last use of 'sign_off_header' outside of sequencer.c (from\nbuiltin/commit.c).\n\n> Will queue as _your_ fix, not a potential squash into another\n> commit.\n\nThe above commit is in the 'pw/sequencer-in-process-commit' branch.\nSorry for the confusion. (Sorry Miklos).\n\n> Thanks, as always, for your attention to detail.\n\nAhem. :D\n\nATB,\nRamsay Jones\n\n\n"}]}