From: Thomas Rast <trast@student.ethz.ch>
To: "Jan Krüger" <jk@jk.gs>
Cc: <kusmabite@gmail.com>, Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH] rebase -i: more graceful handling of invalid commands
Date: Tue, 27 Oct 2009 16:21:08 +0200 [thread overview]
Message-ID: <200910271521.09164.trast@student.ethz.ch> (raw)
In-Reply-To: <20091027133932.60b996c3@perceptron>
Jan Krüger wrote:
> diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
> index a1879e3..fdd8eb6 100755
> --- a/git-rebase--interactive.sh
> +++ b/git-rebase--interactive.sh
> @@ -416,7 +416,12 @@ do_next () {
> ;;
> *)
> warn "Unknown command: $command $sha1 $rest"
> - die_with_patch $sha1 "Please fix this in the file $TODO."
> + if git rev-parse --verify -q "$sha" >/dev/null
I think you need s/sha/sha1/ here?
> + then
> + die_with_patch $sha1 "Please fix this in the file $TODO."
> + else
> + die "Please fix this in the file $TODO."
> + fi
--
Thomas Rast
trast@{inf,student}.ethz.ch
next prev parent reply other threads:[~2009-10-27 14:22 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-10-27 10:13 possible usability issue in rebase -i? Erik Faye-Lund
2009-10-27 12:39 ` [PATCH] rebase -i: more graceful handling of invalid commands Jan Krüger
2009-10-27 14:17 ` Johannes Schindelin
2009-10-27 14:21 ` Thomas Rast [this message]
2009-10-27 14:58 ` [PATCH v2] " Jan Krüger
2009-10-28 7:18 ` Junio C Hamano
2009-10-27 15:17 ` possible usability issue in rebase -i? Baz
2009-10-27 15:50 ` Erik Faye-Lund
2009-10-27 21:05 ` Baz
2009-10-28 12:20 ` Erik Faye-Lund
2009-10-28 14:34 ` Baz
2009-10-28 14:41 ` Erik Faye-Lund
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=200910271521.09164.trast@student.ethz.ch \
--to=trast@student.ethz.ch \
--cc=git@vger.kernel.org \
--cc=jk@jk.gs \
--cc=kusmabite@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.