From: Junio C Hamano <gitster@pobox.com>
To: Carlo Arenas <carenas@gmail.com>
Cc: gitgitgadget@gmail.com, git@vger.kernel.org, johannes.schindelin@gmx.de
Subject: Re: [PATCH 1/1] legacy-rebase: backport -C<n> and --whitespace=<option> checks
Date: Wed, 21 Nov 2018 13:40:09 +0900 [thread overview]
Message-ID: <xmqqin0r82mu.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <CAPUEspgxNm9oEA-fuT7kBegEp5F2za5Nm6CSvFkMB+Kz_pNbrw@mail.gmail.com> (Carlo Arenas's message of "Tue, 20 Nov 2018 15:45:52 -0800")
Carlo Arenas <carenas@gmail.com> writes:
> Tested-by: Carlo Marcelo Arenas Belón <carenas@gmail.com>
>
> the C version prepends: "fatal: " unlike the shell version for both
> error messages
In addition, "Invalid whitespace option" says 'bad', not
'--whitespace=bad', in the builtin version.
I think the following would address both issues.
git-legacy-rebase.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/git-legacy-rebase.sh b/git-legacy-rebase.sh
index ced0635326..b97ffdc9dd 100755
--- a/git-legacy-rebase.sh
+++ b/git-legacy-rebase.sh
@@ -340,7 +340,7 @@ do
warn|nowarn|error|error-all)
;; # okay, known whitespace option
*)
- die "Invalid whitespace option: '${1%*=}'"
+ die "fatal: Invalid whitespace option: '${1#*=}'"
;;
esac
;;
@@ -358,7 +358,7 @@ do
force_rebase=t
;;
-C*[!0-9]*)
- die "switch \`C' expects a numerical value"
+ die "fatal: switch \`C' expects a numerical value"
;;
-C*)
git_am_opt="$git_am_opt $1"
next prev parent reply other threads:[~2018-11-21 4:40 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-20 20:01 [PATCH 0/1] legacy-rebase: fix "regression" Johannes Schindelin via GitGitGadget
2018-11-20 20:02 ` [PATCH 1/1] legacy-rebase: backport -C<n> and --whitespace=<option> checks Johannes Schindelin via GitGitGadget
2018-11-20 23:45 ` Carlo Arenas
2018-11-21 4:40 ` Junio C Hamano [this message]
2018-11-21 14:06 ` 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqin0r82mu.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=carenas@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=johannes.schindelin@gmx.de \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).