Sync with 2.8.3

diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 9ea30756f13349c96784f0091da4c3c667166485..1c6dfb6d5618f43eaac1c279332d33e6a913c2d9 100644 (file)
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -82,6 +82,7 @@ rewritten_pending="$state_dir"/rewritten-pending
 cr=$(printf "\015")
 
 strategy_args=${strategy:+--strategy=$strategy}
+test -n "$strategy_opts" &&
 eval '
        for strategy_opt in '"$strategy_opts"'
        do