Re: [PATCH] git-commit.sh: Permit the --amend message to be given with -m/-c/-C/-F.
David Kastrup <dak@gnu.org> writes:
Show 29 quoted lines
> Signed-off-by: David Kastrup <dak@gnu.org>
> ---
> git-commit.sh | 5 ++---
> 1 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/git-commit.sh b/git-commit.sh
> index 4290ae2..d7e7028 100755
> --- a/git-commit.sh
> +++ b/git-commit.sh
> @@ -190,7 +190,6 @@ $1"
> ;;
> --a|--am|--ame|--amen|--amend)
> amend=t
> - log_given=t$log_given
> use_commit=HEAD
> shift
> ;;
> @@ -298,9 +297,9 @@ esac
>
> case "$log_given" in
> tt*)
> - die "Only one of -c/-C/-F/--amend can be used." ;;
> + die "Only one of -c/-C/-F can be used." ;;
> *tm*|*mt*)
> - die "Option -m cannot be combined with -c/-C/-F/--amend." ;;
> + die "Option -m cannot be combined with -c/-C/-F." ;;
> esac
>
> case "$#,$also,$only,$amend" in
Ok, looks obviously correct. Wasn't too painful, was it?
Thanks, will apply.