git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] apply: mark some file-local symbols static

From
Ramsay Jones <ramsay@ramsayjones.plus.com>
Date
Aug 3, 2016, 13:47 UTC
Message-ID
<2e615a57-cf15-9deb-0a35-d6bbe175edfa@ramsayjones.plus.com>
In-Reply-To
<CAP8UFD2NFZCAF=ZWNf4YF+F2L7A4ZM0XS98o-cR_MjuLLR8pfg@mail.gmail.com>
On 03/08/16 10:47, Christian Couder wrote:
Show 11 quoted lines
> 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,
>>>
[snip]
Show 10 quoted lines
>>> 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]
Show 12 quoted lines
> 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

Previous: Christian CouderNext: Johannes Schindelin
Message 4 of 6 in “apply: mark some file-local symbols static”
  1. apply: mark some file-local symbols staticRamsay Jones, Aug 2, 2016
  2. Junio C HamanoAug 2, 2016
  3. Christian CouderAug 3, 2016
  4. Ramsay JonesAug 3, 2016
  5. Johannes SchindelinAug 3, 2016
  6. Christian CouderAug 7, 2016

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.