Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Stash not showing new files #1459

Open
ZimGil opened this issue Jan 24, 2021 · 4 comments
Open

Stash not showing new files #1459

ZimGil opened this issue Jan 24, 2021 · 4 comments

Comments

@ZimGil
Copy link
Contributor

ZimGil commented Jan 24, 2021

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

@ylecuyer
Copy link
Contributor

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

@ZimGil
Copy link
Contributor Author

ZimGil commented Jan 25, 2021

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

@wmertens
Copy link
Contributor

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
Copy link
Contributor

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

3 participants