Re: [PATCH] rebase-i-exec: Allow space in SHELL_PATH

2015-11-16 Thread Jeff King
On Mon, Nov 16, 2015 at 05:01:03PM +0100, Johannes Schindelin wrote: > To clarify the Git for Windows scenario: SHELL_PATH is indeed set to > `/bin/sh`, but reportedly it is converted into a full Windows path when we > leave the POSIX emulation layer, i.e. when `git.exe` is called (which has >

Re: [PATCH] rebase-i-exec: Allow space in SHELL_PATH

2015-11-16 Thread Johannes Schindelin
Hi Peff, On Fri, 13 Nov 2015, Jeff King wrote: > It's possible somebody could be doing something clever with $SHELL, but > I kind of doubt it. If they want to do something clever, it is much > easier to put it directly on the exec line, and have the normal $SHELL > run their clever thing. To

Re: [PATCH] rebase-i-exec: Allow space in SHELL_PATH

2015-11-13 Thread Matthieu Moy
Fredrik Medley writes: > --- 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" > -

Re: [PATCH] rebase-i-exec: Allow space in SHELL_PATH

2015-11-13 Thread Fredrik Medley
2015-11-13 7:25 GMT+01:00 Jeff King : > On Fri, Nov 13, 2015 at 07:03:19AM +0100, Fredrik Medley wrote: > >> 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

Re: [PATCH] rebase-i-exec: Allow space in SHELL_PATH

2015-11-13 Thread Fredrik Medley
2015-11-13 23:27 GMT+01:00 Jeff King : > On Fri, Nov 13, 2015 at 04:25:18PM +0100, Fredrik Medley wrote: > >> >> - ${SHELL:-@SHELL_PATH@} -c "$rest" # Actual execution >> >> + "${SHELL:-@SHELL_PATH@}" -c "$rest" # Actual execution >> > >> > I think this is

Re: [PATCH] rebase-i-exec: Allow space in SHELL_PATH

2015-11-13 Thread Jeff King
On Fri, Nov 13, 2015 at 11:47:40PM +0100, Fredrik Medley wrote: > > Hmm. Now I'm a bit puzzled. It sounds like the installed file does have > > @SHELL_PATH@ set to /bin/sh, which is normal. And presumably the setting > > containing space is coming from the $SHELL environment variable. > I wrote

Re: [PATCH] rebase-i-exec: Allow space in SHELL_PATH

2015-11-13 Thread Jeff King
On Fri, Nov 13, 2015 at 04:25:18PM +0100, Fredrik Medley wrote: > >> - ${SHELL:-@SHELL_PATH@} -c "$rest" # Actual execution > >> + "${SHELL:-@SHELL_PATH@}" -c "$rest" # Actual execution > > > > I think this is the right thing to do (at least I could not think of a > > case

[PATCH] rebase-i-exec: Allow space in SHELL_PATH

2015-11-12 Thread Fredrik Medley
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 --- git-rebase--interactive.sh | 2 +- 1 file changed, 1

Re: [PATCH] rebase-i-exec: Allow space in SHELL_PATH

2015-11-12 Thread Jeff King
On Fri, Nov 13, 2015 at 07:03:19AM +0100, Fredrik Medley wrote: > 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