--exec doesn't work

[ploeh]

While doing an interactive rebase, --exec can be quite handy. Unfortunately, in the git-for-windows fork, this feature seems to no longer work.

Steps to reproduce

In summary:

1. Create a new repro
2. Add some commits
3. Add a script file
4. Interactively rebase, using --exec to run the script file between each commit.

Here are the detailed steps I used to reproduce the issue from Git Bash:

mark@Canopus MINGW64 ~/Desktop
$ mkdir exec-repro

mark@Canopus MINGW64 ~/Desktop
$ cd exec-repro/

mark@Canopus MINGW64 ~/Desktop/exec-repro
$ git init
Initialized empty Git repository in C:/Users/mark/Desktop/exec-repro/.git/

mark@Canopus MINGW64 ~/Desktop/exec-repro (master)
$ vim .gitignore

In .gitignore, I simply added one line:

*.sh

The I continued:

mark@Canopus MINGW64 ~/Desktop/exec-repro (master)
$ git add .gitignore
warning: LF will be replaced by CRLF in .gitignore.
The file will have its original line endings in your working directory.

mark@Canopus MINGW64 ~/Desktop/exec-repro (master)
$ git commit
[master (root-commit) 96bf28b] Added .gitignore
warning: LF will be replaced by CRLF in .gitignore.
The file will have its original line endings in your working directory.
 1 file changed, 1 insertion(+)
 create mode 100644 .gitignore

mark@Canopus MINGW64 ~/Desktop/exec-repro (master)
$ vim thefile.txt

In thefile.txt, I added first foo on one line, then, in two separate commits bar and baz:

mark@Canopus MINGW64 ~/Desktop/exec-repro (master)
$ git add .
warning: LF will be replaced by CRLF in thefile.txt.
The file will have its original line endings in your working directory.

mark@Canopus MINGW64 ~/Desktop/exec-repro (master)
$ git commit
[master 8a59b46] Added the file.
warning: LF will be replaced by CRLF in thefile.txt.
The file will have its original line endings in your working directory.
 1 file changed, 1 insertion(+)
 create mode 100644 thefile.txt

mark@Canopus MINGW64 ~/Desktop/exec-repro (master)
$ vim thefile.txt

mark@Canopus MINGW64 ~/Desktop/exec-repro (master)
$ git add .
warning: LF will be replaced by CRLF in thefile.txt.
The file will have its original line endings in your working directory.

mark@Canopus MINGW64 ~/Desktop/exec-repro (master)
$ git commit
warning: LF will be replaced by CRLF in thefile.txt.
The file will have its original line endings in your working directory.
[master warning: LF will be replaced by CRLF in thefile.txt.
The file will have its original line endings in your working directory.
c45a948] Added a line to the file.
warning: LF will be replaced by CRLF in thefile.txt.
The file will have its original line endings in your working directory.
 1 file changed, 1 insertion(+)

mark@Canopus MINGW64 ~/Desktop/exec-repro (master)
$ vim thefile.txt

mark@Canopus MINGW64 ~/Desktop/exec-repro (master)
$ git add .
warning: LF will be replaced by CRLF in thefile.txt.
The file will have its original line endings in your working directory.

mark@Canopus MINGW64 ~/Desktop/exec-repro (master)
$ git commit
warning: LF will be replaced by CRLF in thefile.txt.
The file will have its original line endings in your working directory.
[master warning: LF will be replaced by CRLF in thefile.txt.
The file will have its original line endings in your working directory.
6112987] Added a line to the file.
warning: LF will be replaced by CRLF in thefile.txt.
The file will have its original line endings in your working directory.
 1 file changed, 1 insertion(+)

Here's the log so far:

mark@Canopus MINGW64 ~/Desktop/exec-repro (master)
$ git log
commit 6112987c936ca3bff5b707d3e4655c8f1b60123d
Author: Mark Seemann <mark@ploeh.dk>
Date:   Sun Nov 22 12:11:16 2015 +0100

    Added a line to the file.

commit c45a948d2ebc268f24414bb5277d50bd85134b4d
Author: Mark Seemann <mark@ploeh.dk>
Date:   Sun Nov 22 12:10:34 2015 +0100

    Added a line to the file.

commit 8a59b460760551886c573c4059d83a560fd62155
Author: Mark Seemann <mark@ploeh.dk>
Date:   Sun Nov 22 12:10:10 2015 +0100

    Added the file.

commit 96bf28bc45c5a7e5d4b9f1fda02a62b127b4f499
Author: Mark Seemann <mark@ploeh.dk>
Date:   Sun Nov 22 12:09:25 2015 +0100

    Added .gitignore

Then I added a script file:

mark@Canopus MINGW64 ~/Desktop/exec-repro (master)
$ vim thescript.sh

The content of thescript.sh is simple:

#!/bin/bash
printf "Running the script."

Finally, I started an interactive rebase:

$ git rebase -i 8a59b460760551886c573c4059d83a560fd62155 --exec "./thescript.sh"

After having added some changes to thefile.txt, I issued git rebase --continue.

Expected result

I would expect the rebase to continue, executing thescript.sh between applying each commit.

Actual result

$ git rebase --continue
Executing: thescript.sh
/mingw64/libexec/git-core/git-rebase--interactive: line 613: C:/Program: No such file or directory
Execution failed: thescript.sh
You can fix the problem, and then run

        git rebase --continue

It's possible to execute thescript.sh manually from the command line:

$ ./thescript.sh
Running the script.

After each git rebase --continue, though, the above error happens.

Environment information

This is my environment:

$ git --version
git version 2.6.3.windows.1

I'm on Windows 10 Pro x64.

[kgybels]

It fails at line 613 in the git-rebase--interactive script:
${SHELL:-/bin/sh} -c "$rest" # Actual execution

Because SHELL is set to C:/Program Files/Git/usr/bin/bash.

Adding quotes like this fixes the problem:
"${SHELL:-/bin/sh}" -c "$rest" # Actual execution

@dscho Should we get this change (i.e. adding the quotes to the shell invocation) to upstream git? Or do we need to figure out why SHELL is not set to /usr/bin/bash instead?

[dscho]

Or do we need to figure out why SHELL is not set to /bin/bash instead?

@kgybels we need to figure this one out. That will "kill a couple of tickets with one stone".

[dscho]

@ploeh @kgybels if you have time, would you please build the msys2-runtime from my posify_shell branch and test?

[ploeh]

I've now tested with the posify_shell branch, and it looks like it solves the problem:

$ git rebase --continue
Executing: ./thescript.sh
Executing: ./thescript.shng (3/6)
Executing: ./thescript.shng (5/6)
Running the script.Successfully rebased and updated refs/heads/master.

It looks funny that for some reason ng is appended to the shell output...

[dscho]

@ploeh thanks for testing.

It looks funny that for some reason ng is appended to the shell output...

That is not what is happening. When rebasing, the progress is shown as "Rebasing (m/n)" followed by a single carriage return without a line feed. The line then gets partially overwritten by the "Executing" line. (Yes, there is probably some prefix before the "Rebasing" line because it would otherwise not be long enough.)

[dscho]

This issue has been addressed in Git for Windows 2.6.4.