In git, is there a way to show untracked stashed files without applying the stash?

by

Untracked files are stored in the third parent of a stash commit. (This isn’t actually documented, but is pretty obvious from The commit which introduced the -u feature, 787513…, and the way the rest of the documentation for git-stash phrases things… or just by doing git log --graph 'stash@{0}')

You can view just the “untracked” portion of the stash via:

git show 'stash@{0}^3'

or, just the “untracked” tree itself, via:

git show 'stash@{0}^3:'

or, a particular “untracked” file in the tree, via:

git show 'stash@{0}^3:<path/to/file>'

There is, unfortunately, no good way to get a summary of the differences between all staged+unstaged+untracked vs “current” state. ie: git show 'stash@{0}' cannot be made to include the untracked files. This is because the tree object of the stash commit itself, referred to as stash@{0}:, does not include any changes from the third, “unstaged” parent.

This is due to the way stashes are re-applied: tracked files can be easily applied as patches, whereas untracked files can only be applied, in theory, as “whole files”.

More Related Contents:

  1. Move existing, uncommitted work to a new branch in Git
  2. Stash only one file out of multiple files that have changed with Git?
  3. See what’s in a stash without applying it [duplicate]
  4. How to recover a dropped stash in Git?
  5. How can I git stash a specific file?
  6. How to name and retrieve a stash by name in git?
  7. How do you stash an untracked file?
  8. Can “git pull” automatically stash and pop pending changes?
  9. How to recover from “git stash save –all”?
  10. How do I properly git stash/pop in pre-commit hooks to get a clean working tree for tests?
  11. How do I ignore an error on ‘git pull’ about my local changes would be overwritten by merge?
  12. Is it possible to push a git stash to a remote repository?
  13. git stash and apply
  14. How do I stash only one file out of multiple files that have changed?
  15. How do I recover a dropped stash in Git?
  16. Is it possible to get commit logs/messages of a remote git repo without git clone
  17. How would I extract a single file (or changes to a file) from a git stash?
  18. Difference between git stash pop and git stash apply
  19. How to recover stashed uncommitted changes
  20. How do I name and retrieve a Git stash by name?
  21. Git: Create a branch from unstaged/uncommitted changes on master
  22. Git diff against a stash
  23. How to reverse apply a stash?
  24. Stash changes to specific files
  25. Is there a way with to prevent “git stash pop” from marking files as modified?
  26. Why does git stash pop say that it could not restore untracked files from stash entry?
  27. How do I preview stash contents in Git?
  28. How can I rename a git stash?
  29. What’s the difference between git stash save and git stash push?
  30. automatically stash save/pop changes on git rebase?

Leave a Comment