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

From: Stefan Beller <sbeller@google.com>
Date: Sep 11, 2018, 22:24 UTC
Message-ID: <CAGZ79kadU6Lb14pwJQv=bYrn5wJxO_0UeoSN5BO0t44HC3q6rg@mail.gmail.com>
In-Reply-To: <20180908003514.GC225427@aiede.svl.corp.google.com>

On Fri, Sep 7, 2018 at 5:35 PM Jonathan Nieder <jrnieder@gmail.com> wrote:

Show 29 quoted lines

>
> 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.