Re: [PATCH 2/2] refs.c: upgrade for_each_replace_ref to be a each_repo_ref_fn callback
- From
Derrick Stolee <stolee@gmail.com>
- Date
- Jul 18, 2018, 10:58 UTC
- Message-ID
- <6c74aee8-2e18-99de-f775-dced1310809f@gmail.com>
- In-Reply-To
- <20180717224935.96397-3-sbeller@google.com>
On 7/17/2018 6:49 PM, Stefan Beller wrote:
Show 70 quoted lines
> Signed-off-by: Stefan Beller <sbeller@google.com>
> ---
> builtin/replace.c | 3 ++-
> refs.c | 9 ++++-----
> refs.h | 2 +-
> replace-object.c | 3 ++-
> 4 files changed, 9 insertions(+), 8 deletions(-)
>
> diff --git a/builtin/replace.c b/builtin/replace.c
> index ef22d724bbc..5f34659071f 100644
> --- a/builtin/replace.c
> +++ b/builtin/replace.c
> @@ -39,7 +39,8 @@ struct show_data {
> enum replace_format format;
> };
>
> -static int show_reference(const char *refname, const struct object_id *oid,
> +static int show_reference(struct repository *r, const char *refname,
> + const struct object_id *oid,
> int flag, void *cb_data)
> {
> struct show_data *data = cb_data;
> diff --git a/refs.c b/refs.c
> index 2513f77acb3..5700cd4683f 100644
> --- a/refs.c
> +++ b/refs.c
> @@ -1478,12 +1478,11 @@ int refs_for_each_fullref_in(struct ref_store *refs, const char *prefix,
> return do_for_each_ref(refs, prefix, fn, 0, flag, cb_data);
> }
>
> -int for_each_replace_ref(struct repository *r, each_ref_fn fn, void *cb_data)
> +int for_each_replace_ref(struct repository *r, each_repo_ref_fn fn, void *cb_data)
> {
> - return do_for_each_ref(get_main_ref_store(r),
> - git_replace_ref_base, fn,
> - strlen(git_replace_ref_base),
> - DO_FOR_EACH_INCLUDE_BROKEN, cb_data);
> + return do_for_each_repo_ref(r, git_replace_ref_base, fn,
> + strlen(git_replace_ref_base),
> + DO_FOR_EACH_INCLUDE_BROKEN, cb_data);
> }
>
> int for_each_namespaced_ref(each_ref_fn fn, void *cb_data)
> diff --git a/refs.h b/refs.h
> index 80eec8bbc68..a0a18223a14 100644
> --- a/refs.h
> +++ b/refs.h
> @@ -317,7 +317,7 @@ int for_each_fullref_in(const char *prefix, each_ref_fn fn, void *cb_data,
> int for_each_tag_ref(each_ref_fn fn, void *cb_data);
> int for_each_branch_ref(each_ref_fn fn, void *cb_data);
> int for_each_remote_ref(each_ref_fn fn, void *cb_data);
> -int for_each_replace_ref(struct repository *r, each_ref_fn fn, void *cb_data);
> +int for_each_replace_ref(struct repository *r, each_repo_ref_fn fn, void *cb_data);
> int for_each_glob_ref(each_ref_fn fn, const char *pattern, void *cb_data);
> int for_each_glob_ref_in(each_ref_fn fn, const char *pattern,
> const char *prefix, void *cb_data);
> diff --git a/replace-object.c b/replace-object.c
> index 801b5c16789..01a5a59a35a 100644
> --- a/replace-object.c
> +++ b/replace-object.c
> @@ -6,7 +6,8 @@
> #include "repository.h"
> #include "commit.h"
>
> -static int register_replace_ref(const char *refname,
> +static int register_replace_ref(struct repository *r,
> + const char *refname,
> const struct object_id *oid,
> int flag, void *cb_data)
> {Overall, I think this is the right approach. The only problem is that you're missing a few 'the_repository' to 'r' replacements in the bodies of show_reference and register_replace_ref.
Thanks, -Stolee