From: Duy Nguyen <pclouds@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Andreas Schwab <schwab@linux-m68k.org>,
Josef Wolf <jw@raven.inka.de>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: error: src refspec refs/heads/master matches more than one.
Date: Sat, 15 Feb 2014 15:53:55 +0700 [thread overview]
Message-ID: <20140215085355.GA15461@lanh> (raw)
In-Reply-To: <xmqqy51dirjs.fsf@gitster.dls.corp.google.com>
On Fri, Feb 14, 2014 at 08:32:07AM -0800, Junio C Hamano wrote:
> Duy Nguyen <pclouds@gmail.com> writes:
>
> > On Fri, Feb 14, 2014 at 7:45 PM, Andreas Schwab <schwab@linux-m68k.org> wrote:
> >> Josef Wolf <jw@raven.inka.de> writes:
> >>
> >>> Notice the refs/heads _within_ refs/heads!
> >>>
> >>> Now I wonder how I managed to get into this situation and what's the best way
> >>> to recover?
> >>
> >> Probably you did something like "git branch refs/heads/master". You can
> >> remove it again with "git branch -d refs/heads/master".
> >
> > As a porcelain, "git branch" should prevent (or at least warn) users
> > from creating such refs, I think.
>
> "warn", possibly, but I do not see a reason to *prevent*.
>
> A. You are not allowed to call your branch with a string that begins with
> 'refs/heads/'.
> B. Why?
> A. Because it will confuse you.
> B. I know what I am doing.
> A. ???
Prevent is a strong word. I meant we only do it if they force
it. Something like this..
-- 8< --
diff --git a/branch.c b/branch.c
index 723a36b..3f0540f 100644
--- a/branch.c
+++ b/branch.c
@@ -251,6 +251,11 @@ void create_branch(const char *head,
forcing = 1;
}
+ if (!force && dwim_ref(name, strlen(name), sha1, &real_ref))
+ die(_("creating ref refs/heads/%s makes %s ambiguous.\n"
+ "Use -f to create it anyway."),
+ name, name);
+
real_ref = NULL;
if (get_sha1(start_name, sha1)) {
if (explicit_tracking) {
-- 8< --
next prev parent reply other threads:[~2014-02-15 8:53 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-14 11:31 error: src refspec refs/heads/master matches more than one Josef Wolf
2014-02-14 12:45 ` Andreas Schwab
2014-02-14 12:59 ` Duy Nguyen
2014-02-14 15:16 ` Josef Wolf
2014-02-14 15:35 ` David Kastrup
2014-02-14 16:52 ` Josef Wolf
2014-02-14 16:32 ` Junio C Hamano
2014-02-14 16:52 ` David Kastrup
2014-02-14 19:10 ` Junio C Hamano
2014-02-14 22:53 ` Josef Wolf
2014-02-15 8:53 ` Duy Nguyen [this message]
2014-02-17 14:25 ` Ingo Rohloff
2014-02-18 19:03 ` Junio C Hamano
2014-02-18 19:35 ` John Keeping
2014-02-18 19:51 ` Junio C Hamano
2014-02-18 20:01 ` John Keeping
2014-02-20 4:17 ` Michael Haggerty
2014-02-20 18:22 ` Junio C Hamano
2014-02-18 19:37 ` David Kastrup
2014-02-18 21:47 ` Junio C Hamano
2016-03-23 11:17 ` Duy Nguyen
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=20140215085355.GA15461@lanh \
--to=pclouds@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jw@raven.inka.de \
--cc=schwab@linux-m68k.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).