From: Denton Liu <liu.denton@gmail.com>
To: Git Mailing List <git@vger.kernel.org>
Cc: Eric Sunshine <sunshine@sunshineco.com>,
Junio C Hamano <gitster@pobox.com>
Subject: [PATCH v2 0/3] allow checkout and branch to create branches on a merge base
Date: Fri, 26 Apr 2019 12:21:06 -0700 [thread overview]
Message-ID: <cover.1556305561.git.liu.denton@gmail.com> (raw)
In-Reply-To: <cover.1556226502.git.liu.denton@gmail.com>
Thanks for your comments, Eric and Junio.
Eric, I've combined the `test_when_finished` calls together so that the
statements within appear in a more "logical" order.
Junio, I've taken your suggestion and moved the change into
`create_branch`. Initially, I didn't want to do this because I didn't
want to change the semantics of git-branch but introducing the merge
base syntax seems to be a positive change so let's do it.
Thanks,
Denton
---
Changes since v1:
* Moved multiple `test_when_finished` calls that appeared in "reverse
order" into one call that appears in the logical order
* Made create_branch handle merge base revs instead of putting a hack
into checkout
Denton Liu (3):
t2018: cleanup in current test
t2018: demonstrate checkout -b merge base bug
branch: make create_branch accept a merge base rev
Documentation/git-branch.txt | 6 +++-
branch.c | 2 +-
t/t2018-checkout-branch.sh | 56 +++++++++++++++++++-----------------
t/t3200-branch.sh | 14 ++++++---
4 files changed, 46 insertions(+), 32 deletions(-)
Range-diff against v1:
1: c0c7171e3d ! 1: 9d04faf29d t2018: cleanup in current test
@@ -19,8 +19,9 @@
'
test_expect_success 'checkout -b to a new branch, set to HEAD' '
-+ test_when_finished test_might_fail git branch -D branch2 &&
-+ test_when_finished git checkout branch1 &&
++ test_when_finished "
++ git checkout branch1 &&
++ test_might_fail git branch -D branch2" &&
do_checkout branch2
'
@@ -28,8 +29,9 @@
- git checkout branch1 &&
- git branch -D branch2 &&
-
-+ test_when_finished test_might_fail git branch -D branch2 &&
-+ test_when_finished git checkout branch1 &&
++ test_when_finished "
++ git checkout branch1 &&
++ test_might_fail git branch -D branch2" &&
do_checkout branch2 $HEAD1
'
@@ -45,8 +47,9 @@
'
test_expect_success 'checkout -f -b to a new branch with unmergeable changes discards changes' '
-+ test_when_finished test_might_fail git branch -D branch2 &&
-+ test_when_finished git checkout branch1 &&
++ test_when_finished "
++ git checkout branch1 &&
++ test_might_fail git branch -D branch2" &&
+
# still dirty and on branch1
do_checkout branch2 $HEAD1 "-f -b" &&
@@ -58,9 +61,10 @@
-
- # clean up from previous test
- git branch -D branch2 &&
-+ test_when_finished test_might_fail git branch -D branch2 &&
-+ test_when_finished git checkout branch1 &&
-+ test_when_finished git reset --hard &&
++ test_when_finished "
++ git reset --hard &&
++ git checkout branch1 &&
++ test_might_fail git branch -D branch2" &&
setup_dirty_mergeable &&
do_checkout branch2 $HEAD1 &&
2: ff38bdb564 ! 2: 5e8320cd80 t2018: demonstrate checkout -b merge base bug
@@ -28,21 +28,21 @@
'
+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 &&
++ test_when_finished "
++ git checkout branch1 &&
++ test_might_fail git branch -D branch2" &&
+ 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 &&
+ test_when_finished "
+ git checkout branch1 &&
@@
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...
+'
3: 031780431d < -: ---------- checkout: allow -b/-B to work on a merge base
-: ---------- > 3: c91c7535a7 branch: make create_branch accept a merge base rev
--
2.21.0.1033.g0e8cc1100c
next prev parent reply other threads:[~2019-04-26 19:21 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 ` [PATCH 2/3] t2018: demonstrate checkout -b merge base bug Denton Liu
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 ` Denton Liu [this message]
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=cover.1556305561.git.liu.denton@gmail.com \
--to=liu.denton@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=sunshine@sunshineco.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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.