From: Jeff King <peff@peff.net>
To: Thomas Gummerer <t.gummerer@gmail.com>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH v2 2/3] stash: pass the pathspec argument to git reset
Date: Tue, 21 Mar 2017 18:19:59 -0400 [thread overview]
Message-ID: <20170321221959.dtkz2i33jyojwzca@sigill.intra.peff.net> (raw)
In-Reply-To: <20170321221219.28041-3-t.gummerer@gmail.com>
On Tue, Mar 21, 2017 at 10:12:18PM +0000, Thomas Gummerer wrote:
> For "git stash -p --no-keep-index", the pathspec argument is currently
> not passed to "git reset". This means that changes that are staged but
> that are excluded from the pathspec still get unstaged by git stash -p.
>
> Make sure that doesn't happen by passing the pathspec argument to the
> git reset in question, bringing the behaviour in line with "git stash --
> <pathspec>".
>
> Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com>
> ---
> git-stash.sh | 2 +-
> t/t3904-stash-patch.sh | 8 ++++++++
> 2 files changed, 9 insertions(+), 1 deletion(-)
This one looks good to me.
-Peff
next prev parent reply other threads:[~2017-03-21 22:20 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-17 14:50 [BUG] "git stash -- path" reports wrong unstaged changes Jeff King
2017-03-18 18:36 ` Thomas Gummerer
2017-03-19 20:23 ` Thomas Gummerer
2017-03-19 20:23 ` [PATCH/RFC 1/3] stash: show less information for stash push -- <pathspec> Thomas Gummerer
2017-03-20 17:51 ` Junio C Hamano
2017-03-20 18:48 ` Jeff King
2017-03-20 19:42 ` Junio C Hamano
2017-03-21 20:48 ` Thomas Gummerer
2017-03-20 18:42 ` Jeff King
2017-03-19 20:23 ` [PATCH/RFC 2/3] stash: make push -p -q --no-keep-index quiet Thomas Gummerer
2017-03-20 18:55 ` Jeff King
2017-03-19 20:23 ` [PATCH/RFC 3/3] stash: pass the pathspec argument to git reset Thomas Gummerer
2017-03-20 19:08 ` Jeff King
2017-03-21 21:14 ` Thomas Gummerer
2017-03-21 22:12 ` Jeff King
2017-03-21 22:12 ` [PATCH v2 0/3] Re: [BUG] "git stash -- path" reports wrong unstaged changes Thomas Gummerer
2017-03-21 22:12 ` [PATCH v2 1/3] stash: don't show internal implementation details Thomas Gummerer
2017-03-21 22:14 ` Jeff King
2017-03-22 21:33 ` Thomas Gummerer
2017-03-22 21:41 ` Jeff King
2017-03-21 22:12 ` [PATCH v2 2/3] stash: pass the pathspec argument to git reset Thomas Gummerer
2017-03-21 22:19 ` Jeff King [this message]
2017-03-21 22:12 ` [PATCH v2 3/3] stash: keep untracked files intact in stash -k Thomas Gummerer
2017-03-21 22:38 ` Jeff King
2017-03-22 21:46 ` Thomas Gummerer
2017-03-20 18:41 ` [BUG] "git stash -- path" reports wrong unstaged changes Jeff King
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170321221959.dtkz2i33jyojwzca@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=t.gummerer@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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).