From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 17 May 2016 21:38:35 +0000 (-0700)
Subject: Merge branch 'jk/rebase-interative-eval-fix'
X-Git-Tag: v2.9.0-rc0~22
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/fd704b16f14a43f7d6688f0059cf9ddf9b1d9b2f?hp=6bfb7de89e32117a59cbafdb2dfeeac633121df0

Merge branch 'jk/rebase-interative-eval-fix'

Portability enhancement for "rebase -i" to help platforms whose
shell does not like "for i in <empty>" (which is not POSIX-kosher).

* jk/rebase-interative-eval-fix:
rebase--interactive: avoid empty list in shell for-loop
---

diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 9ea30756f1..1c6dfb6d56 100644
--- 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