From: Jeff King <peff@peff.net>
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: BUG: 2.11-era rebase regression when @{upstream} is implicitly used
Date: Thu, 21 Feb 2019 10:10:10 -0500 [thread overview]
Message-ID: <20190221151009.GA24309@sigill.intra.peff.net> (raw)
In-Reply-To: <87bm355h6p.fsf@evledraar.gmail.com>
On Thu, Feb 21, 2019 at 03:50:38PM +0100, Ævar Arnfjörð Bjarmason wrote:
> > Those aren't using "--fork-point", so they're going to behave
> > differently. The default with no arguments is basically "--fork-point
> > @{u}".
>
> Yeah, that's what it *should* do, but it's not equivalent to using
> --fork-point manually:
>
> # my series on top of origin/master
> $ git rev-parse HEAD
> 2a67977d3f70fa7fc4bce89db24a1218dc9ab2aa
>
> # Junio's origin/master upstream
> $ git rev-parse @{u}
> 35ee755a8c43bcb3c2786522d423f006c23d32df
>
> # Where my fork point is
> $ git merge-base --fork-point @{u}
> 35ee755a8c43bcb3c2786522d423f006c23d32df
>
> # OK
> $ git rebase 35ee755a8c43bcb3c2786522d423f006c23d32df
> Current branch master is up to date.
>
> # OK
> $ git rebase $(git merge-base --fork-point @{u})
> Current branch master is up to date.
>
> # ???
> $ git rebase
> First, rewinding head to replay your work on top of it...
> [...]
Have you tried with "git rebase --fork-point"? It does more than just
pass --fork-point to merge-base. It seems to also skip some of the "is
up to date", I think due to 1e0dacdbdb (rebase: omit patch-identical
commits with --fork-point, 2014-07-16).
I'm still not clear on whether my 4f21454b55 actually changed something
menaingful here, or if it's simply that you're getting the fork-point
behavior more consistently.
-Peff
next prev parent reply other threads:[~2019-02-21 15:10 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-14 13:23 BUG: 2.11-era rebase regression when @{upstream} is implicitly used Ævar Arnfjörð Bjarmason
2019-02-21 14:10 ` Jeff King
2019-02-21 14:50 ` Ævar Arnfjörð Bjarmason
2019-02-21 15:10 ` Jeff King [this message]
2019-02-21 21:40 ` [PATCH 0/2] rebase: fix 2.11.0-era --fork-point regression Ævar Arnfjörð Bjarmason
2019-02-21 21:40 ` [PATCH 1/2] rebase tests: test linear branch topology Ævar Arnfjörð Bjarmason
2019-02-22 14:53 ` Jeff King
2019-02-22 18:46 ` Junio C Hamano
2019-02-21 21:40 ` [PATCH 2/2] rebase: don't rebase linear topology with --fork-point Ævar Arnfjörð Bjarmason
2019-02-22 15:08 ` Jeff King
2019-02-22 16:49 ` Ævar Arnfjörð Bjarmason
2019-02-24 10:10 ` Jeff King
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=20190221151009.GA24309@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=Johannes.Schindelin@gmx.de \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).