Re: git subtree issues

From: Avery Pennarun <apenwarr@gmail.com>
Date: Nov 4, 2009, 19:57 UTC
Message-ID: <32541b130911041157i5125cc41pdceaa39fa5ceba67@mail.gmail.com>
In-Reply-To: <bdccb6a00911031019y48f1d1aax9be7b49e3463595@mail.gmail.com>

On Tue, Nov 3, 2009 at 1:19 PM, Daniel Jacobs <daniel@sibblingz.com> wrote:

Show 16 quoted lines

> Ok.. I ran the command as you suggested
> git pull -s subtree vw_extensions master
> remote: Counting objects: 5, done.
> remote: Compressing objects: 100% (3/3), done.
> remote: Total 3 (delta 2), reused 0 (delta 0)
> Unpacking objects: 100% (3/3), done.
> From git@github.com:sibblingz/vw_extensions
>  * branch            master     -> FETCH_HEAD
> Already uptodate!
> Merge made by subtree.
>
> git diff --stat $(git merge-base HEAD^ FETCH_HEAD) FETCH_HEAD
>  README |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> So, it knows there was a change.  However, when I go and vim that README
> file, the change is not there.  Maybe this gives you some more information.

This is extremely fishy. What if you re-run the pull without the "-s subtree" at all? git must be trying to merge those changes in *somewhere*...

> As an aside, I saw your git subtree tool, and it looks great, but I did not
> try to use it because I could not figure out how to install it.  You might
> get a few more users if you include instructions for installation somewhere.
>  :-)

Oops, good point.  Somehow I forgot that.  Fixed.

Thanks,

Avery