From: Junio C Hamano <gitster@pobox.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: "Anders Melchiorsen" <mail@spoon.kalibalik.dk>,
"Björn Gustavsson" <bgustavsson@gmail.com>,
"Sverre Rabbelier" <srabbelier@gmail.com>,
git@vger.kernel.org, gitster@pobox.com
Subject: Re: [PATCH] Teach 'rebase -i' the command "amend"
Date: Mon, 05 Oct 2009 14:07:10 -0700 [thread overview]
Message-ID: <7vbpkl8s8x.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <alpine.DEB.1.00.0910052248500.4985@pacific.mpi-cbg.de> (Johannes Schindelin's message of "Mon\, 5 Oct 2009 22\:50\:05 +0200 \(CEST\)")
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
>> Being in an editor but still not able to fix typos is a nuisance.
>
> NAK.
>
> Supporting that would be totally out of line with the way rebase -i is
> supposed to work.
If the rebase insn sheet were richer, and had a way to show the full
message, like this:
pick 4973aa2 git-pull: dead code removal
Back when a74b170 (git-pull: disallow implicit merging to detached HEAD,
2007-01-15) added this check, $? referred to the error status of reading
HEAD as a symbolic-ref; but cd67e4d (Teach 'git pull' about --rebase,
2007-11-28) moved the command away from where the check is, and nobody
noticed the breakage. Ever since, $? has always been 0 (tr at the end of
the pipe to find merge_head never fails) and other case arms were never
reached.
These days, error_on_no_merge_candidates function is prepared to handle a
detached HEAD case, which was what the code this patch removes used to
handle.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
I do not see why we shouldn't allow people to edit any part of the above
to reword.
I would even understand (but not necessarily agree) if somebody wants to
give the patch text and let users edit to reapply.
So I do not agree with your "totally out of line" at all.
> Besides, if you already have typos in the commit subject, you _better_
> check the whole commit message, so: double NAK.
That sounds a bit too dogmatic.
But I tend to agree with you that we would be better off not accepting
such a "retitle" patch, as it strongly encourages single-liner commit log
messages.
Oh, there was no patch? Then nevermind...
next prev parent reply other threads:[~2009-10-05 21:13 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-10-04 19:06 [PATCH] Teach 'rebase -i' the command "amend" Björn Gustavsson
2009-10-04 21:09 ` Johannes Schindelin
2009-10-05 6:08 ` Björn Gustavsson
2009-10-05 6:33 ` Junio C Hamano
2009-10-05 9:17 ` Johannes Schindelin
2009-10-05 9:39 ` Sverre Rabbelier
2009-10-05 16:10 ` Björn Gustavsson
2009-10-05 19:43 ` Anders Melchiorsen
2009-10-05 20:50 ` Johannes Schindelin
2009-10-05 21:07 ` Junio C Hamano [this message]
2009-10-05 21:13 ` Sverre Rabbelier
2009-10-05 21:26 ` Johannes Schindelin
2009-10-06 5:53 ` Johannes Sixt
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=7vbpkl8s8x.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=bgustavsson@gmail.com \
--cc=git@vger.kernel.org \
--cc=mail@spoon.kalibalik.dk \
--cc=srabbelier@gmail.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).