Web lists-archives.com

Re: git add --intent-to-add + git stash "Cannot save the current worktree state"




Hi Anthony,

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?

Ciao,
Johannes

P.S.: Obviously, if this PR fixes the issue, the corresponding change
should be squashed into the appropriate commit in ps/stash-in-c.