Skip to content

Commit

Permalink
Merge branch 'fm/shell-path-whitespace' into maint
Browse files Browse the repository at this point in the history
Portability fix for Windows, which may rewrite $SHELL variable using
non-POSIX paths.

* fm/shell-path-whitespace:
  rebase-i-exec: Allow space in SHELL_PATH
  • Loading branch information
Jeff King committed Dec 1, 2015
2 parents 2945adc + fe9394a commit 45e330f
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion git-rebase--interactive.sh
Original file line number Diff line number Diff line change
Expand Up @@ -610,7 +610,7 @@ do_next () {
read -r command rest < "$todo"
mark_action_done
printf 'Executing: %s\n' "$rest"
${SHELL:-@SHELL_PATH@} -c "$rest" # Actual execution
"${SHELL:-@SHELL_PATH@}" -c "$rest" # Actual execution
status=$?
# Run in subshell because require_clean_work_tree can die.
dirty=f
Expand Down

0 comments on commit 45e330f

Please sign in to comment.