From: Elijah Newren <newren@gmail.com>
Date: Thu, 20 Nov 2025 07:03:30 GMT
Subject: Re: [PATCH v6 06/11] add-patch: split out header from "add-interactive.h"
Message-ID: <CABPp-BFx-8bxSmrzO-2i81e7XP4pbXNV6Y+Ot=RkeuhU-N0VHg@mail.gmail.com>
In-Reply-To: <20251027-b4-pks-history-builtin-v6-6-407dd3f57ad3@pks.im>

On Mon, Oct 27, 2025 at 4:34 AM Patrick Steinhardt <ps@pks.im> wrote:
>
> While we have a "add-patch.c" code file, its declarations are part of
> "add-interactive.h". This makes it somewhat harder than necessary to
> find relevant code and to identify clear boundaries between the two
> subsystems.
>
> Split up concerns and move declarations that relate to "add-patch.c"
> into a new "add-patch.h" header.
>
> Signed-off-by: Patrick Steinhardt <ps@pks.im>
> ---
>  add-interactive.h | 23 +++--------------------
>  add-patch.c       |  1 +
>  add-patch.h       | 26 ++++++++++++++++++++++++++
>  3 files changed, 30 insertions(+), 20 deletions(-)
>
> diff --git a/add-interactive.h b/add-interactive.h
> index da49502b765..2e3d1d871d2 100644
> --- a/add-interactive.h
> +++ b/add-interactive.h
> @@ -1,14 +1,11 @@
>  #ifndef ADD_INTERACTIVE_H
>  #define ADD_INTERACTIVE_H
>
> +#include "add-patch.h"
>  #include "color.h"
>
> -struct add_p_opt {
> -       int context;
> -       int interhunkcontext;
> -};
> -
> -#define ADD_P_OPT_INIT { .context = -1, .interhunkcontext = -1 }
> +struct pathspec;
> +struct repository;
>
>  struct add_i_state {
>         struct repository *r;
> @@ -35,21 +32,7 @@ void init_add_i_state(struct add_i_state *s, struct repository *r,
>                       struct add_p_opt *add_p_opt);
>  void clear_add_i_state(struct add_i_state *s);
>
> -struct repository;
> -struct pathspec;
>  int run_add_i(struct repository *r, const struct pathspec *ps,
>               struct add_p_opt *add_p_opt);
>
> -enum add_p_mode {
> -       ADD_P_ADD,
> -       ADD_P_STASH,
> -       ADD_P_RESET,
> -       ADD_P_CHECKOUT,
> -       ADD_P_WORKTREE,
> -};
> -
> -int run_add_p(struct repository *r, enum add_p_mode mode,
> -             struct add_p_opt *o, const char *revision,
> -             const struct pathspec *ps);
> -
>  #endif
> diff --git a/add-patch.c b/add-patch.c
> index ae9a20d8f23..3594dd22534 100644
> --- a/add-patch.c
> +++ b/add-patch.c
> @@ -3,6 +3,7 @@
>
>  #include "git-compat-util.h"
>  #include "add-interactive.h"
> +#include "add-patch.h"
>  #include "advice.h"
>  #include "editor.h"
>  #include "environment.h"
> diff --git a/add-patch.h b/add-patch.h
> new file mode 100644
> index 00000000000..4394c741076
> --- /dev/null
> +++ b/add-patch.h
> @@ -0,0 +1,26 @@
> +#ifndef ADD_PATCH_H
> +#define ADD_PATCH_H
> +
> +struct pathspec;
> +struct repository;
> +
> +struct add_p_opt {
> +       int context;
> +       int interhunkcontext;
> +};
> +
> +#define ADD_P_OPT_INIT { .context = -1, .interhunkcontext = -1 }
> +
> +enum add_p_mode {
> +       ADD_P_ADD,
> +       ADD_P_STASH,
> +       ADD_P_RESET,
> +       ADD_P_CHECKOUT,
> +       ADD_P_WORKTREE,
> +};
> +
> +int run_add_p(struct repository *r, enum add_p_mode mode,
> +             struct add_p_opt *o, const char *revision,
> +             const struct pathspec *ps);
> +
> +#endif
>
> --
> 2.51.1.930.gacf6e81ea2.dirty

Simple enough.