From: Alan Chandler <alan@chandlerfamily.org.uk>
To: git@vger.kernel.org
Subject: Re: GIT 0.99.7d, and end of week status.
Date: Mon, 26 Sep 2005 07:09:12 +0100 [thread overview]
Message-ID: <200509260709.12937.alan@chandlerfamily.org.uk> (raw)
In-Reply-To: <7v1x3cn1cj.fsf@assigned-by-dhcp.cox.net>
On Monday 26 Sep 2005 01:01, Junio C Hamano wrote:
> 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)
>
> 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
> 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.
>
> 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
>
> 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
next prev parent reply other threads:[~2005-09-26 6:09 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-09-25 8:36 GIT 0.99.7d, and end of week status Junio C Hamano
2005-09-25 9:32 ` Alan Chandler
2005-09-25 18:47 ` Junio C Hamano
2005-09-25 20:43 ` Alan Chandler
2005-09-26 0:01 ` Junio C Hamano
2005-09-26 6:09 ` Alan Chandler [this message]
2005-09-26 20:23 ` Junio C Hamano
2005-09-25 22:42 ` Tom Prince
2005-09-25 23:46 ` Junio C Hamano
2005-09-26 19:10 ` Petr Baudis
2005-09-26 20:25 ` Junio C Hamano
2005-09-27 10:17 ` Petr Baudis
2005-09-29 4:40 ` Matthias Urlichs
2005-09-29 5:11 ` Junio C Hamano
2005-09-26 20:17 ` Jon Loeliger
2005-09-26 22:03 ` Junio C Hamano
2005-09-27 7:38 ` [PATCH] Fix default pull not to do an unintended Octopus Junio C Hamano
2005-09-27 9:52 ` Josef Weidendorfer
2005-09-27 12:54 ` Petr Baudis
2005-09-27 14:35 ` Josef Weidendorfer
2005-09-27 22:24 ` Junio C Hamano
2005-09-27 10:13 ` GIT 0.99.7d, and end of week status Petr Baudis
2005-09-27 9:51 ` Petr Baudis
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200509260709.12937.alan@chandlerfamily.org.uk \
--to=alan@chandlerfamily.org.uk \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).