From: Junio C Hamano <gitster@pobox.com>
To: Ramsay Jones <ramsay@ramsayjones.plus.com>
Cc: Phillip Wood <phillip.wood@dunelm.org.uk>,
GIT Mailing-list <git@vger.kernel.org>
Subject: Re: [PATCH] sequencer: mark a file local symbol as static
Date: Tue, 23 Jan 2018 10:22:49 -0800 [thread overview]
Message-ID: <xmqqlggoigee.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <43b60294-0e8f-0f6e-1b9a-8a2779777513@ramsayjones.plus.com> (Ramsay Jones's message of "Mon, 22 Jan 2018 00:30:51 +0000")
Ramsay Jones <ramsay@ramsayjones.plus.com> writes:
> Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
> ---
>
> Hi Phillip,
>
> If you need to re-roll your 'pw/sequencer-in-process-commit' branch, could
> you please squash this into the relevant patch (commit da96adcf5a,
> "sequencer: run 'prepare-commit-msg' hook", 2018-01-19).
>
> Thanks.
Thanks; as the commit is sitting at the tip of the topic not yet in 'next',
let me just squash it in.
>
> ATB,
> Ramsay Jones
>
> sequencer.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/sequencer.c b/sequencer.c
> index 79579ba11..5bfdc4044 100644
> --- a/sequencer.c
> +++ b/sequencer.c
> @@ -893,7 +893,7 @@ void commit_post_rewrite(const struct commit *old_head,
> run_rewrite_hook(&old_head->object.oid, new_head);
> }
>
> -int run_prepare_commit_msg_hook(struct strbuf *msg, const char *commit)
> +static int run_prepare_commit_msg_hook(struct strbuf *msg, const char *commit)
> {
> struct argv_array hook_env = ARGV_ARRAY_INIT;
> int ret;
prev parent reply other threads:[~2018-01-23 18:22 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-22 0:30 [PATCH] sequencer: mark a file local symbol as static Ramsay Jones
2018-01-23 18:22 ` Junio C Hamano [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqlggoigee.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=phillip.wood@dunelm.org.uk \
--cc=ramsay@ramsayjones.plus.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).