From: Jonathan Nieder <jrnieder@gmail.com>
To: Thomas Braun <thomas.braun@virtuell-zuhause.de>
Cc: GIT Mailing-list <git@vger.kernel.org>,
Philip Oakley <philipoakley@iee.org>,
git-for-windows@googlegroups.com,
Johannes Schindelin <Johannes.Schindelin@gmx.de>
Subject: Re: 2.19.0.rc2.windows.1: stash fails with dirty submodule
Date: Fri, 7 Sep 2018 17:35:14 -0700 [thread overview]
Message-ID: <20180908003514.GC225427@aiede.svl.corp.google.com> (raw)
In-Reply-To: <6e01daf2-5fb7-b6c0-2833-aa696241c609@virtuell-zuhause.de>
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/
next prev parent reply other threads:[~2018-09-08 0:35 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-07 12:31 2.19.0.rc2.windows.1: stash fails with dirty submodule Thomas Braun
2018-09-08 0:35 ` Jonathan Nieder [this message]
2018-09-11 22:24 ` Stefan Beller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180908003514.GC225427@aiede.svl.corp.google.com \
--to=jrnieder@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git-for-windows@googlegroups.com \
--cc=git@vger.kernel.org \
--cc=philipoakley@iee.org \
--cc=thomas.braun@virtuell-zuhause.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).