From: Denton Liu <liu.denton@gmail.com>
To: Git Mailing List <git@vger.kernel.org>
Subject: [PATCH 2/3] t2018: demonstrate checkout -b merge base bug
Date: Thu, 25 Apr 2019 14:10:37 -0700 [thread overview]
Message-ID: <ff38bdb5649c3bb028a5227bb0f9569073b8a500.1556226502.git.liu.denton@gmail.com> (raw)
In-Reply-To: <cover.1556226502.git.liu.denton@gmail.com>
In git-checkout.txt, it states
As a special case, you may use `"A...B"` as a shortcut for the
merge base of `A` and `B` if there is exactly one merge base. You can
leave out at most one of `A` and `B`, in which case it defaults to `HEAD`.
However, there exists a bug where performing
$ git checkout -b test master...
fails with the message
fatal: Not a valid object name: 'master...'.
Demonstrate this failure so that it can be corrected later.
Signed-off-by: Denton Liu <liu.denton@gmail.com>
---
t/t2018-checkout-branch.sh | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/t/t2018-checkout-branch.sh b/t/t2018-checkout-branch.sh
index fdb7fd282d..a3fa520d2e 100755
--- a/t/t2018-checkout-branch.sh
+++ b/t/t2018-checkout-branch.sh
@@ -65,6 +65,12 @@ test_expect_success 'checkout -b to a new branch, set to HEAD' '
do_checkout branch2
'
+test_expect_failure 'checkout -b to a merge base' '
+ test_when_finished test_might_fail git branch -D branch2 &&
+ test_when_finished git checkout branch1 &&
+ git checkout -b branch2 branch1...
+'
+
test_expect_success 'checkout -b to a new branch, set to an explicit ref' '
test_when_finished test_might_fail git branch -D branch2 &&
test_when_finished git checkout branch1 &&
@@ -122,6 +128,13 @@ test_expect_success 'checkout -B to an existing branch resets branch to HEAD' '
do_checkout branch2 "" -B
'
+test_expect_failure 'checkout -B to a merge base' '
+ git checkout branch1 &&
+ git branch -D branch2 &&
+
+ git checkout -B branch2 branch1...
+'
+
test_expect_success 'checkout -B to an existing branch from detached HEAD resets branch to HEAD' '
git checkout $(git rev-parse --verify HEAD) &&
--
2.21.0.1033.g0e8cc1100c
next prev parent reply other threads:[~2019-04-25 21:10 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-25 21:10 [PATCH 0/3] checkout: allow -b/-B to work on a merge base Denton Liu
2019-04-25 21:10 ` [PATCH 1/3] t2018: cleanup in current test Denton Liu
2019-04-25 22:34 ` Eric Sunshine
2019-04-26 0:40 ` Denton Liu
2019-04-26 2:50 ` Junio C Hamano
2019-04-26 6:58 ` Eric Sunshine
2019-04-25 21:10 ` Denton Liu [this message]
2019-04-25 21:10 ` [PATCH 3/3] checkout: allow -b/-B to work on a merge base Denton Liu
2019-04-26 3:02 ` Junio C Hamano
2019-04-26 4:59 ` Junio C Hamano
2019-04-26 19:21 ` [PATCH v2 0/3] allow checkout and branch to create branches " Denton Liu
2019-04-26 19:21 ` [PATCH v2 1/3] t2018: cleanup in current test Denton Liu
2019-04-26 19:21 ` [PATCH v2 2/3] t2018: demonstrate checkout -b merge base bug Denton Liu
2019-04-26 19:21 ` [PATCH v2 3/3] branch: make create_branch accept a merge base rev Denton Liu
2019-04-26 23:07 ` [PATCH v2 0/3] allow checkout and branch to create branches on a merge base Junio C Hamano
2019-04-26 23:40 ` Denton Liu
2019-04-26 23:52 ` Denton Liu
2019-04-27 0:01 ` Junio C Hamano
2019-04-27 12:02 ` [PATCH v3 0/2] " Denton Liu
2019-04-27 12:02 ` [PATCH v3 1/2] t2018: cleanup in current test Denton Liu
2019-04-27 12:02 ` [PATCH v3 2/2] branch: make create_branch accept a merge base rev Denton Liu
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=ff38bdb5649c3bb028a5227bb0f9569073b8a500.1556226502.git.liu.denton@gmail.com \
--to=liu.denton@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).