On 03/08/16 10:47, Christian Couder wrote:
> Hi Ramsay,
>
> On Wed, Aug 3, 2016 at 12:44 AM, Junio C Hamano <gitster@xxxxxxxxx> wrote:
>> On Tue, Aug 2, 2016 at 3:33 PM, Ramsay Jones
>> <ramsay@xxxxxxxxxxxxxxxxxxxx> wrote:
>>>
>>> Signed-off-by: Ramsay Jones <ramsay@xxxxxxxxxxxxxxxxxxxx>
>>> ---
>>>
>>> Hi Christian,
>>>
[snip]
>>> 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 },
>
Heh, thanks. I thought I had done exactly this, but I obviously
messed up!
[snip]
> 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.
FWIW, I would go with option #1.
ATB,
Ramsay Jones
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html