git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: David Jeske <davidj@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: ephemeral-branches instead of detached-head?
Date: Mon, 12 Aug 2013 05:14:42 -0700	[thread overview]
Message-ID: <CA+CP9O7--HXQdZXH9MJEh0VqdwpYqb052KYrvZqYhbfajpPG0A@mail.gmail.com> (raw)
In-Reply-To: <CA+CP9O5fhyQrn3SboafocWJjaAywJHC0T-bw+AXk_8RX53hJ6Q@mail.gmail.com>

@Junio - to put the issue in the context of your previous comments on
the topic... way back when you made a comment about warnings during
commits to detached heads..

http://git.661346.n2.nabble.com/RFC-Detached-HEAD-reminder-on-commit-td834710.html#a834959

> If we _really_ don't want newbies to shoot themselves in the foot, we
> probably can issue a loud warning when they detach there HEAD.
> Oh, wait,... we already do that.


The reason this rationale doesn't ring true for me, is that it is
*very* common for me to checkout a detached-head and there is nothing
odd or dangerous about it. I do this when using checkout to move
around the history to inspect, build, and test different revisions. As
a result, it's very easy to just start ignoring this (usually
meaningless) message.

The dangerous situation only occurs when something is committed onto a
detached-head, and at this point there is no warning. The "# Not
currently on any branch" message that appears during "git status"
easily blends in with boilerplate text there.

IMO, the current warning during checkout of a detached-head is
misplaced. It should be removed, and instead there should only be a
warning after detached-head commit, since this is the only time there
is a danger of losing something.

With my proposed "ephemeral branch" concept, there is no warning
necessary in either case, since any check-ins left dangling would get
names in the branch space you could see and take a look at. If that
dangling head was temporary and was named or rebased, the ephemeral
branch name would disappear automatically, leaving the expert-user
with no warnings and no annoyance, while the novice user with a simple
tool to help them not lose track of changes they made.

  reply	other threads:[~2013-08-12 12:15 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-08-12  7:25 ephemeral-branches instead of detached-head? David Jeske
2013-08-12  7:39 ` Jonathan Nieder
2013-08-12  7:55 ` Junio C Hamano
2013-08-12  8:37   ` David Jeske
2013-08-12 12:14     ` David Jeske [this message]
2013-08-12 13:23       ` Duy Nguyen
2013-08-12 17:04         ` Andreas Schwab
2013-08-12 17:24         ` Junio C Hamano
2013-08-12 19:40           ` David Jeske
2013-08-12 19:05         ` David Jeske
2013-08-12 17:22       ` Junio C Hamano
2013-08-13  6:05     ` Duy Nguyen
     [not found]       ` <CA+CP9O5Ak3YD60--Mj+eLv3qzbZuuwTN-AxY3xb=SciKD=uZoQ@mail.gmail.com>
2013-08-13 15:13         ` Duy Nguyen
2013-08-13 15:36         ` Fwd: " David Jeske
2013-08-13 16:58           ` Junio C Hamano
2013-08-13 17:13             ` Junio C Hamano
2013-08-13 16:49       ` Junio C Hamano
2013-08-14  0:04         ` Sitaram Chamarty
2013-08-14  1:44           ` Junio C Hamano
2013-08-14  6:32             ` Sitaram Chamarty
2013-08-14  6:59               ` Jeff King
2013-08-14  7:10               ` Andres Perera
2013-08-14  9:05                 ` Sitaram Chamarty
2013-08-14 16:40                   ` Andres Perera

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=CA+CP9O7--HXQdZXH9MJEh0VqdwpYqb052KYrvZqYhbfajpPG0A@mail.gmail.com \
    --to=davidj@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.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).