From: "Shawn O. Pearce" <spearce@spearce.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Bernt Hansen <bernt@alumni.uwaterloo.ca>,
git@vger.kernel.org
Subject: Re: [PATCH] Reallow git-rebase --interactive --continue if commit is unnecessary
Date: Thu, 20 Dec 2007 02:31:14 -0500 [thread overview]
Message-ID: <20071220073113.GJ14735@spearce.org> (raw)
In-Reply-To: <7vzlw5rg53.fsf@gitster.siamese.dyndns.org>
Junio C Hamano <gitster@pobox.com> wrote:
> "Shawn O. Pearce" <spearce@spearce.org> writes:
> > diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
> > index 47581ce..39f32b1 100755
> > --- a/git-rebase--interactive.sh
> > +++ b/git-rebase--interactive.sh
> > @@ -372,8 +372,9 @@ do
> > test ! -f "$DOTEST"/amend || git reset --soft HEAD^
> > } &&
> > export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE &&
> > - git commit --no-verify -F "$DOTEST"/message -e ||
> > + if ! git commit --no-verify -F "$DOTEST"/message -e
> > die "Could not commit staged changes."
> > + fi
>
> This looks like a syntax error to me.
Whoops. This looks like a syntax error to me too.
Its late. I totally missed a "then". Would you mind doing an amend?
--
Shawn.
next prev parent reply other threads:[~2007-12-20 7:31 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-12-20 0:35 git rebase -i / git-gui bug Bernt Hansen
2007-12-20 4:47 ` Bernt Hansen
2007-12-20 7:12 ` [PATCH] Reallow git-rebase --interactive --continue if commit is unnecessary Shawn O. Pearce
2007-12-20 7:15 ` Junio C Hamano
2007-12-20 7:31 ` Shawn O. Pearce [this message]
2007-12-20 9:35 ` Junio C Hamano
2007-12-26 23:48 ` Junio C Hamano
2007-12-29 13:26 ` Johannes Schindelin
2007-12-20 7:52 ` Matthieu Moy
2007-12-24 14:31 ` [PATCH] Force new line at end of commit message Bernt Hansen
2007-12-24 17:38 ` Johannes Schindelin
2007-12-25 4:42 ` Shawn O. Pearce
2007-12-25 9:34 ` Junio C Hamano
2007-12-26 17:47 ` Bernt Hansen
2007-12-27 4:19 ` Shawn O. Pearce
2007-12-28 2:15 ` [PATCH] git-gui: Make commit log messages end with a newline Bernt Hansen
2007-12-26 19:36 ` [PATCH] Force new line at end of commit message Junio C Hamano
2007-12-29 13:31 ` Johannes Schindelin
2007-12-30 0:19 ` Junio C Hamano
2007-12-30 10:26 ` Johannes Schindelin
2007-12-30 10:51 ` Junio C Hamano
2007-12-30 11:03 ` Johannes Schindelin
2007-12-30 11:45 ` Junio C Hamano
2007-12-30 11:57 ` しらいしななこ
2007-12-30 12:21 ` Junio C Hamano
2007-12-30 12:05 ` Junio C Hamano
2007-12-30 15:50 ` Johannes Schindelin
2007-12-25 4:46 ` Shawn O. Pearce
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=20071220073113.GJ14735@spearce.org \
--to=spearce@spearce.org \
--cc=Johannes.Schindelin@gmx.de \
--cc=bernt@alumni.uwaterloo.ca \
--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).