git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Linus Torvalds <torvalds@osdl.org>
To: Junio C Hamano <junkio@cox.net>
Cc: "J. Bruce Fields" <bfields@fieldses.org>,
	Jeff King <peff@peff.net>,
	git@vger.kernel.org
Subject: Re: [PATCH] Detached HEAD (experimental)
Date: Tue, 9 Jan 2007 15:46:32 -0800 (PST)	[thread overview]
Message-ID: <Pine.LNX.4.64.0701091539050.3594@woody.osdl.org> (raw)
In-Reply-To: <7vy7obj07k.fsf@assigned-by-dhcp.cox.net>



On Tue, 9 Jan 2007, Junio C Hamano wrote:
> 
> Being able to test merge or even make commits without being on a
> branch is vastly useful.

Yes. I think the detached head notion is really really important. I think 
it was a mistake to not allow it initially, but hey, there were various 
historical reasons, and the whole thing about how branches worked was a 
bit up in the air.

I would suggest a solution:

 - git checkout will refuse to switch AWAY from a detached head unless the 
   SHA1 of the detached head exactly matches some other branch.

Not any expensive "reachability" cheaks. Simple and straightforward: just 
say "no, I will not leave this branch-less HEAD behind, because it is not 
described by any other branch or tag".

So if you do

	git checkout v1.4.4

you'll be fine, because even though you got a detached HEAD that isn't 
attached to any branch, it still exists as a tag, so checking out 
something else is fine - you've not lost any state.

In contrast, if you actually start committing to that detached HEAD, you 
need to either

 - use some new flag ("git checkout --forget-old") to explicitly say that 
   you _want_ to leave this old naked branch behind

 - either tag the current point or make a real branch out of it (with 
   either "git tag <tagname>" or "git branch <branchname>" respectively) 
   and then you can check out some other tag/branch after that.

Doing "reachability analysis" is not only expensive, it's actually really 
wrong, because even if the current HEAD is _reachable_ from some other tag 
or branch, you're still going to drop that point in the development series 
unless it _exactly_ matchs it.

Hmm?

I'd love to see the detached HEAD series move into "master", but I do 
think we should make sure that people can't drop their work easily by 
mistake, and I think the above suggestion is both simple and workable.

Comments?

		Linus

  parent reply	other threads:[~2007-01-09 23:46 UTC|newest]

Thread overview: 68+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-01-02  7:45 [PATCH] Detached HEAD (experimental) Junio C Hamano
2007-01-02 19:59 ` Edgar Toernig
2007-01-02 21:56 ` Carl Worth
2007-01-02 22:18   ` Jakub Narebski
2007-01-03  0:34     ` Carl Worth
2007-01-06 18:58       ` J. Bruce Fields
2007-01-06 20:48         ` Alan Chandler
2007-01-06 22:52           ` J. Bruce Fields
2007-01-02 22:44   ` Junio C Hamano
2007-01-02 23:34     ` Carl Worth
2007-01-03  2:45       ` Junio C Hamano
2007-01-08 11:19       ` Junio C Hamano
2007-01-08 13:17         ` Jeff King
2007-01-09  0:19           ` Junio C Hamano
2007-01-09  0:43             ` Carl Worth
2007-01-09  1:05               ` Junio C Hamano
2007-01-09  1:15                 ` Carl Worth
2007-01-09  3:26                   ` Shawn O. Pearce
2007-01-09  7:07                     ` Junio C Hamano
2007-01-09 10:41                       ` [PATCH 0/6] Expose in_merge_bases() via merge-base Junio C Hamano
2007-01-09  8:12                   ` [PATCH] Detached HEAD (experimental) Luben Tuikov
2007-01-09 14:21             ` Jeff King
2007-01-09 21:20               ` Junio C Hamano
2007-01-09 21:31                 ` J. Bruce Fields
2007-01-09 21:43                   ` Carl Worth
2007-01-09 21:53                     ` J. Bruce Fields
2007-01-09 23:44                     ` Shawn O. Pearce
2007-01-10  0:26                       ` Jakub Narebski
2007-01-10  0:34                         ` Shawn O. Pearce
2007-01-10  1:03                           ` J. Bruce Fields
2007-01-10  1:07                             ` Shawn O. Pearce
2007-01-10  1:15                           ` Nicolas Pitre
2007-01-10  1:24                             ` Junio C Hamano
2007-01-10  1:40                               ` Shawn O. Pearce
2007-01-10  1:54                                 ` Nicolas Pitre
2007-01-10  2:28                                   ` Shawn O. Pearce
2007-01-10  1:37                             ` Jakub Narebski
2007-01-10  9:08                     ` Andreas Ericsson
2007-01-10  9:46                       ` Junio C Hamano
2007-01-10 16:30                         ` Daniel Barkalow
2007-01-11  9:45                           ` Andreas Ericsson
2007-01-10  9:40                     ` Junio C Hamano
2007-01-09 22:37                   ` Junio C Hamano
2007-01-09 23:39                     ` Shawn O. Pearce
2007-01-09 23:46                     ` Linus Torvalds [this message]
2007-01-10  0:10                       ` Junio C Hamano
2007-01-10  0:18                         ` Shawn O. Pearce
2007-01-10  0:54                           ` Linus Torvalds
2007-01-10  0:51                       ` Carl Worth
2007-01-10  8:02                       ` Junio C Hamano
2007-01-10  9:04                       ` Andy Parkins
2007-01-10  9:05                         ` Shawn O. Pearce
2007-01-10  9:33                         ` Junio C Hamano
2007-01-10 10:10                           ` Andy Parkins
2007-01-10 10:25                             ` Shawn O. Pearce
2007-01-10 16:18                             ` Junio C Hamano
2007-01-10 14:04                       ` Jeff King
2007-01-11  0:34                         ` Junio C Hamano
2007-01-11  4:31                           ` J. Bruce Fields
2007-01-03 10:46     ` Jeff King
2007-01-03 11:59       ` Jeff King
2007-01-02 23:22 ` [PATCH] git-branch: show detached HEAD Lars Hjemli
2007-01-03  5:18   ` Shawn O. Pearce
2007-01-03  6:53     ` Junio C Hamano
2007-01-03  7:50       ` Lars Hjemli
2007-01-03  7:52         ` Junio C Hamano
2007-01-03  7:05   ` Junio C Hamano
2007-01-03  7:37     ` Lars Hjemli

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=Pine.LNX.4.64.0701091539050.3594@woody.osdl.org \
    --to=torvalds@osdl.org \
    --cc=bfields@fieldses.org \
    --cc=git@vger.kernel.org \
    --cc=junkio@cox.net \
    --cc=peff@peff.net \
    /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).