aboutsummaryrefslogtreecommitdiff
path: root/git-rebase--interactive.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-05-17 14:38:35 -0700
committerJunio C Hamano <gitster@pobox.com>2016-05-17 14:38:35 -0700
commitfd704b16f14a43f7d6688f0059cf9ddf9b1d9b2f (patch)
tree11f48d5efa3e287feb5b401cf4217e80fb75df95 /git-rebase--interactive.sh
parent6bfb7de89e32117a59cbafdb2dfeeac633121df0 (diff)
parent8e98b35f87532761f09101729715c2ec49e24ddf (diff)
downloadgit-fd704b16f14a43f7d6688f0059cf9ddf9b1d9b2f.tar.gz
git-fd704b16f14a43f7d6688f0059cf9ddf9b1d9b2f.tar.xz
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
Diffstat (limited to 'git-rebase--interactive.sh')
-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 9ea30756f..1c6dfb6d5 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