From: "René Scharfe" <l.s.r@web.de>
To: Jeff King <peff@peff.net>
Cc: Dana Dahlstrom <dahlstrom@google.com>,
git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>
Subject: [PATCH 2/2] checkout: improve error messages for -b with extra argument
Date: Sun, 24 May 2020 09:23:00 +0200 [thread overview]
Message-ID: <c5e797b8-4b80-f9fa-e746-95f7f39e74f8@web.de> (raw)
In-Reply-To: <20200523162914.GA2178752@coredump.intra.peff.net>
When we try to create a branch "foo" based on "origin/master" and give
git commit -b an extra unsupported argument "bar", it confusingly
reports:
$ git checkout -b foo origin/master bar
fatal: 'bar' is not a commit and a branch 'foo' cannot be created from it
$ git checkout --track -b foo origin/master bar
fatal: 'bar' is not a commit and a branch 'foo' cannot be created from it
That's wrong, because it very well understands that "origin/master" is
supposed to be the start point for the new branch and not "bar". Check
if we got a commit and show more fitting messages in that case instead:
$ git checkout -b foo origin/master bar
fatal: Cannot update paths and switch to branch 'foo' at the same time.
$ git checkout --track -b foo origin/master bar
fatal: '--track' cannot be used with updating paths
Original-patch-by: Jeff King <peff@peff.net>
Signed-off-by: René Scharfe <l.s.r@web.de>
---
builtin/checkout.c | 2 +-
t/t2018-checkout-branch.sh | 2 +-
t/t2027-checkout-track.sh | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/builtin/checkout.c b/builtin/checkout.c
index e9d111bb83..24336e1017 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -1689,7 +1689,7 @@ static int checkout_main(int argc, const char **argv, const char *prefix,
* Try to give more helpful suggestion.
* new_branch && argc > 1 will be caught later.
*/
- if (opts->new_branch && argc == 1)
+ if (opts->new_branch && argc == 1 && !new_branch_info.commit)
die(_("'%s' is not a commit and a branch '%s' cannot be created from it"),
argv[0], opts->new_branch);
diff --git a/t/t2018-checkout-branch.sh b/t/t2018-checkout-branch.sh
index d99b699396..5b8c042997 100755
--- a/t/t2018-checkout-branch.sh
+++ b/t/t2018-checkout-branch.sh
@@ -265,7 +265,7 @@ test_expect_success 'checkout -b rejects an invalid start point' '
test_i18ngrep "is not a commit" err
'
-test_expect_failure 'checkout -b rejects an extra path argument' '
+test_expect_success 'checkout -b rejects an extra path argument' '
test_must_fail git checkout -b branch4 branch1 file1 2>err &&
test_i18ngrep "Cannot update paths and switch to branch" err
'
diff --git a/t/t2027-checkout-track.sh b/t/t2027-checkout-track.sh
index d0b41d7cd0..bcba1bf90c 100755
--- a/t/t2027-checkout-track.sh
+++ b/t/t2027-checkout-track.sh
@@ -16,7 +16,7 @@ test_expect_success 'checkout --track -b creates a new tracking branch' '
test $(git config --get branch.branch1.merge) = refs/heads/master
'
-test_expect_failure 'checkout --track -b rejects an extra path argument' '
+test_expect_success 'checkout --track -b rejects an extra path argument' '
test_must_fail git checkout --track -b branch2 master one.t 2>err &&
test_i18ngrep "cannot be used with updating paths" err
'
--
2.26.2
next prev parent reply other threads:[~2020-05-24 7:24 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-21 19:00 'HEAD' is not a commit (according to git-checkout) Dana Dahlstrom
2020-05-21 19:16 ` Jeff King
2020-05-23 7:07 ` René Scharfe
2020-05-23 16:29 ` Jeff King
2020-05-24 7:22 ` [PATCH 1/2] checkout: add tests for -b and --track René Scharfe
2020-05-27 6:40 ` Jeff King
2020-05-28 13:53 ` René Scharfe
2020-05-24 7:23 ` René Scharfe [this message]
2020-05-27 6:42 ` [PATCH 2/2] checkout: improve error messages for -b with extra argument Jeff King
2020-05-24 7:23 ` 'HEAD' is not a commit (according to git-checkout) René Scharfe
2020-05-24 16:15 ` Junio C Hamano
2020-05-27 6:52 ` Jeff King
2020-05-27 15:44 ` Junio C Hamano
2020-05-27 15:52 ` Randall S. Becker
2020-05-27 17:31 ` Jeff King
2020-05-21 19:49 ` René Scharfe
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=c5e797b8-4b80-f9fa-e746-95f7f39e74f8@web.de \
--to=l.s.r@web.de \
--cc=dahlstrom@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/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).