From: Christian Couder <christian.couder@gmail.com>
To: Junio C Hamano <gitster@pobox.com>,
Ramsay Jones <ramsay@ramsayjones.plus.com>
Cc: GIT Mailing-list <git@vger.kernel.org>
Subject: Re: [PATCH] apply: mark some file-local symbols static
Date: Wed, 3 Aug 2016 11:47:14 +0200 [thread overview]
Message-ID: <CAP8UFD2NFZCAF=ZWNf4YF+F2L7A4ZM0XS98o-cR_MjuLLR8pfg@mail.gmail.com> (raw)
In-Reply-To: <CAPc5daVo2o7zxTGVARoZc8AmX2WAJC1cWB4R=9sG8TH8ddKkuA@mail.gmail.com>
Hi Ramsay,
On Wed, Aug 3, 2016 at 12:44 AM, Junio C Hamano <gitster@pobox.com> wrote:
> On Tue, Aug 2, 2016 at 3:33 PM, Ramsay Jones
> <ramsay@ramsayjones.plus.com> wrote:
>>
>> Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
>> ---
>>
>> Hi Christian,
>>
>> I had intended to ask you to squash this into your 'cc/apply-am'
>> branch, specifically commit 4d18b33a (apply: move libified code
>> from builtin/apply.c to apply.{c,h}, 30-07-2016).
>>
>> However, having read that commit a little closer, it seems that
>> you deliberately made these symbols public. The commit message
>> does not mention this issue at all, and it is not clear to me
>> why these symbols should be public.
>>
>> What am I missing?
These symbols are still used in builtin/apply.c until 9f87c22 ("apply:
refactor `git apply` option parsing") at the end of the series, for
example:
$ git checkout 4d18b33a
$ git grep -n apply_option_parse_directory builtin/apply.c
builtin/apply.c:86: 0, apply_option_parse_directory },
> Their exports have been made obsolete by the reroll we have
> in 'pu' when "builtin/am: use apply api in run_apply()" was
> redone in a way not to duplicate the argument parsing.
Yeah.
> They should have been cleaned with 4820e13,
4820e13 (apply: make some parsing functions static again) is too early
in the series for cleaning this.
At that point the symbols are still used in builtin/apply.c.
> but I think
> Christian did not carefully review the whole series before
> sending it out and did not notice that they no longer need
> to be extern.
Yeah, I did not notice that they no longer need to be extern.
Now there are different options to fix this:
1) remove the symbols in 9f87c22 ("apply: refactor `git apply` option
parsing") at the end of the series, or
2) move 4820e13 (apply: make some parsing functions static again) at
the end of the series and make it also remove them, or:
3) add another patch to remove them after 9f87c22 ("apply: refactor
`git apply` option parsing")
My preference is to do 1). This way, or if I do 3), I would not need
to resend the first 31 patches in the series.
Thanks,
Christian.
next prev parent reply other threads:[~2016-08-03 10:47 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-02 22:33 [PATCH] apply: mark some file-local symbols static Ramsay Jones
2016-08-02 22:44 ` Junio C Hamano
2016-08-03 9:47 ` Christian Couder [this message]
2016-08-03 13:47 ` Ramsay Jones
2016-08-03 14:37 ` Johannes Schindelin
2016-08-07 16:37 ` Christian Couder
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='CAP8UFD2NFZCAF=ZWNf4YF+F2L7A4ZM0XS98o-cR_MjuLLR8pfg@mail.gmail.com' \
--to=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--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).