From: Alex Torok <alext9@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 1/3] rebase: add test for rebase --fork-point with short upstream
Date: Thu, 5 Dec 2019 18:25:36 -0500 [thread overview]
Message-ID: <CANmPhj20-K1f4sL6m3YmZEy+9WdV9YknXfUdLsGCaehv+axb+Q@mail.gmail.com> (raw)
In-Reply-To: <xmqqv9quxtle.fsf@gitster-ct.c.googlers.com>
That was the intention. Your idea for ordering makes more sense.
I'll reorder the commits and submit new patches.
On Thu, Dec 5, 2019 at 6:04 PM Junio C Hamano <gitster@pobox.com> wrote:
>
> Alex Torok <alext9@gmail.com> writes:
>
> > This proves the bug of "rebase --fork-point upstream branch" not using
> > the fork point of upstream and branch if upstream is not the full
> > refname of the upstream branch.
> >
> > Signed-off-by: Alex Torok <alext9@gmail.com>
> > ---
> > t/t3431-rebase-fork-point.sh | 1 +
> > 1 file changed, 1 insertion(+)
>
> Is this new test expected to fail after applying only 1/3 and then
> starts working after applying all 3 patches?
>
> If so, it probably makes a lot mroe sense to reorder the series to
> have 2/3 as a single preparatory patch, with 1/3 + 3/3 combined into
> a single patch "rebase: find --fork-point with full ref" to fix the
> code and protect the fix with the test at the same time.
>
> > diff --git a/t/t3431-rebase-fork-point.sh b/t/t3431-rebase-fork-point.sh
> > index 78851b9a2a..6ecdae918e 100755
> > --- a/t/t3431-rebase-fork-point.sh
> > +++ b/t/t3431-rebase-fork-point.sh
> > @@ -49,6 +49,7 @@ test_rebase 'G F C D B A' --no-fork-point --onto D
> > test_rebase 'G F C B A' --no-fork-point --keep-base
> > test_rebase 'G F E D B A' --fork-point refs/heads/master
> > test_rebase 'G F D B A' --fork-point --onto D refs/heads/master
> > +test_rebase 'G F D B A' --fork-point --onto D master
> > test_rebase 'G F B A' --fork-point --keep-base refs/heads/master
> > test_rebase 'G F C E D B A' refs/heads/master
> > test_rebase 'G F C D B A' --onto D refs/heads/master
next prev parent reply other threads:[~2019-12-05 23:25 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-05 22:53 [PATCH 0/3] rebase: fix bug in --fork-point Alex Torok
2019-12-05 22:53 ` [PATCH 1/3] rebase: add test for rebase --fork-point with short upstream Alex Torok
2019-12-05 23:04 ` Junio C Hamano
2019-12-05 23:25 ` Alex Torok [this message]
2019-12-05 22:53 ` [PATCH 2/3] rebase: refactor dwim_ref_or_die from merge-base.c Alex Torok
2019-12-05 22:53 ` [PATCH 3/3] rebase: fix rebase to use full ref to find fork-point Alex Torok
2019-12-05 23:57 ` [PATCH v2 0/2] rebase: fix bug in --fork-point Alex Torok
2019-12-05 23:57 ` [PATCH v2 1/2] rebase: refactor dwim_ref_or_die from merge-base.c Alex Torok
2019-12-06 1:23 ` Denton Liu
2019-12-06 13:13 ` Alex Torok
2019-12-05 23:57 ` [PATCH v2 2/2] rebase: find --fork-point with full ref Alex Torok
2019-12-06 1:48 ` Denton Liu
2019-12-06 10:52 ` Phillip Wood
2019-12-06 13:46 ` Alex Torok
2019-12-06 19:11 ` [PATCH v2 2/2] rebase: find --fork-point with full refgg Denton Liu
2019-12-06 19:35 ` Phillip Wood
2019-12-09 14:53 ` [PATCH v3 0/1] rebase: fix --fork-point with short ref upstream Alex Torok
2019-12-09 14:53 ` [PATCH v3 1/1] rebase: fix --fork-point with short refname Alex Torok
2019-12-09 18:51 ` Junio C Hamano
2019-12-11 1:21 ` Alex Torok
2019-12-11 12:21 ` Denton Liu
2019-12-11 16:02 ` Eric Sunshine
2020-02-11 18:15 ` [PATCH v4 1/1] rebase: --fork-point regression fix Junio C Hamano
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=CANmPhj20-K1f4sL6m3YmZEy+9WdV9YknXfUdLsGCaehv+axb+Q@mail.gmail.com \
--to=alext9@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).