Re: git stash --include-untracked possible destructive behavior

2017-06-09 Thread Marc Strapetz
On 09.06.2017 00:39, Joel Teichroeb wrote: Looks like that series was merged last week, fixing this issue. Marc, the fix will probably be in git 2.14. Thanks, I can confirm that with current master "git clean" as well as "git stash" are working properly now (tested on Linux). I'm looking

Re: Re: git stash --include-untracked possible destructive behavior

2017-06-08 Thread Joel Teichroeb
Looks like that series was merged last week, fixing this issue. Marc, the fix will probably be in git 2.14. Joel

Re: git stash --include-untracked possible destructive behavior

2017-06-08 Thread Brandon Williams
On 06/08, Joel Teichroeb wrote: > It looks like it's an issue with git clean, as that's what stash > uses internally. You can try your same test, but replace git stash > with "git clean -df" and it will delete Data. Maybe clean should > check if there are any ignored files in an untracked

Re: git stash --include-untracked possible destructive behavior

2017-06-08 Thread Joel Teichroeb
It looks like it's an issue with git clean, as that's what stash uses internally. You can try your same test, but replace git stash with "git clean -df" and it will delete Data. Maybe clean should check if there are any ignored files in an untracked directory and only remove it if -x is

git stash --include-untracked possible destructive behavior

2017-06-08 Thread Marc Strapetz
One of our users has just discovered a destructive behavior of git stash --include-untracked: ignored files within non-ignored directories will not be stashed as untracked files (expected), but will still be removed from the working tree. The problem is reproducible by following command