Re: [PATCH] rebase -i: more graceful handling of invalid commands

From: Thomas Rast <trast@student.ethz.ch>
Date: Oct 27, 2009, 14:21 UTC
Message-ID: <200910271521.09164.trast@student.ethz.ch>
In-Reply-To: <20091027133932.60b996c3@perceptron>

Jan Krüger wrote:

Show 10 quoted lines

> 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?

Show 5 quoted lines

> +		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