From: Junio C Hamano <junkio@cox.net>
Date: Tue, 10 Oct 2006 02:19:45 +0000 (-0700)
Subject: Fix git-revert
X-Git-Tag: v1.4.3-rc2~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=96779be48a8e5d3a50a07e0fcab942e7066235a9;p=git.git

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

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