From: Junio C Hamano <gitster@pobox•com>
To: Conrad Irwin <conrad.irwin@gmail•com>
Cc: git@vger•kernel.org
Subject: Re: [PATCH] Disallow creating ambiguous branch names by default
Date: Wed, 17 Aug 2011 11:41:41 -0700 [thread overview]
Message-ID: <7vhb5fev8a.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <1313569298-3879-1-git-send-email-conrad.irwin@gmail.com> (Conrad Irwin's message of "Wed, 17 Aug 2011 01:21:38 -0700")
Conrad Irwin <conrad.irwin@gmail•com> writes:
> Before this change, it was comparatively easy to create a confusingly
Drop everything before the ", ".
> named branch (like "origin/master" or "tag.1"). The former case is
> particularly biting to newcomers, who suddenly find themselves needing
> to handle nuances of the refs namespaces.
If you start forbidding certain names, newcomers will need to be exposed
the same nuances to understand why what they wanted to do is not allowed,
so that is not an argument.
My preferences (take them as "the ground rules" if you want) are:
- We don't disallow what we have long allowed, without a good reason;
- We make sure new people will get a warning with useful advice.
I would be happy to see the end result that warns when the end user
creates a branch (or a tag) that is ambiguous _when_ it is created (not
"much later, when we noticed there are ambiguous refs"), and offers an
advice message to use "branch -m" to rename it away (control the message
with a new "advice.*" configuration and unless explicitly declined with
it, always give the advice).
> In both cases, git commands would omit a warning about "ambiguous refs"
> if they noticed that this had occurred,
Assuming that you meant s/omit/emit/, I do agree that what we do right now
is suboptimal. I just tried these two:
$ git branch v1.0.0
$ git checkout v1.0.0
warning: refname 'v1.0.0' is ambigous.
$ git branch -m v1.0.0-branch
$ git checkout -b v1.0.0
Switched to a new branch 'v1.0.0'
$ git checkout v1.0.0
warning: refname 'v1.0.0' is ambigous.
Already on 'v1.0.0'
$ git branch -m v1.0.0-branch-2
We should be giving these warning messages immediately after creating
potentially problematic refs, i.e. just after "git branch v1.0.0" and
"git checkout -b v1.0.0". The user experience should look like this
instead:
$ git branch v1.0.0
warning: refname 'v1.0.0' is ambiguous.
advice: you may want to rename it to an unambigous name with
advice: git branch -m v1.0.0 v1.0.0-branch
$ git branch -m v1.0.0 v1.0.0-branch ;# thanks for an advice
$ git checkout -b v1.0.0
warning: refname 'v1.0.0' is ambiguous.
advice: you may want to rename it to an unambigous name with
advice: git branch -m v1.0.0-branch-2
$ git branch -m v1.0.0-branch-2 ;# thanks for an advice
next prev parent reply other threads:[~2011-08-17 18:41 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-17 8:21 [PATCH] Disallow creating ambiguous branch names by default Conrad Irwin
2011-08-17 18:41 ` Junio C Hamano [this message]
2011-08-18 3:35 ` Vijay Lakshminarayanan
2011-08-18 13:53 ` Stephen Bash
2011-08-19 18:07 ` Conrad Irwin
2011-08-19 18:15 ` Stephen Bash
2011-08-19 18:14 ` Conrad Irwin
2011-08-19 20:49 ` Junio C Hamano
2011-08-19 21:07 ` Conrad Irwin
2011-08-19 21:52 ` Junio C Hamano
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=7vhb5fev8a.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox$(echo .)com \
--cc=conrad.irwin@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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