From: Thomas Gummerer <t.gummerer@gmail.com>
To: Igor Djordjevic <igor.d.djordjevic@gmail.com>
Cc: Reid Price <reid.price@gmail.com>, git@vger.kernel.org
Subject: Re: Apparent bug in 'git stash push <subdir>' loses untracked files
Date: Wed, 13 Dec 2017 23:14:14 +0000 [thread overview]
Message-ID: <20171213231414.GD24597@hank> (raw)
In-Reply-To: <0692d5b8-5fc7-c34c-0712-11a913267441@gmail.com>
On 12/13, Igor Djordjevic wrote:
> Hi Reid,
>
> On 13/12/2017 18:32, Reid Price wrote:
> >
> > When running 'git stash push <subdir>' 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 it`s worth, using `git stash save <subdir>` instead seems to
> (still) work as expected...
I think that depends on what you expect ;) 'git stash save <subdir>'
will create a stash of the whole working directory with the message
"<subdir>". So while it would indeed work for the presumably
simplified example Reid provided, it would not do what you'd expect if
there are any tracked and modified files outside of the <subdir>.
In that case 'git stash save <subdir>' would include the tracked files
outside of <subdir>, while what I assume Reid wanted is to keep them
in place, and only stash the files in <subdir>.
> but on the other hand, `git-stash`[1]
> manpage seems not to mention this usage ("save" with "pathspec")?
"stash save" with "pathspec" doesn't exist, and it will probably never
exist. We decided to introduce a new "push" verb for 'git stash'
because the command line for 'git stash save' takes a message as its
last argument, instead of taking the message with a -m flag like other
commands do. Introducing a pathspec argument for "git stash save"
would have either broken backward compatibility, or it would have had
some syntax that's very inconsistent with other git commands.
> Regards, Buga
>
> [1] https://git-scm.com/docs/git-stash
next prev parent reply other threads:[~2017-12-13 23:12 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-13 17:32 Apparent bug in 'git stash push <subdir>' loses untracked files Reid Price
2017-12-13 21:20 ` Igor Djordjevic
2017-12-13 23:14 ` Thomas Gummerer [this message]
2017-12-13 23:46 ` Igor Djordjevic
2017-12-13 23:05 ` Thomas Gummerer
2017-12-16 18:33 ` Junio C Hamano
2017-12-17 18:05 ` Thomas Gummerer
2017-12-18 18:24 ` Junio C Hamano
2018-01-05 20:03 ` Thomas Gummerer
2018-01-06 0:24 ` [PATCH v2] stash: don't delete untracked files that match pathspec Thomas Gummerer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171213231414.GD24597@hank \
--to=t.gummerer@gmail.com \
--cc=git@vger.kernel.org \
--cc=igor.d.djordjevic@gmail.com \
--cc=reid.price@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).