Re: [PATCH v9 22/37] read-cache: convert post-index-change hook to use config
- From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Date
- May 27, 2021, 23:04 UTC
- Message-ID
- <87fsy7lqve.fsf@evledraar.gmail.com>
- In-Reply-To
- <20210527000856.695702-23-emilyshaffer@google.com>
On Wed, May 26 2021, Emily Shaffer wrote:
Show 11 quoted lines
> 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...