diff --git a/git-revert.sh b/git-revert.sh
index 0784f74c18c4a5a2c34a37c16ba1ad094cd41a06..4fd81b6ed60e5877df85c1052057b0ad5410f4fe 100755
--- a/git-revert.sh
+++ b/git-revert.sh
@@ -7,9 +7,11 @@
 case "$0" in
 *-revert* )
 	test -t 0 && edit=-e
+	replay=
 	me=revert
 	USAGE='[--edit | --no-edit] [-n] <commit-ish>' ;;
 *-cherry-pick* )
+	replay=t
 	edit=
 	me=cherry-pick
 	USAGE='[--edit] [-n] [-r] [-x] <commit-ish>'  ;;
@@ -18,7 +20,7 @@ case "$0" in
 esac
 . git-sh-setup
 
-no_commit= replay=t
+no_commit=
 while case "$#" in 0) break ;; esac
 do
 	case "$1" in