From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Mon, 31 May 2021 19:21:38 GMT
Subject: Re: [PATCH v9 22/37] read-cache: convert post-index-change hook to use config
Message-ID: <60b5374298413_312ef208a0@natae.notmuch>
In-Reply-To: <87fsy7lqve.fsf@evledraar.gmail.com>

Ævar Arnfjörð Bjarmason wrote:
> 
> On Wed, May 26 2021, Emily Shaffer wrote:
> 
> >  Part of the linkgit:git[1] suite
> > diff --git a/read-cache.c b/read-cache.c
> > index 1b3c2eb408..6a5c9403f4 100644
> > --- a/read-cache.c
> > +++ b/read-cache.c
> > @@ -26,6 +26,8 @@
> >  #include "thread-utils.h"
> >  #include "progress.h"
> >  #include "sparse-index.h"
> > +#include "hook.h"
> > +>>>>>>> 9524a9d29d (read-cache: convert post-index-change hook to use config)
> 
> This adds a conflict marker, which is removed later in the series.
> 
> Obviously a trivial mistake, but it's a good idea to use git rebase -i
> -x 'make test' or equivalent for such a large series, perhaps there are
> other inter-patch issues lurking here...

Ahh, thanks so much for this. I've often wanted to do this and sometimes
wrote simple scripts. It's good to know there a straightforward way from
standard commands.

That way I have less excuse not to do the check... and I just found a
couple of transitory issues on my latest patch series.

Cheers.

-- 
Felipe Contreras