From: Stephan Beyer <s-beyer@gmx.net>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: git@vger.kernel.org, gitster@pobox.com
Subject: Re: [PATCH] rebase -i: only automatically amend commit if HEAD did not change
Date: Tue, 22 Jul 2008 23:48:58 +0200 [thread overview]
Message-ID: <20080722214858.GC5904@leksak.fem-net> (raw)
In-Reply-To: <alpine.DEB.1.00.0807222235520.8986@racer>
Hi,
Johannes Schindelin wrote:
> If the user called "rebase -i", marked a commit as "edit", "rebase
> --continue" would automatically amend the commit when there were
> staged changes.
>
> However, this is actively wrong when the current commit is not the
> one marked with "edit". So guard against this.
Hmm, I like it. ;-)
> @@ -419,7 +419,9 @@ do
> else
> . "$DOTEST"/author-script ||
> die "Cannot find the author identity"
> - if test -f "$DOTEST"/amend
> + if test -f "$DOTEST"/amend &&
> + test $(git rev-parse HEAD) = \
> + $(cat "$DOTEST"/amend)
> then
> git reset --soft HEAD^ ||
> die "Cannot rewind the HEAD"
So if this fails, a non-amending commit is done. Agreed. :)
Regards,
Stephan
--
Stephan Beyer <s-beyer@gmx.net>, PGP 0x6EDDD207FCC5040F
next prev parent reply other threads:[~2008-07-22 21:50 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-22 21:36 [PATCH] rebase -i: only automatically amend commit if HEAD did not change Johannes Schindelin
2008-07-22 21:48 ` Stephan Beyer [this message]
2008-07-22 22:22 ` Avery Pennarun
2008-07-22 23:55 ` Junio C Hamano
2008-07-23 15:55 ` Avery Pennarun
2008-07-23 12:01 ` Dmitry Potapov
2008-07-23 15:53 ` Avery Pennarun
2008-07-23 16:09 ` Johannes Schindelin
2008-07-23 16:19 ` Avery Pennarun
2008-07-23 23:41 ` Junio C Hamano
2008-07-24 12:20 ` Johannes Schindelin
2008-07-24 12:35 ` Stephan Beyer
2008-07-25 8:44 ` Junio C Hamano
2008-07-25 10:35 ` Johannes Schindelin
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=20080722214858.GC5904@leksak.fem-net \
--to=s-beyer@gmx.net \
--cc=Johannes.Schindelin@gmx.de \
--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).