[bug] git stash push {dir-pathspec} wipes untracked files

Hi, I ran into what I believe is a bug today. I’m using primarily Git for Windows 2.16.2 and also reproduced the behavior on Git for Windows 2.15.1 and Git 2.14.1 on Ubuntu:

Given any repository with at least one subdirectory:

1.       Create some untracked files in the subdir
2.       Modify a tracked file in the subdir
3.       Execute `git stash push subdir`
4.       The untracked files will be removed, without warning.

`git stash push` behaves as-expcted and does not touch untracked files. It’s only when a directory tree is specified as [pathspec] that the problem occurs.

Here's the precise reproduction case executed on a linux box:

jake@jake-VirtualBox:~/woot$ git --version
git version 2.14.1
jake@jake-VirtualBox:~/woot$ git config --global user.email jake.stine@gmail.com
jake@jake-VirtualBox:~/woot$ git config --global user.name "Jake Stine"
jake@jake-VirtualBox:~$ git init woot
Initialized empty Git repository in /home/jake/woot/.git/
jake@jake-VirtualBox:~$ cd woot
jake@jake-VirtualBox:~/woot$ mkdir subdir
jake@jake-VirtualBox:~/woot$ echo "test" > meh.txt
jake@jake-VirtualBox:~/woot$ echo "test" > subdir/meh2.txt
jake@jake-VirtualBox:~/woot$ git add meh.txt subdir/meh2.txt
jake@jake-VirtualBox:~/woot$ git commit --message="stash bug testing"
jake@jake-VirtualBox:~/woot$ git commit --message="stash bug testing"
[master (root-commit) 2c05580] stash bug testing
 2 files changed, 2 insertions(+)
 create mode 100644 meh.txt
 create mode 100644 subdir/meh2.txt
jake@jake-VirtualBox:~/woot$ echo "test" > subdir/untracked.txt
jake@jake-VirtualBox:~/woot$ echo "append" >> subdir/meh2.txt
jake@jake-VirtualBox:~/woot$ git stash push subdir
Saved working directory and index state WIP on master: 2c05580 stash bug testing
jake@jake-VirtualBox:~/woot$ ls subdir
meh2.txt

The expected result is that when I do `ls subdir` the file "untracked.txt" still exists. Alternatively, git stash should warn me before destroying my untracked files, and require I specify --force or similar to invoke destructive behavior.

Thanks! Jake Stine

Jake Stine <jake.stine@gmail.com> writes:

I wonder if this is the same as the topic on this thread.

  https://public-inbox.org/git/CA+HNv10i7AvWXjrQjxxy1LNJTmhr7LE4TwxhHUYBiWtmJCOf_A@mail.gmail.com/

What is curious is that the fix bba067d2 ("stash: don't delete untracked files that match pathspec", 2018-01-06) appeared first in 2.16.2, on which Windows 2.16.2 is supposed to be built upon.

This does not reproduce for me with v2.16.2-17-g38e79b1fda (the tip of 'maint'); I do not have an install of vanilla v2.16.2 handy, but I suspect v2.16.2 would work just fine, too.

This does not reproduce for me either in v2.16.2.9-g3dbadef9f (which is the NonStop port of 2.16.2)

On branch master
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

        modified:   subdir/a

Untracked files:
  (use "git add <file>..." to include in what will be committed)

        subdir/b

no changes added to commit (use "git add" and/or "git commit -a")
/home/randall/foot: git stash push subdir
Saved working directory and index state WIP on master: b772270 i
/home/randall/foot: ls subdir
a  b
/home/randall/foot: git status
On branch master
Untracked files:
  (use "git add <file>..." to include in what will be committed)

        subdir/b

nothing added to commit but untracked files present (use "git add" to track)

On 15/03/2018 17:52, Junio C Hamano wrote:

I can't seem to reproduce this on 2.16.2.windows.1, either:

+ git --version
git version 2.16.2.windows.1
+ git init woot
Initialized empty Git repository in /woot/.git/
+ cd woot
+ mkdir subdir
+ echo test
+ echo test
+ git add meh.txt subdir/meh2.txt
+ git commit '--message=stash bug testing'
[master (root-commit) afec47d] stash bug testing
 2 files changed, 2 insertions(+)
 create mode 100644 meh.txt
 create mode 100644 subdir/meh2.txt
+ git commit '--message=stash bug testing'
On branch master
nothing to commit, working tree clean
+ echo test
+ echo append
+ git stash push subdir
Saved working directory and index state WIP on master: afec47d stash bug testing
+ ls subdir
meh2.txt  untracked.txt

Regards, Buga