From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: [PATCH] checkout: Better error message on invalid branch name
Date: Mon, 21 Jun 2010 18:53:39 +0000 [thread overview]
Message-ID: <1277146419-19507-1-git-send-email-avarab@gmail.com> (raw)
Change the error message for `git checkout -b "I LOVE YOU"' and other
invalid branch names to say what branch names are invalid, rather than
just saying we don't like it.
Before:
$ git checkout -b "I LOVE YOU"
fatal: git checkout: we do not like 'I LOVE YOU' as a branch name.
After:
$ git checkout -b "I LOVE YOU"
fatal: git checkout: The name "I LOVE YOU" is not a valid Git branch name.
A branch name can not:
- Have a path component that begins with "."
- Have a double dot ".."
- Have an ASCII control character, "~", "^", ":" or SP, anywhere
- End with a "/"
- End with ".lock"
- Contain a "\" (backslash
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
Git didn't like my branch name, but I didn't like its error
message. Here's a fix for it.
builtin/checkout.c | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/builtin/checkout.c b/builtin/checkout.c
index 1994be9..fec8335 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -856,7 +856,15 @@ no_reference:
if (opts.new_branch) {
struct strbuf buf = STRBUF_INIT;
if (strbuf_check_branch_ref(&buf, opts.new_branch))
- die("git checkout: we do not like '%s' as a branch name.",
+ die("git checkout: The name \"%s\" is not a valid branch name.\n"
+ "A branch name can not:\n"
+ /* From the comment for bad_ref_char in refs.c */
+ " - Have a path component that begins with \".\"\n"
+ " - Have a double dot \"..\"\n"
+ " - Have an ASCII control character, \"~\", \"^\", \":\" or SP, anywhere\n"
+ " - End with a \"/\"\n"
+ " - End with \".lock\"\n"
+ " - Contain a \"\\\" (backslash)",
opts.new_branch);
if (!get_sha1(buf.buf, rev))
die("git checkout: branch %s already exists", opts.new_branch);
--
1.7.1.251.g92a7
next reply other threads:[~2010-06-21 18:54 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-21 18:53 Ævar Arnfjörð Bjarmason [this message]
2010-06-21 20:58 ` [PATCH] checkout: Better error message on invalid branch name Junio C Hamano
2010-06-21 21:09 ` Ævar Arnfjörð Bjarmason
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=1277146419-19507-1-git-send-email-avarab@gmail.com \
--to=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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 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).