Merge branch 'maint'

[git.git] / git-rebase.sh

diff --git a/git-rebase.sh b/git-rebase.sh
index 52c686fc8c51564d303ddea411dc09265e1222f2..1583402a060793c25e49c3446c2a35fe27101883 100755 (executable)
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -122,15 +122,14 @@ finish_rb_merge () {
 
 is_interactive () {
        test -f "$dotest"/interactive ||
-       while case $#,"$1" in 0,|*,-i|*,--interactive) break ;; esac
-       do
+       while :; do case $#,"$1" in 0,|*,-i|*,--interactive) break ;; esac
                shift
        done && test -n "$1"
 }
 
 is_interactive "$@" && exec git-rebase--interactive "$@"
 
-while case "$#" in 0) break ;; esac
+while test $# != 0
 do
        case "$1" in
        --continue)
@@ -221,7 +220,6 @@ do
                ;;
        -C*)
                git_am_opt="$git_am_opt $1"
-               shift
                ;;
        -*)
                usage