From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: Taylor Blau <me@ttaylorr.com>
Cc: Phillip Wood via GitGitGadget <gitgitgadget@gmail.com>,
y@nand.local, git@vger.kernel.org,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Phillip Wood <phillip.wood@dunelm.org.uk>
Subject: Re: [PATCH 0/2] rebase: stop setting GIT_REFLOG_ACTION
Date: Mon, 07 Nov 2022 16:51:38 +0100 [thread overview]
Message-ID: <221107.86mt92vjul.gmgdl@evledraar.gmail.com> (raw)
In-Reply-To: <Y2WIz5qvjQMfXPgP@nand.local>
On Fri, Nov 04 2022, Taylor Blau wrote:
> On Fri, Nov 04, 2022 at 03:19:00PM +0000, Phillip Wood via GitGitGadget wrote:
>> This is a follow up to pw/rebase-reflog-fixes that moves away from using
>> GIT_REFLOG_ACTION internally. This conflicts with patches 12 & 14 in [1]. As
>> this series replaces the code being changed in those patches I think the
>> best solution would be to just drop them.
>
> Thanks, I appreciate the updated round.
>
> The conflict you noted in [1] is a perfect example of why I dislike
> queuing sweeping leak cleanups like in that series. Those two patches
> need to get dropped in order to queue this series. OK, except what
> happens if a different part of [1] marks a test as leak-free when that
> is no longer the case because of something in this series?
I'm about to rebase my v2 on this topic, which I think is the best way
forward, so this is about to become a moot point.
But I think this is a good example of why it's better to solve the merge
conflict rather than dropping patches from one topic:
In this case the merge conflict is trivial to solve: Keep the side of
this topic over mine, and after remove the one function call the
compiler was alerting about.
> I haven't queued this topic yet, so perhaps all of this is moot with
> respect to these particular two series. But in general, such a problem
> is not hard to imagine.
Yes, by ejecting the two patches from my topic it doesn't pass anymore
with:
git rebase -i -x 'GIT_TEST_PASSING_SANITIZE_LEAK=check GIT_TEST_SANITIZE_LEAK_LOG=true make SANITIZE=leak test'
Which is not really a problem, it's an obscure test mode that only I'm
using, and before that topic we failed on "master" anyway. Just say'n,
in general... :)
next prev parent reply other threads:[~2022-11-07 15:57 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-04 15:19 [PATCH 0/2] rebase: stop setting GIT_REFLOG_ACTION Phillip Wood via GitGitGadget
2022-11-04 15:19 ` [PATCH 1/2] sequencer: stop exporting GIT_REFLOG_ACTION Phillip Wood via GitGitGadget
2022-11-04 21:56 ` Taylor Blau
2022-11-07 16:12 ` Ævar Arnfjörð Bjarmason
2022-11-07 19:35 ` Phillip Wood
2022-11-08 9:54 ` Phillip Wood
2022-11-08 14:51 ` Ævar Arnfjörð Bjarmason
2022-11-04 15:19 ` [PATCH 2/2] rebase: " Phillip Wood via GitGitGadget
2022-11-04 21:49 ` [PATCH 0/2] rebase: stop setting GIT_REFLOG_ACTION Taylor Blau
2022-11-04 21:49 ` Taylor Blau
2022-11-07 15:51 ` Ævar Arnfjörð Bjarmason [this message]
2022-11-07 19:56 ` Taylor Blau
2022-11-09 14:21 ` [PATCH v2 " Phillip Wood via GitGitGadget
2022-11-09 14:21 ` [PATCH v2 1/2] sequencer: stop exporting GIT_REFLOG_ACTION Phillip Wood via GitGitGadget
2022-11-09 14:21 ` [PATCH v2 2/2] rebase: " Phillip Wood via GitGitGadget
2022-11-09 16:05 ` [PATCH v2 0/2] rebase: stop setting GIT_REFLOG_ACTION Ævar Arnfjörð Bjarmason
2022-11-09 16:30 ` Phillip Wood
2022-11-09 23:17 ` Taylor Blau
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=221107.86mt92vjul.gmgdl@evledraar.gmail.com \
--to=avarab@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=me@ttaylorr.com \
--cc=phillip.wood@dunelm.org.uk \
--cc=y@nand.local \
/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.
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).