Re: [PATCHv2 03/10] refs.c: Refactor code for mapping between shorthand names and full refnames

From: Johan Herland <johan@herland.net>
Date: May 15, 2013, 13:53 UTC
Message-ID: <CALKQrgdroLDSf=Xc58NiHSf7fp8cRMbrR0mGrfKY7Rg0FpPFJg@mail.gmail.com>
In-Reply-To: <CALKQrgdsBzcdtyej=qvaL-2rr-5t_UzXdOL-ZZ3a-rGW5V_i7Q@mail.gmail.com>

On Wed, May 15, 2013 at 9:39 AM, Johan Herland <johan@herland.net> wrote:

Show 7 quoted lines

> On Wed, May 15, 2013 at 8:45 AM, Michael Haggerty <mhagger@alum.mit.edu> wrote:
>> "refs/remotes/%1/%2" (or "refs/remotes/%1/%*") might be a nice way to
>> imply that the rule should only be attempted if the input has at least
>> two components, whereas something like "refs/heads/%*" would be applied
>> even for inputs with no slashes.
>
> /me likes, at least for "refs/remotes/%1/%*".

Unfortunately, using "refs/remotes/%1/%*" instead of "refs/remotes/%*" breaks a number of git-svn tests which puts refs directly within refs/remotes/, and then does things like "git reset --hard trunk" (expecting trunk -> refs/remotes/trunk, which the refs/remotes/%1/%* doesn't match).

I don't know if putting refs directly within refs/remotes/ is something that git-svn does by default (which would prevent us from changing "refs/remotes/%*" to "refs/remotes/%1/%*"), or whether it is specific to the tests (in which case we should fix the tests).

Also, there might be too many other users of refs directly within refs/remotes/ that expect "foo_without_slash" to expand to "refs/remotes/foo_without_slash", which would prevent us from doing this change.

...Johan

-- 
Johan Herland, <johan@herland.net>
www.herland.net