summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFredrik Medley <fredrik.medley@gmail.com>2015-11-13 07:03:19 +0100
committerJeff King <peff@peff.net>2015-11-13 17:51:39 -0500
commitfe9394ad3e4ec4386b805c63ffc016647054e14d (patch)
tree91e6602c9299d7309006d39d3319c323cd2c2c3a
parentaf40944bda352190f05d22b7cb8fe88beb17f3a7 (diff)
downloadgit-fm/shell-path-whitespace.tar.gz
rebase-i-exec: Allow space in SHELL_PATHfm/shell-path-whitespace
On Windows, when Git is installed under "C:\Program Files\Git", SHELL_PATH will include a space. Fix "git rebase --interactive --exec" so that it works with spaces in SHELL_PATH. Signed-off-by: Fredrik Medley <fredrik.medley@gmail.com> Signed-off-by: Jeff King <peff@peff.net>
-rw-r--r--git-rebase--interactive.sh2
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