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?ds=inline;hp=-c

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
---

fd704b16f14a43f7d6688f0059cf9ddf9b1d9b2f
diff --combined git-rebase--interactive.sh
index 9ea30756f1,655ebaa471..1c6dfb6d56
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@@ -82,6 -82,7 +82,7 @@@ rewritten_pending="$state_dir"/rewritte
  cr=$(printf "\015")
  
  strategy_args=${strategy:+--strategy=$strategy}
+ test -n "$strategy_opts" &&
  eval '
  	for strategy_opt in '"$strategy_opts"'
  	do
@@@ -548,8 -549,7 +549,8 @@@ do_next () 
  
  		mark_action_done
  		do_pick $sha1 "$rest"
 -		warn "Stopped at $sha1... $rest"
 +		sha1_abbrev=$(git rev-parse --short $sha1)
 +		warn "Stopped at $sha1_abbrev... $rest"
  		exit_with_patch $sha1 0
  		;;
  	squash|s|fixup|f)