From: Ingo Rohloff <ingo.rohloff@lauterbach.com>
To: git@vger.kernel.org
Cc: Ingo Rohloff <ingo.rohloff@lauterbach.com>
Subject: [PATCH v2 2/4] branch: Prevent creation of local branches named "refs" or "refs/*"
Date: Thu, 7 Nov 2019 20:07:48 +0100 [thread overview]
Message-ID: <20191107190750.26674-3-ingo.rohloff@lauterbach.com> (raw)
In-Reply-To: <20191107190750.26674-1-ingo.rohloff@lauterbach.com>
To explain the intention, here is an example:
A user executes
git branch refs/remotes/origin/master
or
git checkout -b refs/remotes/origin/master
after this operation
git log refs/remotes/origin/master
will very likely complain that this reference is ambiguous.
The reason is, that you now very likely have the following two
references which both match:
refs/remotes/origin/master
refs/heads/refs/remotes/origin/master
git cannot decide which of the two references is meant.
By preventing the creation of local branches which are named
refs or refs/*
this issue is circumvented:
git log refs/*
will never refer to local branches located under
refs/heads/refs/*
because such local branches should not exist.
Signed-off-by: Ingo Rohloff <ingo.rohloff@lauterbach.com>
---
builtin/branch.c | 6 ++++++
builtin/checkout.c | 3 +++
2 files changed, 9 insertions(+)
diff --git a/builtin/branch.c b/builtin/branch.c
index 2ef214632f..c2e45ff52c 100644
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -497,6 +497,9 @@ static void copy_or_rename_branch(const char *oldname, const char *newname, int
const char *interpreted_newname = NULL;
int recovery = 0;
+ if (newname_has_bad_prefix(newname))
+ die(_("Invalid new branch name: '%s'"), newname);
+
if (!oldname) {
if (copy)
die(_("cannot copy the current branch while not on any."));
@@ -844,6 +847,9 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
if (track == BRANCH_TRACK_OVERRIDE)
die(_("the '--set-upstream' option is no longer supported. Please use '--track' or '--set-upstream-to' instead."));
+ if (newname_has_bad_prefix(argv[0]))
+ die(_("Invalid new branch name: '%s'"), argv[0]);
+
create_branch(the_repository,
argv[0], (argc == 2) ? argv[1] : head,
force, 0, reflog, quiet, track);
diff --git a/builtin/checkout.c b/builtin/checkout.c
index 3634a3dac1..51ac2cae43 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -1566,6 +1566,9 @@ static int checkout_main(int argc, const char **argv, const char *prefix,
if (opts->new_orphan_branch)
opts->new_branch = opts->new_orphan_branch;
+ if (opts->new_branch && newname_has_bad_prefix(opts->new_branch))
+ die(_("Invalid new branch name: '%s'"), opts->new_branch);
+
/* --track without -b/-B/--orphan should DWIM */
if (opts->track != BRANCH_TRACK_UNSPECIFIED && !opts->new_branch) {
const char *argv0 = argv[0];
--
2.24.0
next prev parent reply other threads:[~2019-11-07 19:08 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-06 16:56 [PATCH] branch: Forbid to create local branches with confusing names Ingo Rohloff
2019-11-06 22:15 ` Johannes Schindelin
2019-11-07 19:04 ` Ingo Rohloff
2019-11-07 6:05 ` Junio C Hamano
2019-11-07 12:54 ` Ingo Rohloff
2019-11-08 2:54 ` Junio C Hamano
2019-11-08 12:45 ` Ingo Rohloff
2019-11-07 19:07 ` [PATCH v2 0/4] Do not create new refnames "refs" or "refs/*" Ingo Rohloff
2019-11-07 19:07 ` [PATCH v2 1/4] refs: new function newname_has_bad_prefix Ingo Rohloff
2019-11-07 19:07 ` Ingo Rohloff [this message]
2019-11-07 19:07 ` [PATCH v2 3/4] remote: Prevent users from creating remotes named "refs" or "refs/*" Ingo Rohloff
2019-11-07 19:07 ` [PATCH v2 4/4] tag: Prevent users from creating tags " Ingo Rohloff
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=20191107190750.26674-3-ingo.rohloff@lauterbach.com \
--to=ingo.rohloff@lauterbach.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).