[PATCH 6/6] attr.h: remove duplicate struct definition

[PATCH 6/6] attr.h: remove duplicate struct definition

[Elia Pinto]

struct index_state is declared more than once.

Signed-off-by: Elia Pinto <gitter.spiros@gmail.com>
---
 attr.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/attr.h b/attr.h
index 3732505eda..3fb40cced0 100644
--- a/attr.h
+++ b/attr.h
@@ -121,7 +121,6 @@ struct git_attr;
 /* opaque structures used internally for attribute collection */
 struct all_attrs_item;
 struct attr_stack;
-struct index_state;
 
 /*
  * Given a string, return the gitattribute object that
-- 
2.35.1

Re: [PATCH 6/6] attr.h: remove duplicate struct definition

[Junio C Hamano]

Elia Pinto <gitter.spiros@gmail.com> writes:

> Subject: Re: [PATCH 6/6] attr.h: remove duplicate struct definition

I do not see other 5 from 1/6 thru 5/6 on the list.

If this is a leftover bit follow-up to the 5-patch series whose
cover letter was <20220313195536.224075-1-gitter.spiros@gmail.com>
we often see such a message

 - with subject numbered as [PATCH 6/5]
 - as follow-up to the same cover letter.

The patch text looks good, and we can see from the output of

 $ git grep '^struct .*;' \*.h |
   sort | uniq -c | sort -n | grep -v '^ *1 '

that this is the only duplicated opaque struct declaration in the
header files.

For now, I'd assume that is the case and queue it on the same topic
branch as the other five.  Thanks.

> struct index_state is declared more than once.
>
> Signed-off-by: Elia Pinto <gitter.spiros@gmail.com>
> ---
>  attr.h | 1 -
>  1 file changed, 1 deletion(-)
>
> diff --git a/attr.h b/attr.h
> index 3732505eda..3fb40cced0 100644
> --- a/attr.h
> +++ b/attr.h
> @@ -121,7 +121,6 @@ struct git_attr;
>  /* opaque structures used internally for attribute collection */
>  struct all_attrs_item;
>  struct attr_stack;
> -struct index_state;
>  
>  /*
>   * Given a string, return the gitattribute object that

Re: [PATCH 6/6] attr.h: remove duplicate struct definition

[Elia Pinto]

Il giorno lun 14 mar 2022 alle ore 06:40 Junio C Hamano
<gitster@pobox.com> ha scritto:
>
> Elia Pinto <gitter.spiros@gmail.com> writes:
>
> > Subject: Re: [PATCH 6/6] attr.h: remove duplicate struct definition
>
> I do not see other 5 from 1/6 thru 5/6 on the list.
I'm sorry. It was my mistake in producing the patch. There are no
other cases like this.

Thanks for your patience
>
> If this is a leftover bit follow-up to the 5-patch series whose
> cover letter was <20220313195536.224075-1-gitter.spiros@gmail.com>
> we often see such a message
>
>  - with subject numbered as [PATCH 6/5]
>  - as follow-up to the same cover letter.
>
> The patch text looks good, and we can see from the output of
>
>  $ git grep '^struct .*;' \*.h |
>    sort | uniq -c | sort -n | grep -v '^ *1 '
>
> that this is the only duplicated opaque struct declaration in the
> header files.
>
> For now, I'd assume that is the case and queue it on the same topic
> branch as the other five.  Thanks.
>
> > struct index_state is declared more than once.
> >
> > Signed-off-by: Elia Pinto <gitter.spiros@gmail.com>
> > ---
> >  attr.h | 1 -
> >  1 file changed, 1 deletion(-)
> >
> > diff --git a/attr.h b/attr.h
> > index 3732505eda..3fb40cced0 100644
> > --- a/attr.h
> > +++ b/attr.h
> > @@ -121,7 +121,6 @@ struct git_attr;
> >  /* opaque structures used internally for attribute collection */
> >  struct all_attrs_item;
> >  struct attr_stack;
> > -struct index_state;
> >
> >  /*
> >   * Given a string, return the gitattribute object that

Re: [PATCH 6/6] attr.h: remove duplicate struct definition

[Junio C Hamano]

Elia Pinto <gitter.spiros@gmail.com> writes:

> Il giorno lun 14 mar 2022 alle ore 06:40 Junio C Hamano
> <gitster@pobox.com> ha scritto:
>>
>> Elia Pinto <gitter.spiros@gmail.com> writes:
>>
>> > Subject: Re: [PATCH 6/6] attr.h: remove duplicate struct definition
>>
>> I do not see other 5 from 1/6 thru 5/6 on the list.
> I'm sorry. It was my mistake in producing the patch. There are no
> other cases like this.
>
> Thanks for your patience

No need to say sorry!  I just wanted to make sure I have all pieces
necessary.

Thanks.