Re: [PATCH] rebase --abort: cleanup refs/rewritten

From: Junio C Hamano <gitster@pobox.com>
Date: May 7, 2019, 16:07 UTC
Message-ID: <xmqqpnoujlj4.fsf@gitster-ct.c.googlers.com>
In-Reply-To: <20190507151530.GO14763@szeder.dev>

SZEDER Gábor <szeder.dev@gmail.com> writes:

Show 7 quoted lines

> This patch and the topic 'pw/rebase-abort-clean-rewritten' can't be
> compiled on its own, because it starts using 'struct replay_opts'
> here, which is defined in 'sequencer.h', but 'builtin/rebase.c'
> doesn't include that header yet.  (Though 'pu' already builds fine,
> because commit 0609b741a4 (rebase -i: combine rebase--interactive.c
> with rebase.c, 2019-04-17) in the parallel topic
> 'pw/rebase-i-internal' adds the necessary #include.)

Thanks; that's entirely my fault. I needed to find a good fork point and failed to do so. FTR, when there are too many topics I need to queue on a given day, I may not have time to compile check individual topic branches before merging them to the integration branches, testing the integration branches and pushing them out. That was what happened here.

> So, to keep future bisects from potentially tipping over the compiler
> error, this patch should either #include "sequencer.h", or be applied
> on top of 'pw/rebase-i-internal'.

I suspect that the latter was how the patch originally was developed.