Skip to content

Commit 45e330f

Browse files
committed
Merge branch 'fm/shell-path-whitespace' into maint
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
2 parents 2945adc + fe9394a commit 45e330f

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

git-rebase--interactive.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -610,7 +610,7 @@ do_next () {
610610
read -r command rest < "$todo"
611611
mark_action_done
612612
printf 'Executing: %s\n' "$rest"
613-
${SHELL:-@SHELL_PATH@} -c "$rest" # Actual execution
613+
"${SHELL:-@SHELL_PATH@}" -c "$rest" # Actual execution
614614
status=$?
615615
# Run in subshell because require_clean_work_tree can die.
616616
dirty=f

0 commit comments

Comments
 (0)