From 96779be48a8e5d3a50a07e0fcab942e7066235a9 Mon Sep 17 00:00:00 2001
From: Junio C Hamano <junkio@cox.net>
Date: Mon, 9 Oct 2006 19:19:45 -0700
Subject: [PATCH] Fix git-revert

Defaulting to $replay for the sake of fixing cherry-pick was not
done conditionally, which broke git-revert.

Noticed by Luben.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---
 git-revert.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/git-revert.sh b/git-revert.sh
index 0784f74c18..4fd81b6ed6 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