git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Johannes Sixt <j.sixt@viscovery.net>
Cc: git@vger.kernel.org, Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Subject: Re: [PATCH] rebase [--onto O] A B: omit needless checkout
Date: Thu, 20 Mar 2008 00:53:01 -0700	[thread overview]
Message-ID: <7vlk4dygpu.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <47E21510.6020009@viscovery.net> (Johannes Sixt's message of "Thu, 20 Mar 2008 08:41:04 +0100")

Johannes Sixt <j.sixt@viscovery.net> writes:

> But given how intrusive the patch is ("just to remove an unnecessary
> checkout"), I'd say this is post-1.5.5 material. Also, the fact that you
> had to post a fix-up is an indication that there are probably a number of
> corner cases that need an extended testing period.

The fixup came from a real-world corner case.  I actually do fairly
esoteric varieties of rebases all the time, starting with my HEAD
detached, rebasing --onto a non-branch, explicitly stating where the
bottom is, etc, etc.

Although I am comfortable enough with the patch itself to queue it in
'next' for my daily use, I do not intend it for 1.5.5 at all.  The merge
window is a discipline, a line must be drawn somewhere, and when the line
is drawn, it must be honoured.

      reply	other threads:[~2008-03-20  7:54 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-03-12 19:10 optimized checkout+rebase? Ralf Wildenhues
2008-03-13  7:20 ` Johannes Sixt
2008-03-15 10:39   ` Ralf Wildenhues
2008-03-15 20:42     ` [PATCH] rebase [--onto O] A B: omit needless checkout Junio C Hamano
2008-03-15 22:21       ` Ralf Wildenhues
2008-03-16  3:56         ` Junio C Hamano
2008-03-19 12:54       ` Johannes Sixt
2008-03-19 19:19         ` Junio C Hamano
2008-03-20  7:41           ` Johannes Sixt
2008-03-20  7:53             ` Junio C Hamano [this message]

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=7vlk4dygpu.fsf@gitster.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=Ralf.Wildenhues@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=j.sixt@viscovery.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).