On Fri, Jun 23, 2017 at 1:54 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > Jacob Keller <jacob.e.keller@xxxxxxxxx> writes: > >> Instead, lets add support for a new refs/tracking/* hierarchy which is >> laid out in such a way to avoid this inconsistency. All refs in >> "refs/tracking/<remote>/*" will include the complete ref, such that >> dropping the "tracking/<remote>" part will give the exact ref name as it >> is found in the upstream. Thus, we can track any ref here by simply >> fetching it into refs/tracking/<remote>/*. > > I do think this overall is a good goal to aim for wrt "tracking", > i.e. keeping a pristine copy of what we observed from the outside > world. In addition to what you listed as "undecided" below, > however, I expect that this will highlight a lot of trouble in > "working together", i.e. reconciling the differences of various > world views and moving the project forward, in two orthogonal axes: > I agree, I think this is definitely a problem that we'd want/have to solve. > - Things pointed at by some refs (e.g. notes/, but I think the > ".gitmodules equivalent that is not tied to any particular commit > in the superproject" Jonathan Nieder and friends advocate falls > into the same category) do not correspond to the working tree > contents, and merging their contents will always pose challenge > when we need to prepare for conflict resolution. This is part of why I started by looking at notes, since there is already some code for notes merge, it just doesn't have a standard place to store "remote" notes. I've wanted that ability to enable more ease of sharing. > > - Things pointed at by some other refs (e.g. tags/) do not make > sense to be merged. You may locally call a commit with a tag > "wip", while your friends may use the same "wip" tag to point at > a different one. Both are valid, and more importantly, there is > no point even trying to reconcile what the "wip" tag means in the > project globally. > > For the former, I expect that merging these non-working tree > contents will all have to require some specific tool that is > tailored for the meaning each hierarchy has, just like "git notes > merge" gives a solution that is very specific to the notes refs (I > do not know how well "notes merge" works in practice, though). Agreed. That's also part of why I'm looking at doing it as a partial "one hierarchy at a time" proposal, I've got a somewhat better format for that coming Soon(TM) > > For the latter, having a separate tracking hierarchy is a strict > improvement from "tracking" point of view, but I think "working > together" also needs a well designed set of new look-up rules, and a > new convention. For example, some tags may not want to be shared > (e.g. "wip" example above) even though they should be easy to access > by those who already have them (e.g. "git log ..wip" should work > without having to say "git log ..refs/local-tags/wip", even if we > decide to implement the "some tags may not want to be shared" > segregation by introducing a new hierarchy). And also a shared tag > that is copied to "refs/tracking/origin/tags/v1.0" would need a way > better than "git log tracking/origin/tags/v1.0" for this mechanism > to be useful in everyday workflow. > > Thanks. > My thoughts on tags are sort of the following: keep the default semantics of tags get copied into our local refs/tags, (if we're fetching them). However, create some mechanism for easily showing when you have a local tag with the same name as a remote tag which don't point at the same thing, by using the refs/tracking. Possibly, any time you grab a tag, check and see if the remote version is different and "do something" like complain, or show both, or give some advice (possibly with a new tool to "pull in the remote tag if you verify it's accurate, etc". This way, you generally work with tags the same way but get added protection for knowing when your local tags differ from what remotes show? Thanks, Jake
