git@vger.kernel.org mailing list mirror (one of many)
 help / Atom feed
From: Stefan Beller <sbeller@google.com>
To: Jonathan Nieder <jrnieder@gmail.com>
Cc: Thomas Braun <thomas.braun@virtuell-zuhause.de>,
	git <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: Tue, 11 Sep 2018 15:24:46 -0700
Message-ID: <CAGZ79kadU6Lb14pwJQv=bYrn5wJxO_0UeoSN5BO0t44HC3q6rg@mail.gmail.com> (raw)
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:
>
> 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.

      reply index

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-09-07 12:31 Thomas Braun
2018-09-08  0:35 ` Jonathan Nieder
2018-09-11 22:24   ` Stefan Beller [this message]

Reply instructions:

You may reply publically 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='CAGZ79kadU6Lb14pwJQv=bYrn5wJxO_0UeoSN5BO0t44HC3q6rg@mail.gmail.com' \
    --to=sbeller@google.com \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=git-for-windows@googlegroups.com \
    --cc=git@vger.kernel.org \
    --cc=jrnieder@gmail.com \
    --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

git@vger.kernel.org mailing list mirror (one of many)

Archives are clonable:
	git clone --mirror https://public-inbox.org/git
	git clone --mirror http://ou63pmih66umazou.onion/git
	git clone --mirror http://czquwvybam4bgbro.onion/git
	git clone --mirror http://hjrcffqmbrq6wope.onion/git

Newsgroups are available over NNTP:
	nntp://news.public-inbox.org/inbox.comp.version-control.git
	nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git
	nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git
	nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git
	nntp://news.gmane.org/gmane.comp.version-control.git

 note: .onion URLs require Tor: https://www.torproject.org/
       or Tor2web: https://www.tor2web.org/

AGPL code for this site: git clone https://public-inbox.org/ public-inbox