git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: David Kastrup <dak@gnu.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: Duy Nguyen <pclouds@gmail.com>,
	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: Tue, 18 Feb 2014 20:37:36 +0100	[thread overview]
Message-ID: <871tz0rz3z.fsf@fencepost.gnu.org> (raw)
In-Reply-To: <xmqqha7wfdld.fsf@gitster.dls.corp.google.com> (Junio C. Hamano's message of "Tue, 18 Feb 2014 11:03:10 -0800")

Junio C Hamano <gitster@pobox.com> writes:

> Duy Nguyen <pclouds@gmail.com> writes:
>
>> +	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);
>
> Does this check still allow you to create a branch "refs/heads/next"
> and then later create a branch "next"?  The latter will introduce an
> ambiguity without any prevention, even though the prevention would
> trigger if the order in which these two branches are created is
> swapped--- the end result has ambiguity but the safety covers only one
> avenue to the confusing situation.
>
> And the only way I can think of to avoid that kind of confusion is
> to forbid creation of a subset of possible names by reserving a set
> of known (but arbitrary) prefixes---which I am not sure is a good
> way to go.  At least not yet.

Just for the record: after seeing the respective arguments, I consider
it the sanest way.

It's conceivable to give a configuration option for augmenting the set
of reserved prefixes.  That would allow to adapt the arbitrariness to
match the policies or ref name choices of a particular project while
keeping the set of references addressed by the standard git commands in
check automagically.

-- 
David Kastrup

  parent reply	other threads:[~2014-02-18 19:41 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
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 [this message]
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=871tz0rz3z.fsf@fencepost.gnu.org \
    --to=dak@gnu.org \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jw@raven.inka.de \
    --cc=pclouds@gmail.com \
    --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).