On Thu, Jan 10, 2019 at 7:21 AM Johannes Schindelin <Johannes.Schindelin@xxxxxx> wrote: > > Hi Anthony, > > On Wed, 9 Jan 2019, Anthony Sottile wrote: > > > On Wed, Jan 9, 2019 at 10:25 AM Johannes Schindelin > > <Johannes.Schindelin@xxxxxx> wrote: > > > > > > On Thu, 3 Jan 2019, Anthony Sottile wrote: > > > > > > > Minimal reproduction > > > > > > > > ``` > > > > git init t > > > > git -C t commit --allow-empty -m 'initial commit' > > > > touch t/a > > > > git -C t add --intent-to-add a > > > > git -C t stash > > > > ``` > > > > > > > > ``` > > > > + git init t > > > > Initialized empty Git repository in /private/tmp/t/t/.git/ > > > > + git -C t commit --allow-empty -m 'initial commit' > > > > [master (root-commit) 858132e] initial commit > > > > + touch t/a > > > > + git -C t add --intent-to-add a > > > > + git -C t stash > > > > error: Entry 'a' not uptodate. Cannot merge. > > > > Cannot save the current worktree state > > > > ``` > > > > > > Apparently it is even worse. On Windows, this reportedly resulted in a > > > segmentation fault: > > > > > > https://github.com/git-for-windows/git/issues/2006 > > > > > > Could you cherry-pick the fix of > > > https://github.com/git-for-windows/git/pull/2008 and see whether it fixes > > > your use case, too? > > > > > > P.S.: Obviously, if this PR fixes the issue, the corresponding change > > > should be squashed into the appropriate commit in ps/stash-in-c. > > > > I don't see a `stash.c` in ecbdaf0899161c067986e9d9d564586d4b045d62 -- > > the patch doesn't appear to apply > > > > `stash` appears to be implemented as `git-stash.sh` > > Whoops. I thought that you were on a different Git version, one that > already has the built-in stash. My mistake. > > Sorry, > Johannes Oh, is there a more recent version than the one mirrored at https://github.com/git/git Anthony
