On Fri, May 10, 2024 at 02:00:31AM -0700, Karthik Nayak wrote:
> Patrick Steinhardt <ps@xxxxxx> writes:
>
> > Throughout the reftable library the `reftable_write_options` are
> > sometimes referred to as `cfg` and sometimes as `opts`. Unify these to
> > consistently use `opts` to avoid confusion.
> >
>
> I think one location was missed:
>
> diff --git a/reftable/stack_test.c b/reftable/stack_test.c
> index 3316d55f19..40eb793b3c 100644
> --- a/reftable/stack_test.c
> +++ b/reftable/stack_test.c
> @@ -396,7 +396,7 @@ static void
> test_reftable_stack_auto_compaction_fails_gracefully(void)
>
> static void test_reftable_stack_validate_refname(void)
> {
> - struct reftable_write_options cfg = { 0 };
> + struct reftable_write_options opts = { 0 };
> struct reftable_stack *st = NULL;
> int err;
> char *dir = get_tmp_dir(__LINE__);
> @@ -410,7 +410,7 @@ static void test_reftable_stack_validate_refname(void)
> };
> char *additions[] = { "a", "a/b/c" };
>
> - err = reftable_new_stack(&st, dir, cfg);
> + err = reftable_new_stack(&st, dir, opts);
> EXPECT_ERR(err);
>
> err = reftable_stack_add(st, &write_test_ref, &ref);
>
> Rest of the patch looks good. Thanks
This section has been removed in 485c63cf5c (reftable: remove name
checks, 2024-04-08), so it doesn't exist in `master` anymore. Which is
cheating a bit because the topic does not build on top of anything where
that commit would be reachable. But both rebasing the topic and
willfully creating a conflict would probably make Junio's life harder
now, so I'll just leave it at that and lie by ommission.
But thanks anyway for reading this carefully and double checking the
results!
Patrick
Attachment:
signature.asc
Description: PGP signature
