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

Re: [PATCH] add -i: hide init/clear_add_i_state() functions

From
Ben Knoble <ben.knoble@gmail.com>
Date
Oct 28, 2026, 20:48 UTC
Message-ID
<2E0FBA76-AB3A-4B5C-A08A-9B3272C65307@gmail.com>
In-Reply-To
<xmqqh5i58uo0.fsf@gitster.g>
Show 9 quoted lines
> Le 28 oct. 2026 à 16:22, Junio C Hamano <gitster@pobox.com> a écrit :
> 
> The "add -i" machinery is encapsulated in run_add_i() function,
> which uses init_add_i_state() to initialize the machinery, does its
> thing, and clear_add_i_state() to tear it down.  External callers
> have no need to call anything other than run_add_i().
> 
> Make init/clear_add_i_state() file-scope static functions, and
> "struct add_i_state" type as well.
Yep, narrower interfaces are easier for programmers to consume, thanks. 
Show 55 quoted lines
> Signed-off-by: Junio C Hamano <gitster@pobox.com>
> ---
> add-interactive.c | 11 ++++++++---
> add-interactive.h |  9 ---------
> 2 files changed, 8 insertions(+), 12 deletions(-)
> 
> diff --git a/add-interactive.c b/add-interactive.c
> index 3cf8a1dbf8..9a00daf9f9 100644
> --- a/add-interactive.c
> +++ b/add-interactive.c
> @@ -19,14 +19,19 @@
> #include "prompt.h"
> #include "tree.h"
> 
> -void init_add_i_state(struct add_i_state *s, struct repository *r,
> -              struct interactive_options *opts)
> +struct add_i_state {
> +    struct repository *r;
> +    struct interactive_config cfg;
> +};
> +
> +static void init_add_i_state(struct add_i_state *s, struct repository *r,
> +                 struct interactive_options *opts)
> {
>    s->r = r;
>    interactive_config_init(&s->cfg, r, opts);
> }
> 
> -void clear_add_i_state(struct add_i_state *s)
> +static void clear_add_i_state(struct add_i_state *s)
> {
>    interactive_config_clear(&s->cfg);
>    memset(s, 0, sizeof(*s));
> diff --git a/add-interactive.h b/add-interactive.h
> index eefa2edc7c..47f67ede82 100644
> --- a/add-interactive.h
> +++ b/add-interactive.h
> @@ -6,15 +6,6 @@
> struct pathspec;
> struct repository;
> 
> -struct add_i_state {
> -    struct repository *r;
> -    struct interactive_config cfg;
> -};
> -
> -void init_add_i_state(struct add_i_state *s, struct repository *r,
> -              struct interactive_options *opts);
> -void clear_add_i_state(struct add_i_state *s);
> -
> int run_add_i(struct repository *r, const struct pathspec *ps,
>          struct interactive_options *opts);
> 
> --
> 2.56.0-433-ga9209adf11
And this matches the log message.
I did not check for callers, but I assume you did your due-diligence there ;) 
Previous: Junio C HamanoNext: Patrick Steinhardt
Message 2 of 6 in “add -i: hide init/clear_add_i_state() functions”
  1. add -i: hide init/clear_add_i_state() functionsJunio C Hamano, Oct 28, 2026
  2. Ben KnobleOct 28, 2026
  3. Patrick SteinhardtOct 30, 2026
  4. Junio C HamanoOct 30, 2026
  5. Ben KnobleOct 30, 2026
  6. Patrick SteinhardtNov 2, 2026

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.