From: Björn Steinbrink <B.Steinbrink@gmx.de>
Date: Wed, 31 Oct 2007 02:20:30 +0000 (+0100)
Subject: Fix --strategy parsing in git-rebase--interactive.sh
X-Git-Tag: v1.5.3.5~4
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3524b282dabd254fc50b186e35ea5c6f612aeb46?ds=inline;hp=--cc

Fix --strategy parsing in git-rebase--interactive.sh

For the --strategy/-s option, git-rebase--interactive.sh dropped the
parameter which it was trying to parse.

Signed-off-by: Björn Steinbrink <B.Steinbrink@gmx.de>
Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

3524b282dabd254fc50b186e35ea5c6f612aeb46
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 50b79ff8ff..ebc67e515d 100755
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -357,7 +357,6 @@ do
 		output git reset --hard && do_rest
 		;;
 	-s|--strategy)
-		shift
 		case "$#,$1" in
 		*,*=*)
 			STRATEGY="-s `expr "z$1" : 'z-[^=]*=\(.*\)'`" ;;