Subject: Re: [PATCH v4 0/5] miscellaneous build mods (part 2)

From: Patrick Steinhardt <[email-masked]>
Date: Mon, 19 May 2025 21:08:36 +0200

On Mon, May 19, 2025 at 11:48:01AM -0700, Junio C Hamano wrote:
> Ramsay Jones <[email-masked]> writes:
> 
> > Again, I did a test merge to master@cb96e1697a, next@a128411c76
> > and seen@df1b4f9cf9. The conflict which showed up in v1 against
> > the 'seen' branch now appears in the 'master' branch and has the
> > same resolution as v1.
> 
> Thanks.
> 
> > A range-diff against v3 is given below.
> >
> > [+] https://lore.kernel.org/git/[email-masked]/
> >
> > Changes in v3:
> >
> > Patch #3 changed as a result of Patrick's review [*]:
> >
> >  - use the '/' magic string operator when setting the
> >    ETC_GIT{CONFIG,ATTRIBUTES} build options.
> >  - add the default values to the 'description' fields
> >    for the 'gitconfig' and 'gitattributes' option
> >    definitions
> >
> > Also, Junio, the range-diff below shows the typo fixup, but
> > you should find that it doesn't show for you this time. ;)
> 
> OK.  And changes in v4 are just that two redundant comments in the
> option definitions are removed, which makes sense looking at the
> discussion from the sidelines.
> 
> Will queue.  Are we done with this series by now?

Yup, the range diff looks as expected, so this is ready to go from my
point of view. Thanks!

Patrick