{"thread":{"id":"51787","subject":"Re: [BUG} stash show does not show untracked files stashed (reposted)","startedAt":"2019-09-02T13:01:33Z","lastAt":"2019-09-02T18:15:39Z","messageCount":3,"participants":["Giuseppe Crinò","Philip Oakley","randall.s.becker@rogers.com"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"381646","messageId":"20190902130128.GA2843@instance-1.europe-west6-a.c.vaulted-journal-250706.internal","threadId":"51787","inReplyTo":null,"subject":"Re: [BUG} stash show does not show untracked files stashed (reposted)","fromName":"Giuseppe Crinò","fromEmail":"giuscri@gmail.com","sentAt":"2019-09-02T13:01:28Z","receivedAt":"2019-09-02T13:01:33Z","isPatch":false,"sender":{"key":"giuscri@gmail.com","avatar":"https://gravatar.com/avatar/0d6b46f6496321ee3646c8712de0b475e225f393a8c72d2c2385d7820b74dd90?d=mp&s=160"},"body":"> Suppose I have files a,b,c,d modified, but only file d is in the index.\n> After stash push  (or save) --include-untracked, stash show only displays\n> file d. A subsequent pop will restore files a,b,c,d. So functionally push\n> and pop are fine, but stash show appears to ignores files in the stash.\n\nThis is more of an enhancement, isn't it?\n\nTo reproduce\n\n$ touch a b c d\n$ git add d\n$ git stash push --include-untracked\n$ git stash show\n d | 0\n 1 file changed, 0 insertions(+), 0 deletions(-)\n\nWhat is the output that you think should be printed?\n\n-Giuseppe\n"},{"id":"381656","messageId":"966960ff-a8bb-42bb-0b0a-13cd00852068@iee.email","threadId":"51787","inReplyTo":"20190902130128.GA2843@instance-1.europe-west6-a.c.vaulted-journal-250706.internal","subject":"Re: [BUG} stash show does not show untracked files stashed (reposted)","fromName":"Philip Oakley","fromEmail":"philipoakley@iee.email","sentAt":"2019-09-02T15:56:11Z","receivedAt":"2019-09-02T15:56:12Z","isPatch":false,"sender":{"key":"philipoakley@iee.email","avatar":"https://avatars.githubusercontent.com/u/914343?v=4"},"body":"On 02/09/2019 14:01, Giuseppe Crinò wrote:\n>> Suppose I have files a,b,c,d modified, but only file d is in the index.\n>> After stash push  (or save) --include-untracked, stash show only displays\n>> file d. A subsequent pop will restore files a,b,c,d. So functionally push\n>> and pop are fine, but stash show appears to ignores files in the stash.\n> This is more of an enhancement, isn't it?\n>\n> To reproduce\n>\n> $ touch a b c d\n> $ git add d\n> $ git stash push --include-untracked\n> $ git stash show\n>   d | 0\n>   1 file changed, 0 insertions(+), 0 deletions(-)\n>\n> What is the output that you think should be printed?\n>\n\nI'd guess\n\n  1 file changed, 0 insertions(+), 0 deletions(-), *3 files untracked*\n\nas they are what's meant to be in the stash... (obviously format to taste)\nPhilip\n\n"},{"id":"381669","messageId":"006301d561ba$69ca61e0$3d5f25a0$@rogers.com","threadId":"51787","inReplyTo":"966960ff-a8bb-42bb-0b0a-13cd00852068@iee.email","subject":"RE: [BUG} stash show does not show untracked files stashed (reposted)","fromName":"","fromEmail":"randall.s.becker@rogers.com","sentAt":"2019-09-02T18:15:33Z","receivedAt":"2019-09-02T18:15:39Z","isPatch":false,"sender":{"key":"randall.s.becker@rogers.com","avatar":null},"body":"> -----Original Message-----\n> From: Philip Oakley <philipoakley@iee.email>\n> Sent: September 2, 2019 11:56 AM\n> To: 002901d55e8f$e4a4af70$adee0e50$@rogers.com;\n> randall.s.becker@rogers.com\n> Cc: git@vger.kernel.org\n> Subject: Re: [BUG} stash show does not show untracked files stashed\n> (reposted)\n> \n> On 02/09/2019 14:01, Giuseppe Crinò wrote:\n> >> Suppose I have files a,b,c,d modified, but only file d is in the index.\n> >> After stash push  (or save) --include-untracked, stash show only\n> >> displays file d. A subsequent pop will restore files a,b,c,d. So\n> >> functionally push and pop are fine, but stash show appears to ignores files\n> in the stash.\n> > This is more of an enhancement, isn't it?\n> >\n> > To reproduce\n> >\n> > $ touch a b c d\n> > $ git add d\n> > $ git stash push --include-untracked\n> > $ git stash show\n> >   d | 0\n> >   1 file changed, 0 insertions(+), 0 deletions(-)\n> >\n> > What is the output that you think should be printed?\n> >\n> \n> I'd guess\n> \n>   1 file changed, 0 insertions(+), 0 deletions(-), *3 files untracked*\n> \n> as they are what's meant to be in the stash... (obviously format to taste)\n\nMore like this, from git stash show -p, to be consistent with git show -p 4ef9fc3 (the ref for the untracked files), showing 0000000 indicating that the file is not tracked.\n\ndiff --git a/d b/d\nindex e3e2f1d..f246285 100644\n--- a/a\n+++ b/a\n@@ -2,3 +2,4 @@ This is file 1\n Yet another line\n New line\n New line 2\n+ another line\ndiff --git a/a b/a\nnew file mode 100644\nindex 0000000..64d8b7a\n--- /dev/null\n+++ b/a\n@@ -0,0 +1 @@\n+line in a\ndiff --git a/b b/b\nnew file mode 100644\nindex 0000000..9aeb214\n--- /dev/null\n+++ b/b\n@@ -0,0 +1 @@\n+line in b\ndiff --git a/c b/c\nnew file mode 100644\nindex 0000000..87bb92b\n--- /dev/null\n+++ b/c\n@@ -0,0 +1 @@\n+line in c\n\n\n"}]}