summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-05-26 13:17:24 -0700
committerJunio C Hamano <gitster@pobox.com>2016-05-26 13:17:24 -0700
commitcca92531e3f836733d246c9696ce6a7059ae10ad (patch)
tree51abf31f65f48366e81216795c5ddc69b7301262
parente29300d69fb8e003b36f155a5f286d72ee5a557f (diff)
parent8e98b35f87532761f09101729715c2ec49e24ddf (diff)
downloadgit-cca92531e3f836733d246c9696ce6a7059ae10ad.tar.gz
Merge branch 'jk/rebase-interative-eval-fix' into maint
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
-rw-r--r--git-rebase--interactive.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 4cde685b43..655ebaa471 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