Re: Subtree in Git

From: greened@obbligato.org <greened@obbligato.org>
Date: May 4, 2012, 02:26 UTC
Message-ID: <87fwbgbs0h.fsf@smith.obbligato.org>
In-Reply-To: <4F9FA029.7040201@initfour.nl>

Herman van Rink <rink@initfour.nl> writes:

Show 13 quoted lines

>> We don't know right now.  I want to take a look at Herman's patches
>> first but have been delayed for various reasons.  I hope to get to that
>> this weekend.  I also want to get at least one release under our belt.
>
> I've worked on this a bit over the weekend.
>
> I've forked the main git repo  on github to merge my tree on top of that.
>
> I basically did a: git subtree merge --prefix=contrib/subtree <my
> git-subtree branch>
>
> The work in progress in on: https://github.com/helmo/git (the
> subtree-updates branch)

This branch seems to have a bunch of commits from master or some other branch:

on master: git log subtree-updates --not HEAD

[...some git-subtree stuff...]
commit 10d4332e007132a38dc61f03c760d355da5cd550
Author: Junio C Hamano <gitster@pobox.com>
Date:   Sun Apr 29 18:00:47 2012 -0700

    The seventh batch of topics graduated to 'master'
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>

commit a75aba4a5306d0fee6a8ee8b48943e2c19eb2750
Merge: 55375e9 46e3581
Author: Junio C Hamano <gitster@pobox.com>
Date:   Sun Apr 29 17:52:02 2012 -0700

    Merge branch 'js/daemon-test-race-fix'
[...]

Perhaps I'm doing something wrong. Or does the subtree-updates branch need to be refreshed?

                               -Dave