Re: Apparent bug in 'git stash push ' loses untracked files

2018-01-05 Thread Thomas Gummerer
On 12/18, Junio C Hamano wrote: > Thomas Gummerer writes: > > > Ah interesting, what you have below looks good to me indeed, it > > matches what I'd expect it to do and fixes the bug that was reported. > > Thanks! > > > > I've taken the liberty to take what you have below

Re: Apparent bug in 'git stash push ' loses untracked files

2017-12-18 Thread Junio C Hamano
Thomas Gummerer writes: > Ah interesting, what you have below looks good to me indeed, it > matches what I'd expect it to do and fixes the bug that was reported. > Thanks! > > I've taken the liberty to take what you have below and turned into a > proper patch, giving you

Re: Apparent bug in 'git stash push ' loses untracked files

2017-12-17 Thread Thomas Gummerer
On 12/16, Junio C Hamano wrote: > Thomas Gummerer writes: > > > Maybe the best solution would be to introduce 'git reset --hard -- > > ', or maybe someone who knows shell programming a little > > better than me has an idea? > > > > diff --git a/git-stash.sh b/git-stash.sh

Re: Apparent bug in 'git stash push ' loses untracked files

2017-12-16 Thread Junio C Hamano
Thomas Gummerer writes: > Maybe the best solution would be to introduce 'git reset --hard -- > ', or maybe someone who knows shell programming a little > better than me has an idea? > > diff --git a/git-stash.sh b/git-stash.sh > index 1114005ce2..01bf74015e 100755 > ---

Re: Apparent bug in 'git stash push ' loses untracked files

2017-12-13 Thread Igor Djordjevic
Hi Thomas, On 14/12/2017 00:14, Thomas Gummerer wrote: > > > For what it`s worth, using `git stash save ` instead seems > > to (still) work as expected... > > I think that depends on what you expect ;) 'git stash save ' > will create a stash of the whole working directory with the message >

Re: Apparent bug in 'git stash push ' loses untracked files

2017-12-13 Thread Thomas Gummerer
On 12/13, Igor Djordjevic wrote: > Hi Reid, > > On 13/12/2017 18:32, Reid Price wrote: > > > > When running 'git stash push ' if there are both tracked and > > untracked files in this subdirectory, the tracked files are stashed > > but the untracked files are discarded. > > I can reproduce this

Re: Apparent bug in 'git stash push ' loses untracked files

2017-12-13 Thread Thomas Gummerer
Hi, On 12/13, Reid Price wrote: > When running 'git stash push ' if there are both tracked and > untracked files in this subdirectory, the tracked files are stashed > but the untracked files are discarded. > > I can reproduce this on my system (OSX, git 2.14.1) by running the > below script as >

Re: Apparent bug in 'git stash push ' loses untracked files

2017-12-13 Thread Igor Djordjevic
Hi Reid, On 13/12/2017 18:32, Reid Price wrote: > > When running 'git stash push ' if there are both tracked and > untracked files in this subdirectory, the tracked files are stashed > but the untracked files are discarded. I can reproduce this as well (git version 2.15.1.windows.2). For what

Apparent bug in 'git stash push ' loses untracked files

2017-12-13 Thread Reid Price
When running 'git stash push ' if there are both tracked and untracked files in this subdirectory, the tracked files are stashed but the untracked files are discarded. I can reproduce this on my system (OSX, git 2.14.1) by running the below script as bash -x ./stashbug.sh &> output.txt I