ungit icon indicating copy to clipboard operation
ungit copied to clipboard

Stash not showing new files

Open ZimGil opened this issue 4 years ago • 4 comments

When stashing a change with new files in it, that stash area will not show these new files but will actually apply them when putting them back into staging...

foo

ZimGil avatar Jan 24 '21 17:01 ZimGil

I had a quick look and it looks more related to how git works than ungit.

When you stash with --include-untracked (which is used in ungit) and then use git stash list --numstat the file doesn't appear (I tried various flags to get it but with no success)

This looks more like a bug in git you may try to report there instead, then we will be able to add the right flag to show them inside ungit

ylecuyer avatar Jan 25 '21 10:01 ylecuyer

Sent a bug report to the mailing list with reference to this issue

ZimGil avatar Jan 25 '21 12:01 ZimGil

I'll fix this in #1315, but first I need to figure out how to show diffs for the same file across many parents.

Stashes can have 3 parents since they can contain staged, worktree and untracked files. I'm thinking that the diff should just show each section diff separately?

wmertens avatar Feb 24 '21 18:02 wmertens

Ok, fixed in #1315. If you want to try it, you need to clone the PR. It'll be a while still before it's fully stable.

image

wmertens avatar Feb 28 '21 07:02 wmertens