threads / patch / 47256

patchsequencer: make sign_off_header a file local symbol

Subject: [PATCH] sequencer: make sign_off_header a file local symbol

## tl;dr

4 messages between Nov 20, 2017 and Nov 21, 2017. Diffs are folded; open one to read it.

replies: 3people: 2as markdown or json

Ramsay Jones· Nov 20, 2017, 20:27 UTC · lore
Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
---
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(-)
Show changes to 2 files +1 −3

sequencer.c, sequencer.h

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· Nov 21, 2017, 01:06 UTC · re: Ramsay Jones · lore

Re: [PATCH] sequencer: make sign_off_header a file local symbol

Ramsay Jones <ramsay@ramsayjones.plus.com> writes:
Show 8 quoted lines
> Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
> ---
>
> 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.
Show 30 quoted lines
>  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· Nov 21, 2017, 03:10 UTC · re: Junio C Hamano · lore

Re: [PATCH] sequencer: make sign_off_header a file local symbol

Junio C Hamano <gitster@pobox.com> writes:
Show 21 quoted lines
> Ramsay Jones <ramsay@ramsayjones.plus.com> writes:
>
>> Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
>> ---
>>
>> 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· Nov 21, 2017, 10:52 UTC · re: Junio C Hamano · lore

Re: [PATCH] sequencer: make sign_off_header a file local symbol

On 21/11/17 01:06, Junio C Hamano wrote:
Show 12 quoted lines
> Ramsay Jones <ramsay@ramsayjones.plus.com> writes:
> 
>> Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
>> ---
>>
>> 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

← back to recent threads