Web lists-archives.com

Re: [PATCH] git-rebase.sh: fix typos in error messages




Ralf Thielow <ralf.thielow@xxxxxxxxx> writes:

> Signed-off-by: Ralf Thielow <ralf.thielow@xxxxxxxxx>
> ---
>  git-rebase.sh | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)

This patch itself will soon stop mattering once the group of
rebase-in-c topics graduate, which hopefully will happen during this
cycle.  However, because the same mistakes are inherited to
builtin/rebase.c by these topics, we'd need a matching fix to
correct 07664161 ("builtin rebase: error out on incompatible
option/mode combinations", 2018-08-08) and either squash the fix
into that commit, or queue it on top of pk/rebase-in-c-5-test topic.

Will queue; thanks.

>
> diff --git a/git-rebase.sh b/git-rebase.sh
> index 7973447645..45b6ee9c0e 100755
> --- a/git-rebase.sh
> +++ b/git-rebase.sh
> @@ -553,15 +553,15 @@ then
>  	# Note: incompatibility with --interactive is just a strong warning;
>  	#       git-rebase.txt caveats with "unless you know what you are doing"
>  	test -n "$rebase_merges" &&
> -		die "$(gettext "error: cannot combine '--preserve_merges' with '--rebase-merges'")"
> +		die "$(gettext "error: cannot combine '--preserve-merges' with '--rebase-merges'")"
>  fi
>  
>  if test -n "$rebase_merges"
>  then
>  	test -n "$strategy_opts" &&
> -		die "$(gettext "error: cannot combine '--rebase_merges' with '--strategy-option'")"
> +		die "$(gettext "error: cannot combine '--rebase-merges' with '--strategy-option'")"
>  	test -n "$strategy" &&
> -		die "$(gettext "error: cannot combine '--rebase_merges' with '--strategy'")"
> +		die "$(gettext "error: cannot combine '--rebase-merges' with '--strategy'")"
>  fi
>  
>  if test -z "$rebase_root"