Re: [PATCH 1/5] MyFirstObjectWalk: use additional arg in config_fn_t
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Mar 12, 2024, 00:18 UTC
- Message-ID
- <xmqq4jdcmhfm.fsf@gitster.g>
- In-Reply-To
- <15b74566e07a39902556cd620e5cd6df1da3c7df.1710192973.git.dirk@gouders.net>
Dirk Gouders <dirk@gouders.net> writes:
Show 6 quoted lines
> Commit a4e7e317 (config: add ctx arg to config_fn_t) added a fourth > argument to config_fn_t but did not change relevant function calls > in Documentation/MyFirstObjectWalk.txt. > > Fix those calls and the example git_walken_config() to use > that additional argument.
> Fixes: a4e7e317 (config: add ctx arg to config_fn_t) > Cc: Glen Choo <glencbz@gmail.com>
I know what you wanted to convey with these, but in this project we do not use them. Both becomes unnecessary once you write the first part of the log message above ;-)
Show 40 quoted lines
> Signed-off-by: Dirk Gouders <dirk@gouders.net>
> ---
> Documentation/MyFirstObjectWalk.txt | 12 +++++++-----
> 1 file changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/Documentation/MyFirstObjectWalk.txt b/Documentation/MyFirstObjectWalk.txt
> index c68cdb11b9..cceac2df95 100644
> --- a/Documentation/MyFirstObjectWalk.txt
> +++ b/Documentation/MyFirstObjectWalk.txt
> @@ -210,13 +210,14 @@ We'll also need to include the `config.h` header:
>
> ...
>
> -static int git_walken_config(const char *var, const char *value, void *cb)
> +static int git_walken_config(const char *var, const char *value,
> + const struct config_context *ctx, void *cb)
> {
> /*
> * For now, we don't have any custom configuration, so fall back to
> * the default config.
> */
> - return git_default_config(var, value, cb);
> + return git_default_config(var, value, ctx, cb);
> }
> ----
>
> @@ -389,10 +390,11 @@ modifying `rev_info.grep_filter`, which is a `struct grep_opt`.
> First some setup. Add `grep_config()` to `git_walken_config()`:
>
> ----
> -static int git_walken_config(const char *var, const char *value, void *cb)
> +static int git_walken_config(const char *var, const char *value,
> + const struct config_context *ctx, void *cb)
> {
> - grep_config(var, value, cb);
> - return git_default_config(var, value, cb);
> + grep_config(var, value, ctx, cb);
> + return git_default_config(var, value, ctx, cb);
> }
> ----