From: Alex Torok <alext9@gmail.com>
To: git@vger.kernel.org
Cc: Alex Torok <alext9@gmail.com>
Subject: [PATCH 0/3] rebase: fix bug in --fork-point
Date: Thu, 5 Dec 2019 17:53:19 -0500 [thread overview]
Message-ID: <20191205225322.5529-1-alext9@gmail.com> (raw)
git rebase --fork-point with a short branch ref name (without
refs/heads/ prefix) for the upstream will not use the fork point between
the upstream and the branch.
If git rebase --forkpoint is used with a full ref on the upstream
(refs/heads/branchName), the fork point between the branch and upstream
is correctly used.
This bug was introduced in 2.20.0 with the c implementation of rebase. I
was able to reproduce it on next and master.
The code path for rebase with --fork-point and a user-provided upstream
does not use a DWIM method to look up the full ref name. This leads to
get_fork_point returning a null pointer and rebase using the upstream
itself instead of the fork point between the upstream and branch.
I looked in other places that call get_fork_point and found that
in handle_fork_point of builtin/merge_base.c, dwim_ref is used to find
the full ref name before calling get_fork_point.
I initially based this change off of maint, but then saw that there were
some tests added for rebase --fork-point on master, so I rebased onto
there to build off of those tests, but I'm not sure if that was the "right"
thing to do.
Alex Torok (3):
rebase: add test for rebase --fork-point with short upstream
rebase: refactor dwim_ref_or_die from merge-base.c
rebase: fix rebase to use full ref to find fork-point
builtin/merge-base.c | 9 +--------
builtin/rebase.c | 4 +++-
refs.c | 14 ++++++++++++++
refs.h | 1 +
t/t3431-rebase-fork-point.sh | 1 +
5 files changed, 20 insertions(+), 9 deletions(-)
--
2.17.1
next reply other threads:[~2019-12-05 22:55 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-05 22:53 Alex Torok [this message]
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
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=20191205225322.5529-1-alext9@gmail.com \
--to=alext9@gmail.com \
--cc=git@vger.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.
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).