aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-10-09 19:19:45 -0700
committerJunio C Hamano <junkio@cox.net>2006-10-09 19:19:45 -0700
commit96779be48a8e5d3a50a07e0fcab942e7066235a9 (patch)
tree84cf6f5f84164addc7f511560637d1ee37269121
parent9a7a62ff71c436fb5e024ec409ec28fca460a168 (diff)
downloadgit-96779be48a8e5d3a50a07e0fcab942e7066235a9.tar.gz
git-96779be48a8e5d3a50a07e0fcab942e7066235a9.tar.xz
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>
-rwxr-xr-xgit-revert.sh4
1 files changed, 3 insertions, 1 deletions
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