From 700812ec7f8c2c9034cc4ed0fff2c7fc6a350982 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Thu, 26 Nov 2015 16:40:07 +0100 Subject: [PATCH 1/2] t3404: fix typo Signed-off-by: Johannes Schindelin --- t/t3404-rebase-interactive.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index 98eb49ac236e9e..4ad55d97f09b4c 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -62,7 +62,7 @@ test_expect_success 'setup' ' # "exec" commands are ran with the user shell by default, but this may # be non-POSIX. For example, if SHELL=zsh then ">file" doesn't work -# to create a file. Unseting SHELL avoids such non-portable behavior +# to create a file. Unsetting SHELL avoids such non-portable behavior # in tests. It must be exported for it to take effect where needed. SHELL= export SHELL From 0bd5881fd71d0b05de0962410a5866f4a19edc63 Mon Sep 17 00:00:00 2001 From: Fredrik Medley Date: Fri, 13 Nov 2015 07:03:19 +0100 Subject: [PATCH 2/2] rebase-i-exec: Allow space in SHELL_PATH 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 Signed-off-by: Jeff King Signed-off-by: Johannes Schindelin --- git-rebase--interactive.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 30edb179259d63..b938a6d4aa86b5 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