Re: GIT 0.99.7d, and end of week status.

From: Alan Chandler <alan@chandlerfamily.org.uk>
Date: Sep 26, 2005, 06:09 UTC
Message-ID: <200509260709.12937.alan@chandlerfamily.org.uk>
In-Reply-To: <7v1x3cn1cj.fsf@assigned-by-dhcp.cox.net>

On Monday 26 Sep 2005 01:01, Junio C Hamano wrote:

Show 13 quoted lines

> Alan Chandler <alan@chandlerfamily.org.uk> writes:
> > Does that mean I have missed some step along the way to get the maint
> > branch position moved to the new tag?
>
> To recap, you did:
>
>     (before 0.99.7d propagated to the mirrors)
>     $ git clone http://kernel.org/pub/scm/git/git.git git-src
>     $ cd git-src
>
>     (after 0.99.7d propagated to the mirrors)
>     $ git fetch origin tag v0.99.7d
>     $ git checkout -f maint

Actually, I got as far as doing the fetch, but I didn't checkout anything. I just ran gitk --all

I would have been on the branch that the git clone would have left me on (presumably master)

Show 5 quoted lines

>
> The 'fetch origin tag v0.99.7d' step should have left
> the new file .git/refs/tags/v0.99.7d _after_ downloading all the
> objects necessary to reconstruct the history to get there.
>

Yes - I gitk showed had all the objects - but v0.99.7d was a a tag at the tip of an unamed branch

Show 9 quoted lines

> Ah, you are right.  My instruction did not update other branches
> for you.  My bad.
>
> Assuming people stay on their "master" branch, and have the
> recommended .git/remotes/origin contents in my previous message,
> then the steps "after 0.99.7d propagated to the mirrors" would
> just be:
>
>     $ git fetch

Its not the "other" branches that I was concerned about, it was the "maint" branch reference which seemed to still be still at the same commit as the v0.99.7c tag, at least that was what gitk --all showed me, after the fetch.

Show 5 quoted lines

>
> which would fetch all the branches mentioned in the remotes
> file, and then:
>
>     $ git checkout -f maint

This is where I get puzzled. Fetch on its own didn't move where "maint" pointed to so doing this checkout would have left me at the v0.99.7c tag (I didn't actually do it - as I was then puzzling over the documentation trying to see what I did wrong)

I realise I could have just manually moved it - but none of the steps in your instructions seemed to move it for me.

In the end - I blew my git away and repeated the clone exercise after the mirrors had updated - in this version the "maint" branch was co-incident with the v0.99.7d tag

Show 12 quoted lines

>
> which would switch your working tree to maint branch.
>
> NOTE NOTE NOTE.  The above assumes you are on your "master"
> branch when you run 'git fetch' --- if you are on any of the
> branches that is being updated (you can check which branch you
> are on with 'git branch' without argument, or just with 'ls -l
> .git/HEAD') 'git fetch' will complain because doing so without
> updating them to match the updated branch head would make your
> index file and working tree inconsistent with your .git/HEAD,
> but 'git fetch' is supposed to be only fetching without touching
> the working tree.

-- 
Alan Chandler
http://www.chandlerfamily.org.uk