{"thread":{"id":"49298","subject":"2.19.0.rc2.windows.1: stash fails with dirty submodule","startedAt":"2018-09-07T12:51:00Z","lastAt":"2018-09-11T22:24:59Z","messageCount":3,"participants":["Thomas Braun","Jonathan Nieder","Stefan Beller"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"357620","messageId":"6e01daf2-5fb7-b6c0-2833-aa696241c609@virtuell-zuhause.de","threadId":"49298","inReplyTo":null,"subject":"2.19.0.rc2.windows.1: stash fails with dirty submodule","fromName":"Thomas Braun","fromEmail":"thomas.braun@virtuell-zuhause.de","sentAt":"2018-09-07T12:31:23Z","receivedAt":"2018-09-07T12:51:00Z","isPatch":false,"sender":{"key":"thomas.braun@virtuell-zuhause.de","avatar":"https://avatars.githubusercontent.com/u/1185677?v=4"},"body":"Hi,\n\n(reported at [1] already but reposting here as suggested)\n\nI'm using git with stash and rebase builtins.\n\n$ git --version --build-options\n\ngit version 2.19.0.rc2.windows.1\ncpu: x86_64\nbuilt from commit: 425f414f8e04123eacb5597776d6a8de445a8d8b\nsizeof-long: 4\nsizeof-size_t: 8\n\nWith the following recipe\n\nmkdir test\ncd test\ngit init\necho 1 > file\ngit add file\ngit commit file -m \"message\"\ngit submodule add ./ mysubmod\ngit commit -m \"Add submodule\"\necho 2 > mysubmod/file\ngit checkout -b mybranch\ngit rebase -i --autosquash master\n\nI get\n\nInitialized empty Git repository in E:/projekte/test/.git/\n[master (root-commit) 97c0108] message\n 1 file changed, 1 insertion(+)\n create mode 100644 file\nCloning into 'E:/projekte/test/mysubmod'...\ndone.\n[master 282a50f] Add submodule\n 2 files changed, 4 insertions(+)\n create mode 100644 .gitmodules\n create mode 160000 mysubmod\nSwitched to a new branch 'mybranch'\nM       mysubmod\nfatal: Unexpected stash response: ''\n\nand that used to work with older git versions.\n\nThanks for reading,\nThomas\n\n[1]:\nhttps://github.com/git-for-windows/git/issues/1820#issuecomment-419411808\n"},{"id":"357673","messageId":"20180908003514.GC225427@aiede.svl.corp.google.com","threadId":"49298","inReplyTo":"6e01daf2-5fb7-b6c0-2833-aa696241c609@virtuell-zuhause.de","subject":"Re: 2.19.0.rc2.windows.1: stash fails with dirty submodule","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2018-09-08T00:35:14Z","receivedAt":"2018-09-08T00:35:19Z","isPatch":false,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Hi,\n\nThomas Braun wrote:\n\n> I'm using git with stash and rebase builtins.\n>\n> $ git --version --build-options\n>\n> git version 2.19.0.rc2.windows.1\n[...]\n> mkdir test\n> cd test\n> git init\n> echo 1 > file\n> git add file\n> git commit file -m \"message\"\n> git submodule add ./ mysubmod\n> git commit -m \"Add submodule\"\n> echo 2 > mysubmod/file\n> git checkout -b mybranch\n> git rebase -i --autosquash master\n[...]\n> fatal: Unexpected stash response: ''\n>\n> and that used to work with older git versions.\n\nThanks for reporting.  I'm cc-ing Dscho, who has been looking for\nreports of issues with the new experimental stash and rebase code[2].\n\nThanks,\nJonathan\n\n> [1]:\n> https://github.com/git-for-windows/git/issues/1820#issuecomment-419411808\n[2] https://public-inbox.org/git/nycvar.QRO.7.76.6.1808241320540.73@tvgsbejvaqbjf.bet/\n"},{"id":"357922","messageId":"CAGZ79kadU6Lb14pwJQv=bYrn5wJxO_0UeoSN5BO0t44HC3q6rg@mail.gmail.com","threadId":"49298","inReplyTo":"20180908003514.GC225427@aiede.svl.corp.google.com","subject":"Re: 2.19.0.rc2.windows.1: stash fails with dirty submodule","fromName":"Stefan Beller","fromEmail":"sbeller@google.com","sentAt":"2018-09-11T22:24:46Z","receivedAt":"2018-09-11T22:24:59Z","isPatch":false,"sender":{"key":"stefanbeller@gmail.com","avatar":"https://avatars.githubusercontent.com/u/455868?v=4"},"body":"On Fri, Sep 7, 2018 at 5:35 PM Jonathan Nieder <jrnieder@gmail.com> wrote:\n>\n> Hi,\n>\n> Thomas Braun wrote:\n>\n> > I'm using git with stash and rebase builtins.\n> >\n> > $ git --version --build-options\n> >\n> > git version 2.19.0.rc2.windows.1\n> [...]\n> > mkdir test\n> > cd test\n> > git init\n> > echo 1 > file\n> > git add file\n> > git commit file -m \"message\"\n> > git submodule add ./ mysubmod\n> > git commit -m \"Add submodule\"\n> > echo 2 > mysubmod/file\n> > git checkout -b mybranch\n> > git rebase -i --autosquash master\n> [...]\n> > fatal: Unexpected stash response: ''\n> >\n> > and that used to work with older git versions.\n>\n> Thanks for reporting.  I'm cc-ing Dscho, who has been looking for\n> reports of issues with the new experimental stash and rebase code[2].\n\n(It tests fine on my machine and I have no Windows machine at hand,\nso ...)\nThis finally gave me an opportunity to play around with gitgitgadget\nand its integrated CI for all major OS, see\nhttps://github.com/gitgitgadget/git/pull/38\nwhich is just the bug report put into our test suite.\n"}]}