From: Phillip Wood <phillip.wood123@gmail.com>
To: "Junio C Hamano" <gitster@pobox.com>,
"SZEDER Gábor" <szeder.dev@gmail.com>
Cc: Phillip Wood <phillip.wood@dunelm.org.uk>,
Git Mailing List <git@vger.kernel.org>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>
Subject: Re: [PATCH] rebase --abort: cleanup refs/rewritten
Date: Tue, 7 May 2019 21:06:19 +0100 [thread overview]
Message-ID: <d4d1dc5c-14ec-f354-4dac-d17faf533865@gmail.com> (raw)
In-Reply-To: <xmqqpnoujlj4.fsf@gitster-ct.c.googlers.com>
On 07/05/2019 17:07, Junio C Hamano wrote:
> SZEDER Gábor <szeder.dev@gmail.com> 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@gitster-ct.c.googlers.com/T/#mb431b81731798388e12f3852747c560f8ce7c6ec
next prev parent reply other threads:[~2019-05-07 20:06 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-26 10:32 [PATCH] rebase --abort: cleanup refs/rewritten Phillip Wood
2019-04-29 16:07 ` Johannes Schindelin
2019-04-30 8:54 ` Phillip Wood
2019-04-30 22:49 ` Johannes Schindelin
2019-05-01 15:36 ` Phillip Wood
2019-05-03 9:21 ` Johannes Schindelin
2019-05-03 10:06 ` Phillip Wood
2019-05-07 15:15 ` SZEDER Gábor
2019-05-07 16:07 ` Junio C Hamano
2019-05-07 20:06 ` Phillip Wood [this message]
2019-05-14 18:03 ` [PATCH v2 0/4] rebase --abort/--quit: " Phillip Wood
2019-05-14 18:03 ` [PATCH v2 1/4] rebase: fix a memory leak Phillip Wood
2019-05-14 18:03 ` [PATCH v2 2/4] rebase: warn if state directory cannot be removed Phillip Wood
2019-05-14 18:03 ` [PATCH v2 3/4] sequencer: return errors from sequencer_remove_state() Phillip Wood
2019-05-14 18:03 ` [PATCH v2 4/4] rebase --abort/--quit: cleanup refs/rewritten Phillip Wood
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=d4d1dc5c-14ec-f354-4dac-d17faf533865@gmail.com \
--to=phillip.wood123@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=phillip.wood@dunelm.org.uk \
--cc=szeder.dev@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).