Hi Junio,
On Wed, 21 Nov 2018, Junio C Hamano wrote:
> Carlo Arenas <carenas@xxxxxxxxx> writes:
>
> > Tested-by: Carlo Marcelo Arenas Belón <carenas@xxxxxxxxx>
> >
> > 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.
Yes! Thank you. Can you squash it in?
Thanks,
Dscho
>
>
> 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"
>
>
>
