From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 3/3] branch: forbid refs/heads/HEAD
Date: Fri, 13 Oct 2017 09:15:01 -0400 [thread overview]
Message-ID: <20171013131501.3qarwhanktfvgjqd@sigill.intra.peff.net> (raw)
In-Reply-To: <20171013051132.3973-4-gitster@pobox.com>
On Fri, Oct 13, 2017 at 02:11:32PM +0900, Junio C Hamano wrote:
> strbuf_check_branch_ref() is the central place where many codepaths
> see if a proposed name is suitable for the name of a branch. It was
> designed to allow us to get stricter than the check_refname_format()
> check used for refnames in general, and we already use it to reject
> a branch whose name begins with a '-'.
>
> Use it to also reject "HEAD" as a branch name.
Heh, I just pointed somebody to this a day or two ago as #leftoverbit. I
guess it's taken now. :)
Related to this: should we do a better job of confirming that the
refname is available for use?
If you do:
git branch foo
git checkout -b foo/bar
then "foo/bar" is not available. And for "checkout -b", we'd notice when
we tried to create the ref. But for:
git checkout --orphan foo/bar
we'd update HEAD with a non-viable name, and only find out later during
"git commit". That's not the end of the world, but it might be nice to
complain when writing the symlink.
Largely orthogonal to the problem you're solving here, but I suspect it
may touch the same code, so it might be worth thinking about while we're
here.
> diff --git a/t/t1430-bad-ref-name.sh b/t/t1430-bad-ref-name.sh
> index e88349c8a0..3ecb2eab0c 100755
> --- a/t/t1430-bad-ref-name.sh
> +++ b/t/t1430-bad-ref-name.sh
> @@ -331,4 +331,12 @@ test_expect_success 'update-ref --stdin -z fails delete with bad ref name' '
> grep "fatal: invalid ref format: ~a" err
> '
>
> +test_expect_success 'branch rejects HEAD as a branch name' '
> + test_must_fail git branch HEAD HEAD^
> +'
> +
> +test_expect_success 'checkout -b rejects HEAD as a branch name' '
> + test_must_fail git checkout -B HEAD HEAD^
> +'
Should we test that:
git update-ref refs/heads/HEAD HEAD^
continues to work?
-Peff
next prev parent reply other threads:[~2017-10-13 13:15 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-13 5:11 [PATCH 0/3] a small branch API clean-up Junio C Hamano
2017-10-13 5:11 ` [PATCH 1/3] branch: streamline "attr_only" handling in validate_new_branchname() Junio C Hamano
2017-10-13 7:05 ` Eric Sunshine
2017-10-13 5:11 ` [PATCH 2/3] branch: split validate_new_branchname() into two Junio C Hamano
2017-10-21 4:58 ` Kaartic Sivaraam
2017-10-21 9:01 ` Junio C Hamano
2017-10-13 5:11 ` [PATCH 3/3] branch: forbid refs/heads/HEAD Junio C Hamano
2017-10-13 13:15 ` Jeff King [this message]
2017-10-14 2:11 ` Junio C Hamano
2017-10-14 2:20 ` Junio C Hamano
2017-10-16 21:38 ` Jeff King
2017-10-21 4:50 ` Kaartic Sivaraam
2017-10-21 8:57 ` Junio C Hamano
2017-10-22 5:00 ` Kaartic Sivaraam
2017-10-21 3:07 ` [PATCH 0/3] a small branch API clean-up Kaartic Sivaraam
2017-10-21 8:52 ` Junio C Hamano
2017-10-22 4:36 ` Kaartic Sivaraam
2017-11-14 11:42 ` [PATCH v2 1/2] branch: forbid refs/heads/HEAD Kaartic Sivaraam
2017-11-14 11:42 ` [PATCH v2 2/2] builtin/branch: remove redundant check for HEAD Kaartic Sivaraam
2017-11-14 12:00 ` [PATCH v2 1/2] branch: forbid refs/heads/HEAD Kaartic Sivaraam
2017-11-14 15:08 ` Junio C Hamano
2017-11-15 16:59 ` Kaartic Sivaraam
2017-11-15 22:14 ` [PATCH 3/4] branch: correctly reject refs/heads/{-dash,HEAD} Junio C Hamano
2017-11-16 13:11 ` Kaartic Sivaraam
2017-11-16 14:57 ` Junio C Hamano
2017-11-16 17:02 ` Kaartic Sivaraam
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=20171013131501.3qarwhanktfvgjqd@sigill.intra.peff.net \
--to=peff@peff.net \
--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.
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).