2.19.0.rc2.windows.1: stash fails with dirty submodule

2.19.0.rc2.windows.1: stash fails with dirty submodule

[Thomas Braun]

Hi,

(reported at [1] already but reposting here as suggested)

I'm using git with stash and rebase builtins.

$ git --version --build-options

git version 2.19.0.rc2.windows.1
cpu: x86_64
built from commit: 425f414f8e04123eacb5597776d6a8de445a8d8b
sizeof-long: 4
sizeof-size_t: 8

With the following recipe

mkdir test
cd test
git init
echo 1 > file
git add file
git commit file -m "message"
git submodule add ./ mysubmod
git commit -m "Add submodule"
echo 2 > mysubmod/file
git checkout -b mybranch
git rebase -i --autosquash master

I get

Initialized empty Git repository in E:/projekte/test/.git/
[master (root-commit) 97c0108] message
 1 file changed, 1 insertion(+)
 create mode 100644 file
Cloning into 'E:/projekte/test/mysubmod'...
done.
[master 282a50f] Add submodule
 2 files changed, 4 insertions(+)
 create mode 100644 .gitmodules
 create mode 160000 mysubmod
Switched to a new branch 'mybranch'
M       mysubmod
fatal: Unexpected stash response: ''

and that used to work with older git versions.

Thanks for reading,
Thomas

[1]:
https://github.com/git-for-windows/git/issues/1820#issuecomment-419411808

Re: 2.19.0.rc2.windows.1: stash fails with dirty submodule

[Jonathan Nieder]

Hi,

Thomas Braun wrote:

> I'm using git with stash and rebase builtins.
>
> $ git --version --build-options
>
> git version 2.19.0.rc2.windows.1
[...]
> mkdir test
> cd test
> git init
> echo 1 > file
> git add file
> git commit file -m "message"
> git submodule add ./ mysubmod
> git commit -m "Add submodule"
> echo 2 > mysubmod/file
> git checkout -b mybranch
> git rebase -i --autosquash master
[...]
> fatal: Unexpected stash response: ''
>
> and that used to work with older git versions.

Thanks for reporting.  I'm cc-ing Dscho, who has been looking for
reports of issues with the new experimental stash and rebase code[2].

Thanks,
Jonathan

> [1]:
> https://github.com/git-for-windows/git/issues/1820#issuecomment-419411808
[2] https://public-inbox.org/git/nycvar.QRO.7.76.6.1808241320540.73@tvgsbejvaqbjf.bet/

Re: 2.19.0.rc2.windows.1: stash fails with dirty submodule

[Stefan Beller]

On Fri, Sep 7, 2018 at 5:35 PM Jonathan Nieder <jrnieder@gmail.com> wrote:
>
> Hi,
>
> Thomas Braun wrote:
>
> > I'm using git with stash and rebase builtins.
> >
> > $ git --version --build-options
> >
> > git version 2.19.0.rc2.windows.1
> [...]
> > mkdir test
> > cd test
> > git init
> > echo 1 > file
> > git add file
> > git commit file -m "message"
> > git submodule add ./ mysubmod
> > git commit -m "Add submodule"
> > echo 2 > mysubmod/file
> > git checkout -b mybranch
> > git rebase -i --autosquash master
> [...]
> > fatal: Unexpected stash response: ''
> >
> > and that used to work with older git versions.
>
> Thanks for reporting.  I'm cc-ing Dscho, who has been looking for
> reports of issues with the new experimental stash and rebase code[2].

(It tests fine on my machine and I have no Windows machine at hand,
so ...)
This finally gave me an opportunity to play around with gitgitgadget
and its integrated CI for all major OS, see
https://github.com/gitgitgadget/git/pull/38
which is just the bug report put into our test suite.