From: Jeff King <peff@peff.net>
To: Junio C Hamano <junkio@cox.net>
Cc: cworth@cworth.org, git@vger.kernel.org
Subject: Re: Difficulties in advertising a new branch to git newbies
Date: Tue, 30 Jan 2007 22:22:48 -0500 [thread overview]
Message-ID: <20070131032248.GA17504@coredump.intra.peff.net> (raw)
In-Reply-To: <7vzm80vv1s.fsf@assigned-by-dhcp.cox.net>
On Tue, Jan 30, 2007 at 05:34:07PM -0800, Junio C Hamano wrote:
> That does not protect anything other than interactive "git
> commit". People often do "git commit -m" or "git commit -C".
Yes, those should be covered by a message.
> In addition, rebasing a detached HEAD, merging into a detached
> HEAD, cherry-picking onto a detached HEAD or running reset on a
I'm not even sure what it means to rebase a detached HEAD. Merging
and cherry picking should make a similar warning.
> detached HEAD to move to a particular state you want to look at
Running reset on a detached HEAD isn't a problem unless you've done one
of the other things.
> I do not think warning at every step that you are "in a funny
> state" does not help productivity, so I'd prefer warning upfront
> once and be silent afterwards, until you try to come back with
> "git checkout <existing branch>", potentially losing your state,
> which is what we currently do.
I didn't quite parse your first sentence, but I think I get the general
meaning. I just think it is awkward to have to either see such a warning
(or use -f) just to _look_ at detached commits, when you aren't doing
anything even remotely dangerous. The dangerous thing is _creating_
commits on top of a detached head. I honestly don't think it should be
allowed at all, but since some people have argued that it is useful,
that seems like the place to put warnings. Anything else is just making
things more confusing for the sorts of people Carl is dealing with --
those who merely want to look around.
> For situations like Carl's intstruction where a user, who is
> purely a sightseer, uses the detached HEAD to go-and-look a
> particular state, the fact that "-f" loses the previous local
Yes, though it would be nicer not to have to explain to them why '-f' is
needed.
-Peff
next prev parent reply other threads:[~2007-01-31 3:23 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-01-30 20:13 Difficulties in advertising a new branch to git newbies Carl Worth
2007-01-30 21:02 ` Jakub Narebski
2007-01-30 21:25 ` Yann Dirson
2007-01-30 21:31 ` Jakub Narebski
2007-01-30 21:32 ` Junio C Hamano
2007-01-30 21:40 ` Jakub Narebski
2007-01-30 22:33 ` Matthias Lederhofer
2007-01-30 22:36 ` Matthias Lederhofer
2007-01-30 23:10 ` Jeff King
2007-01-31 1:34 ` Junio C Hamano
2007-01-31 1:51 ` Nicolas Pitre
2007-01-31 3:22 ` Jeff King [this message]
2007-01-31 14:59 ` Nicolas Pitre
2007-01-31 17:07 ` Jeff King
2007-01-31 18:59 ` Nicolas Pitre
2007-01-31 22:53 ` Jeff King
2007-01-31 20:20 ` Junio C Hamano
2007-01-31 22:51 ` Theodore Tso
2007-01-31 23:03 ` Junio C Hamano
2007-01-31 23:18 ` Jakub Narebski
2007-01-31 1:48 ` Nicolas Pitre
2007-01-31 0:10 ` Daniel Barkalow
2007-01-31 1:55 ` Nicolas Pitre
2007-01-31 5:09 ` Daniel Barkalow
2007-01-31 14:31 ` Nicolas Pitre
2007-01-31 14:38 ` J. Bruce Fields
2007-01-31 14:53 ` Jakub Narebski
2007-01-31 15:15 ` Nicolas Pitre
2007-01-31 16:25 ` Daniel Barkalow
2007-01-31 18:25 ` Nicolas Pitre
2007-01-31 13:13 ` Guilhem Bonnefille
2007-01-31 16:06 ` Carl Worth
2007-01-31 16:15 ` Johannes Schindelin
2007-01-31 19:27 ` Santi Béjar
2007-01-31 19:50 ` Carl Worth
2007-02-01 0:20 ` Josef Weidendorfer
2007-02-01 9:02 ` Santi Béjar
2007-02-01 4:12 ` Jakub Narebski
2007-02-06 5:51 ` Carl Worth
2007-02-06 6:37 ` Junio C Hamano
2007-02-06 7:25 ` Junio C Hamano
2007-02-06 7:31 ` Jeff King
2007-02-06 18:53 ` Carl Worth
2007-02-06 19:14 ` Junio C Hamano
2007-02-06 19:39 ` Carl Worth
2007-02-06 19:58 ` Jakub Narebski
2007-02-06 7:28 ` Jeff King
2007-02-06 7:46 ` Junio C Hamano
2007-02-06 8:12 ` Jeff King
2007-02-06 15:33 ` Nicolas Pitre
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=20070131032248.GA17504@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=cworth@cworth.org \
--cc=git@vger.kernel.org \
--cc=junkio@cox.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).