git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Chris Webb <chris@arachsys.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jeff King <peff@peff.net>, git@vger.kernel.org
Subject: Re: Editing the root commit
Date: Fri, 22 Jun 2012 23:02:32 +0100	[thread overview]
Message-ID: <20120622220231.GG25478@arachsys.com> (raw)
In-Reply-To: <7vobobm3mi.fsf@alter.siamese.dyndns.org>

Junio C Hamano <gitster@pobox.com> writes:

[detached unborn HEAD]
> No thanks.  It will be too big a change to the fundamental invariant
> for what a git directory is (and isn't).  It is simply unacceptable
> to suddenly start treating a random directory that does not even
> have HEAD as a git directory.

No problem. I imagine you wouldn't be keen on other representations of the
same state either, e.g. a null sha1 in HEAD, and would prefer to disallow
it altogether?

In that case, would you like me to do a test and a fix for the '(null)'
branch behaviour of

  git checkout --orphan dummy && git checkout --detach

? I assume that can't be intentional: looks from the code like it was
intended to tell me I'm on an unborn branch and can't do that.

> It would be a lot more palatable approach to teach "rebase -i" defer
> its "detaching HEAD to the onto commit" step before starting to read
> the insn sheet.  Would such a change be too involved for it to be
> worth supporting "rebase --root -i"?

I'm not sure as I don't really know the rebase shell scripts well at all,
but I'm happy to take a look and see. I imagine we wouldn't want to make
rebase -i much more complicated (and consequently harder to work on) just to
cover this rarely needed variant, but if it's relatively self-contained
(e.g. detect we're supposed to be making an orphan commit and do it by hand
instead of with git commit, maybe?) it would presumably be worthwhile?

Cheers,

Chris.

  reply	other threads:[~2012-06-22 22:02 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-06-19  9:16 Editing the root commit Chris Webb
2012-06-19 10:09 ` Junio C Hamano
2012-06-19 11:17   ` Chris Webb
2012-06-20  9:32     ` Chris Webb
2012-06-20 18:25       ` Junio C Hamano
2012-06-20 19:29         ` Jeff King
2012-06-20 19:39           ` Chris Webb
2012-06-20 19:48             ` Jeff King
2012-06-22 20:50               ` Chris Webb
2012-06-22 21:35                 ` Junio C Hamano
2012-06-22 22:02                   ` Chris Webb [this message]
2012-06-22 22:26                     ` Chris Webb
2012-06-22 22:50                       ` Junio C Hamano
2012-06-23  7:20                         ` Chris Webb
2012-06-26 15:04                 ` git-commit bug (was Re: Editing the root commit) Chris Webb
2012-06-26 15:06                   ` [PATCH] git-checkout: disallow --detach on unborn branch Chris Webb
2012-06-26 18:08                   ` git-commit bug Junio C Hamano
2012-06-26 13:33               ` Editing the root commit Chris Webb
2012-06-26 13:36                 ` [PATCH 1/2] rebase -i: support --root without --onto Chris Webb
2012-06-26 13:36                   ` [PATCH 2/2] Add tests for rebase -i " Chris Webb
2012-06-26 19:20                   ` [PATCH 1/2] rebase -i: support " Junio C Hamano
2012-06-26 19:38                     ` Chris Webb
2012-06-26 20:05                       ` Junio C Hamano
2012-06-26 20:11                         ` Chris Webb
2012-06-26 21:24                           ` Junio C Hamano
2012-06-26 21:27                             ` Chris Webb
2012-06-20 19:35         ` Editing the root commit Chris Webb
2012-06-25 17:22         ` Martin von Zweigbergk
2012-06-19 11:50 ` jaseem abid

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=20120622220231.GG25478@arachsys.com \
    --to=chris@arachsys.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --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).