Re: Questions/investigations on git-subtree and tags

From: Paul Campbell <pcampbell@kemitix.net>
Date: Mar 7, 2013, 15:00 UTC
Message-ID: <CALeLG_=xzL1SA0G63FGb5v8K5WQOUg4yaodNm6zwf7kU1pAYvg@mail.gmail.com>
In-Reply-To: <1721159119.197038.1362660611167.JavaMail.root@openwide.fr>

On Thu, Mar 7, 2013 at 12:50 PM, Jeremy Rosen <jeremy.rosen@openwide.fr> wrote:

Show 16 quoted lines

>> >>
>> >> Git subtree ignores tags from the remote repo.
>> >>
>> >
>> > is that a design decision or a case of "not implemented yet"
>>
>> I'm not sure. If you imported all the tags from all your subtrees
>> repos, you could easily end up with duplicate tags from different
>> repos. They could be namespaced, but there is no concept of namespace
>> in git-subtree. That even assumes that you can tag a subtree (I've
>> not
>> tried).
>>
>
> Ok, I can understand that you don't want to import tags for namespace reason, but in that case shouldn't
> git subtree add refuse to create a subtree when the tag isn't a commit

It shouldn't and tries not to, but is limited in it's ability to identify if a refspec points to a commit or not in the remote repo.

> or if it allows it, what would be the gracefull way to handle that ?

I've posted a patch (which is pending a lot of other changes to git-subtree that I'm corralling) that tries to prevent some obvious errors in the refspec. But letting the git fetch used by git-subtree add and git-subtree pull catch the error and report it may be the best option.

> i'm quite new to git's internals, so I don't really know if/what the right approch would be.
>
> note that all those problems seems to disapear when squash is not used

I've never really tried using --squash, I don't see that it adds any value for me.

-- 
Paul [W] Campbell