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

From: Junio C Hamano <gitster@pobox.com>
Date: Mar 15, 2018, 16:52 UTC
Message-ID: <xmqq1sgl703v.fsf@gitster-ct.c.googlers.com>
In-Reply-To: <CABWk7R9xNDHJbbsMZbOyhcYXq-bD6Krvbw_mKDBJFALALS3AHA@mail.gmail.com>

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

Show 14 quoted lines

> 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.

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.

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

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.

Show 11 quoted lines

> jake@jake-VirtualBox:~/woot$ git --version
> git version 2.14.1
> ...
> 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