Stashing with 'include untracked' works incorrectly for new non-staged files

[shabbir-genetech]

Steps to re-produce

1. Create a new file in a repo. Don't stage it.
2. Stash with 'include untracked'.
3. Apply the stash that was just created.

What happens
The new file shows up as staged.

What should happen
The new file should show up as not staged.

[love-linger]

Yes. The implementation references the design from another well-known Git client - Fork.

[shabbir-genetech]

@love-linger Are you saying that the current behavior is expected and correct?

[love-linger]

I can't say that the current implementation is correct, but it is indeed expected. In order to keep up with Fork, SourceGit even has an add(stage) operation for untracked files before stash

[shabbir-genetech]

Ok. So, is the way to get this resolved to report the issue to Fork?

[love-linger]

I think you did not understand what I mean. Fork is another well-known GIT GUI client. I used it before and liked some of its design. So SourceGit refers to its design ideas in many places.

[shabbir-genetech]

Okay. So the current behavior is by design and is not to be changed, right?

[love-linger]

I'm not sure. Let me think about whether it is necessary to refer to the design of Fork at this point

[love-linger]

After some test, I think I know why Fork add untracked file first before stash it. If an untracked file was stashed without stage, we can not use git diff stash@{N} -- /path/to/file or git diff <stash_hash>^ <stash_hash> to get the diff outputs.

[shabbir-genetech]

Hm, there's probably some way around it. SmartGit does it the 'right way'. I don't know how, of course.

[love-linger]

If your git version is older that 2.32.0, -u|--include-untracked parameter is not supported. It means you can not see the untracked files by git stash show stash@{N} command

[shabbir-genetech]

Perhaps this can be supported just for the higher git versions?

[love-linger]

Done. The new implementation does not use git stash show command to query changes in stash, but uses existing Commands.CompareRevisions (which use git diff command instead) to do this job.

You can download the latest CI build from Github Action.