Web lists-archives.com

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




On 07/05/2019 17:07, Junio C Hamano wrote:
SZEDER Gábor <szeder.dev@xxxxxxxxx> writes:

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.

Yes that's right, there is a note on the original patch [1] explaining why - you cannot just add '#include "sequencer.h"' as there are function name conflicts between a static function in builtin/rebase.c and a global function in sequencer.c which are fixed in pw/rebase-i-internal

Best Wishes

Phillip

[1] https://public-inbox.org/git/xmqqpnoujlj4.fsf@xxxxxxxxxxxxxxxxxxxxxxxxx/T/#mb431b81731798388e12f3852747c560f8ce7c6ec