diff options
| author | Jeff King <peff@peff.net> | 2015-12-01 17:19:37 -0500 |
|---|---|---|
| committer | Jeff King <peff@peff.net> | 2015-12-01 17:19:37 -0500 |
| commit | 45e330f512b5a32f2e3aae800e57b07fd75f607e (patch) | |
| tree | 30c4065dbc38151c433f49b39bf15cbb5a0b9804 | |
| parent | 2945adcc2db603f9d810a823feff9b75a0452d04 (diff) | |
| parent | fe9394ad3e4ec4386b805c63ffc016647054e14d (diff) | |
| download | git-45e330f512b5a32f2e3aae800e57b07fd75f607e.tar.gz | |
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
| -rw-r--r-- | git-rebase--interactive.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 30edb17925..b938a6d4aa 100644 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -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 |