Re: [PATCH] Remove restriction on notes ref base

From: Johan Herland <johan@herland.net>
Date: Nov 5, 2010, 01:29 UTC
Message-ID: <201011050229.15941.johan@herland.net>
In-Reply-To: <20101104145817.GA27580@sigill.intra.peff.net>

On Thursday 04 November 2010, Jeff King wrote:

Show 26 quoted lines

> On Thu, Nov 04, 2010 at 01:49:47AM +0100, Johan Herland wrote:
> > I'd probably suggest a more straightforward (and hopefully less
> > confusing)
> > 
> > setup like this:
> >   Remote repo    ->   Local repo
> >   ------------------------------------------------
> >   refs/heads/*        refs/remotes/$remote/heads/*
> >   refs/tags/*         refs/remotes/$remote/tags/*
> >   refs/notes/*        refs/remotes/$remote/notes/*
> > 
> > ...and these would all be set in the config, i.e. no implicit/magic
> > refspecs.
> 
> I have often considered that something like that would be simpler, too.
> But just specifying
> 
>   fetch = refs/tags/*:refs/remotes/$remote/tags/*
> 
> would pull down _all_ tags from the remote. Right now we only pull down
> tags for things that we are actually fetching (i.e., auto-follow).
> 
> Now you could argue that auto-follow is not worth the effort. It is
> somewhat confusing, and I can't think of a time when it ever actually
> reduced the set of objects I was fetching (as opposed to just fetching
> all tags). But maybe others have use cases where it matters.

Actually, I don't have anything against auto-follow per se, and we could easily enough extend the refspec to specify auto-follow behaviour: There is currently the "+" prefix for specifying a forced (non-fast-forward) update. We could for example add a "~" prefix for specifying that the refs matched by this refspec should only be fetched if they are part of the history fetched by other refspecs. We could then reproduce the current auto-follow behaviour with the following pair of refspecs:

  +refs/heads/*:refs/remotes/origin/*
  ~+refs/tags/*:refs/tags/*

or in my above proposal:

  +refs/heads/*:refs/remotes/$remote/heads/*
  ~+refs/tags/*:refs/remotes/$remote/tags/*
  +refs/notes/*:refs/remotes/$remote/notes/*

Show 17 quoted lines

> > We would, for example, extend the ref disambiguation of <name> (as
> > documented in the "SPECIFYING REVISIONS" section of git-rev-parse(1)),
> > so that in the cases where <name> is of the form "<foo>/<bar>" AND
> > <foo> is an existing remote, we also check for the following refs
> > (after none of the
> > 
> > existing checks have returned a match):
> >   7. refs/remotes/<foo>/tags/<bar>
> >   8. refs/remotes/<foo>/heads/<bar>
> 
> This codifies that refs for remote $foo are in refs/remotes/$foo, which
> is something we have avoided so far. For example, when finding the
> "upstream" branch, we have the name of the remote and the merge branch,
> look up the fetch refspecs in the config, and then figure out where that
> branch would be fetched to. Which of course turns out as you say (as
> remotes/$remote_name/$branch) in the default config, but we don't
> restrict people to that.

We can do the same for "foo/bar" as well, although things become slightly more fiddly:

When "foo" exists as a remote, look up its fetch refspec(s), and determine possible mappings for name "bar". I.e. given the following (non-default) refspecs for remote "foo":

  +refs/heads/*:refs/remotes/spam/heads/*
  +refs/tags/*:refs/remotes/eggs/tags/*
  +refs/notes/*:refs/remotes/bacon/notes/*

we know that the intersection between the left side of these refspec and the ref disambiguation rules consists of "refs/tags/bar" and "refs/heads/bar" (in that order). We can then map these to the right side of the refspec to get "refs/remotes/eggs/tags/bar" and "refs/remotes/spam/heads/bar" (in that order). We would then use the first match from these alternatives.

...Johan

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