{"thread":{"id":"28762","subject":"git stash show doesn't show stashed untracked files","startedAt":"2011-10-25T13:21:36Z","lastAt":"2011-10-31T08:36:38Z","messageCount":2,"participants":["Kirill Likhodedov"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"178264","messageId":"5284251B-7265-493B-981D-DD10B80F85B1@jetbrains.com","threadId":"28762","inReplyTo":null,"subject":"git stash show doesn't show stashed untracked files","fromName":"Kirill Likhodedov","fromEmail":"kirill.likhodedov@jetbrains.com","sentAt":"2011-10-25T13:21:36Z","receivedAt":"2011-10-25T13:21:36Z","isPatch":false,"sender":{"key":"kirill.likhodedov@jetbrains.com","avatar":"https://gravatar.com/avatar/9fd55d2a110e8e96deb3ed7b503d7f3b9b5b1ed5ca9ef6683c15525b11b94e63?d=mp&s=160"},"body":"\nGit 1.7.7 introduced a very useful feature - stashing untracked files via \"-u\" option.\n\nHowever, there is a problems with it:\n'git stash show' doesn't show stashed untracked files.\n\n# git version\ngit version 1.7.7\n# touch untracked.txt\n# git stash save -u\n# git stash show         // no output\n\nIf changes in tracked files are stashed along with untracked files, then only tracked changes are shown in \"git stash show\" output.\n\nMoreover, if I have the same file in the working tree, I wouldn't be able to 'git stash pop':\n# git stash pop -v\nuntracked.txt already exists, no checkout\nCould not restore untracked files from stash\n\nIn this case the only way to access the stashed content is to remove the tracked file and pop the stash again.\n\n----------------------------------\nKirill Likhodedov\nJetBrains, Inc\nhttp://www.jetbrains.com\n\"Develop with pleasure!\"\n"},{"id":"178551","messageId":"503C659A-47BA-4DEA-8EA8-D2B46C2BBF59@gmail.com","threadId":"28762","inReplyTo":"5284251B-7265-493B-981D-DD10B80F85B1@jetbrains.com","subject":"Re: git stash show doesn't show stashed untracked files","fromName":"Kirill Likhodedov","fromEmail":"klikh.list@gmail.com","sentAt":"2011-10-31T08:36:38Z","receivedAt":"2011-10-31T08:36:38Z","isPatch":false,"sender":{"key":"klikh.list@gmail.com","avatar":null},"body":"\nResending: it seems that the message was lost in discussions.\n\n> \n> Git 1.7.7 introduced a very useful feature - stashing untracked files via \"-u\" option.\n> \n> However, there is a problems with it:\n> 'git stash show' doesn't show stashed untracked files.\n> \n> # git version\n> git version 1.7.7\n> # touch untracked.txt\n> # git stash save -u\n> # git stash show         // no output\n> \n> If changes in tracked files are stashed along with untracked files, then only tracked changes are shown in \"git stash show\" output.\n> \n> Moreover, if I have the same file in the working tree, I wouldn't be able to 'git stash pop':\n> # git stash pop -v\n> untracked.txt already exists, no checkout\n> Could not restore untracked files from stash\n> \n> In this case the only way to access the stashed content is to remove the tracked file and pop the stash again.\n> \n"}]}