From: Alex Torok <alext9@gmail.com>
To: git@vger.kernel.org
Cc: Alex Torok <alext9@gmail.com>,
Phillip Wood <phillip.wood@dunelm.org.uk>,
Denton Liu <liu.denton@gmail.com>
Subject: [PATCH v3 0/1] rebase: fix --fork-point with short ref upstream
Date: Mon, 9 Dec 2019 09:53:11 -0500 [thread overview]
Message-ID: <20191209145312.3251-1-alext9@gmail.com> (raw)
In-Reply-To: <20191205235704.31385-1-alext9@gmail.com>
Move the dwim ref logic into get_fork_point() and return an error code
so that callers of get_fork_point() know if something went wrong.
Alex Torok (1):
rebase: fix --fork-point with short refname
builtin/merge-base.c | 14 +++-----------
builtin/rebase.c | 5 +++--
commit.c | 19 +++++++++++++------
commit.h | 2 +-
refs.c | 14 ++++++++++++++
refs.h | 2 ++
t/t3431-rebase-fork-point.sh | 20 ++++++++++++++++++++
7 files changed, 56 insertions(+), 20 deletions(-)
--
2.17.1
next prev parent reply other threads:[~2019-12-09 14:53 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
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 ` Alex Torok [this message]
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191209145312.3251-1-alext9@gmail.com \
--to=alext9@gmail.com \
--cc=git@vger.kernel.org \
--cc=liu.denton@gmail.com \
--cc=phillip.wood@dunelm.org.uk \
/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).