From: Konstantin Ryabitsev <konstantin@linuxfoundation.org>
To: Vishal Verma <vishal@kernel.org>
Cc: tools <tools@linux.kernel.org>
Subject: Re: b4 prep -e oddness
Date: Wed, 11 Jan 2023 17:00:07 -0500 [thread overview]
Message-ID: <20230111220007.b5kjtmcvrq3tn7xj@meerkat.local> (raw)
In-Reply-To: <ad77e06d2cb9ba322abad4f27865d4d6f79f6644.camel@kernel.org>
On Wed, Jan 11, 2023 at 01:56:24PM -0700, Vishal Verma wrote:
> The problematic step seems to be:
>
> $ git --no-pager merge-base --fork-point master new_branch
> 9652673e06ea84926e3be7c5cef0285c60fe31ff
I'm not sure it's problematic as much as it's just not something you're
expecting in this particular case.
I did think that finding the actual fork-point would be useful, but I'm happy
to drop that if the expectation is that we're just looking for the best
merge-base, as opposed to the actual forking point.
> It looks like --fork-point uses the reflog, which has an entry for, I
> guess, a stale new_commit on master. (Maybe a gc will clean this up?)
>
> Instead, if I did this (drop --fork-point and just do a vanilla merge-
> base):
>
> $ git --no-pager merge-base master new_branch
> b7bfaa761d760e72a969d116517eaa12e404c262
>
> This is what I'd expect (-rc3).
>
> I'm not sure if switching to this breaks other expectations though?
No, this is literally up to what makes most sense. Do we always want to use
the actual merge-base and ignore any reflog forking history when enrolling
branches?
-K
next prev parent reply other threads:[~2023-01-11 22:00 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-11 20:56 b4 prep -e oddness Vishal Verma
2023-01-11 22:00 ` Konstantin Ryabitsev [this message]
2023-01-11 22:22 ` Vishal Verma
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=20230111220007.b5kjtmcvrq3tn7xj@meerkat.local \
--to=konstantin@linuxfoundation.org \
--cc=tools@linux.kernel.org \
--cc=vishal@kernel.org \
/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 NNTP newsgroup(s).