From: Nicolas Pitre <nico@fluxnic.net>
To: Ron Garret <ron1@flownet.com>
Cc: git@vger.kernel.org
Subject: Re: master^ is not a local branch -- huh?!?
Date: Mon, 01 Feb 2010 18:25:32 -0500 (EST) [thread overview]
Message-ID: <alpine.LFD.2.00.1002011809140.1681@xanadu.home> (raw)
In-Reply-To: <ron1-6F8B85.14520801022010@news.gmane.org>
On Mon, 1 Feb 2010, Ron Garret wrote:
> In article <87aavsu9b3.fsf@osv.gnss.ru>, Sergei Organov <osv@javad.com>
> wrote:
>
> > Junio C Hamano <gitster@pobox.com> writes:
> > > Steve Diver <squelch2@googlemail.com> writes:
> >
> > [...]
> >
> > > If read carefully (some may argue that it does not need a very careful
> > > reading to get it, though), this hints that "detached HEAD" state is a
> > > substitute for using a temporary branch, but it may not be strong
> > > enough.
> >
> > For my rather fresh eye it looks more like unnamed (anonymous?) branch
> > than a temporary one. Doesn't detached HEAD behave exactly like a
> > regular HEAD but pointing to the tip of an unnamed branch?
>
> I strongly concur with this.
>
> And as long as I'm weighing in, it would also help to prevent confusion
> if it were made clear that this unnamed branch doesn't actually come
> into existence unless and until you do a commit.
Nope. Creating a commit doesn't create any branch. A commit creation
merely adds a new node in the history graph, and links it to the commit
that was the current one before that commit operation. If HEAD is
_attached_ to a branch then the branch pointer is also updated to point
to that new commit. If HEAD is _detached_ then no branch is updated and
HEAD simply carries a direct reference to that new commit.
At a later time you can:
1) Create a new branch pointer which default value is the commit pointed to
by HEAD. This is true whether or not HEAD is detached, but in this
case this is an interesting property.
2) Move HEAD somewhere else by performing a checkout. If HEAD was
detached then its last position is simply forgotten and those
commits that were performed while HEAD was detached, if any, are
simply left dangling and eventually garbage collected. If however a
new branch pointer was created in (1) then those commits won't be
dangling.
In any case, a detached HEAD is not only a temporary branch, it is also
a volatile branch. And in the Git model, it is simply not a branch at
all. Hence the 2 states for HEAD: either detached, or attached to a
branch pointer.
Nicolas
next prev parent reply other threads:[~2010-02-01 23:25 UTC|newest]
Thread overview: 111+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-01 11:52 master^ is not a local branch -- huh?!? Steve Diver
2010-02-01 17:38 ` Junio C Hamano
2010-02-01 17:58 ` Sergei Organov
2010-02-01 22:52 ` Ron Garret
2010-02-01 23:01 ` Petr Baudis
2010-02-01 23:25 ` Nicolas Pitre [this message]
2010-02-01 23:37 ` Junio C Hamano
2010-02-01 23:56 ` Ron Garret
2010-02-02 0:15 ` Petr Baudis
2010-02-02 0:45 ` Ron Garret
2010-02-02 0:53 ` Junio C Hamano
2010-02-02 1:12 ` Ron Garret
2010-02-02 19:19 ` J. Bruce Fields
2010-02-02 22:04 ` Ron Garret
2010-02-03 18:27 ` J. Bruce Fields
2010-02-02 4:05 ` Nicolas Pitre
2010-02-02 5:23 ` Ron Garret
2010-02-02 5:43 ` Nicolas Pitre
2010-02-02 21:07 ` tytso
2010-02-02 0:26 ` Junio C Hamano
2010-02-02 0:21 ` Junio C Hamano
2010-02-01 18:12 ` Nicolas Pitre
2010-02-01 18:27 ` Jay Soffian
2010-02-01 22:34 ` Steve Diver
-- strict thread matches above, loose matches on Subject: below --
2010-01-29 20:20 Ron1
2010-01-29 20:27 ` Jacob Helwig
2010-01-29 20:35 ` Sverre Rabbelier
2010-01-29 20:38 ` Jacob Helwig
2010-01-29 20:48 ` Junio C Hamano
2010-01-29 20:56 ` Sverre Rabbelier
2010-01-29 21:35 ` Junio C Hamano
2010-01-29 21:20 ` Nicolas Pitre
2010-01-29 21:21 ` Sverre Rabbelier
2010-01-29 21:29 ` Nicolas Pitre
2010-01-29 21:32 ` Sverre Rabbelier
2010-01-29 21:51 ` Nicolas Pitre
2010-01-29 21:58 ` Junio C Hamano
2010-01-29 22:00 ` Sverre Rabbelier
2010-01-29 22:34 ` Nicolas Pitre
2010-01-29 22:39 ` Junio C Hamano
2010-01-29 22:46 ` Jacob Helwig
2010-01-29 23:43 ` Nicolas Pitre
2010-01-30 0:14 ` Junio C Hamano
2010-01-30 0:18 ` Sverre Rabbelier
2010-01-30 0:29 ` Junio C Hamano
2010-01-30 0:35 ` Sverre Rabbelier
2010-01-30 0:38 ` Michael Witten
2010-01-30 0:39 ` Nicolas Pitre
2010-01-30 1:01 ` Mark Lodato
2010-01-30 1:22 ` Nicolas Pitre
2010-01-30 2:38 ` Ron Garret
2010-01-30 2:59 ` Junio C Hamano
2010-01-30 3:26 ` Ron Garret
2010-01-30 4:03 ` Nicolas Pitre
2010-01-30 5:06 ` Jay Soffian
2010-01-30 5:09 ` Junio C Hamano
2010-01-30 4:52 ` Jay Soffian
2010-01-30 5:15 ` Nicolas Pitre
2010-01-30 5:21 ` Junio C Hamano
2010-01-30 6:25 ` Ron Garret
2010-01-30 18:25 ` Junio C Hamano
2010-01-30 5:45 ` Jay Soffian
2010-01-30 5:18 ` Junio C Hamano
2010-01-30 6:23 ` Ron Garret
2010-01-30 2:40 ` Mark Lodato
2010-01-30 3:11 ` Nicolas Pitre
2010-01-30 3:59 ` Mark Lodato
2010-01-30 4:39 ` Nicolas Pitre
2010-01-30 5:05 ` Nicolas Pitre
2010-01-30 5:11 ` Jay Soffian
2010-01-30 5:25 ` Nicolas Pitre
2010-01-30 5:53 ` Mark Lodato
2010-01-30 6:03 ` Junio C Hamano
2010-01-30 8:59 ` Jeff King
2010-01-30 18:40 ` Ron Garret
2010-01-29 23:16 ` A Large Angry SCM
2010-01-29 21:49 ` Junio C Hamano
2010-01-30 2:13 ` Johannes Schindelin
2010-01-30 3:15 ` Nicolas Pitre
2010-01-29 20:35 ` Johannes Schindelin
2010-01-29 21:16 ` Ron1
2010-01-29 21:25 ` Jacob Helwig
2010-01-29 21:43 ` Ron Garret
2010-01-29 21:59 ` Junio C Hamano
2010-01-29 22:18 ` Ron Garret
2010-01-31 7:32 ` Junio C Hamano
2010-01-29 20:32 ` Octavio Alvarez
2010-01-29 21:34 ` Ron Garret
2010-01-29 22:32 ` Octavio Alvarez
2010-01-29 22:47 ` Ron Garret
2010-01-29 23:05 ` Octavio Alvarez
2010-01-29 23:12 ` Junio C Hamano
2010-01-29 23:30 ` Ron Garret
2010-01-29 23:28 ` Julian Phillips
2010-01-30 0:14 ` Ron Garret
2010-01-30 0:18 ` Ron Garret
2010-01-30 19:02 ` Junio C Hamano
2010-01-30 19:24 ` Ron Garret
2010-01-29 20:36 ` Scott R. Godin
2010-01-29 21:24 ` Ron Garret
2010-01-29 21:28 ` Sverre Rabbelier
2010-01-29 21:40 ` Ron Garret
2010-01-29 21:54 ` Junio C Hamano
2010-01-29 22:12 ` Ron Garret
2010-01-30 0:33 ` Michael Witten
2010-01-30 3:06 ` Junio C Hamano
2010-01-30 6:16 ` Ron Garret
2010-01-30 6:45 ` Junio C Hamano
2010-01-30 7:31 ` Ron Garret
2010-01-30 8:02 ` Junio C Hamano
2010-01-30 8:56 ` Ron Garret
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.LFD.2.00.1002011809140.1681@xanadu.home \
--to=nico@fluxnic.net \
--cc=git@vger.kernel.org \
--cc=ron1@flownet.com \
/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.
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 NNTP newsgroup(s).