All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>
Subject: [PATCH 0/2] stash: handle pathspec magic again
Date: Thu, 07 Mar 2019 07:29:32 -0800 (PST)	[thread overview]
Message-ID: <pull.159.git.gitgitgadget@gmail.com> (raw)

It was reported in https://github.com/git-for-windows/git/issues/2037 that 
git stash -- ':(glob)**/*.testextension is broken. The problem is not even
the stash operation itself, it happens when the git add part of dropping the
local changes is spawned: we simply passed the parsed pathspec instead of
the unparsed one.

While verifying the fix, I also realized that the escape hatch was seriously
broken by my "backport of the -q option": It introduced four bogus eval 
statements, which really need to be dropped.

Johannes Schindelin (2):
  legacy stash: fix "rudimentary backport of -q"
  built-in stash: handle :(glob) pathspecs again

 builtin/stash.c                    | 5 +++--
 git-legacy-stash.sh                | 8 ++++----
 t/t3905-stash-include-untracked.sh | 6 ++++++
 3 files changed, 13 insertions(+), 6 deletions(-)


base-commit: 7906af0cb84c8e65656347909abd4e22b04d1c1e
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-159%2Fdscho%2Fstash-with-globs-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-159/dscho/stash-with-globs-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/159
-- 
gitgitgadget

             reply	other threads:[~2019-03-07 15:29 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-03-07 15:29 Johannes Schindelin via GitGitGadget [this message]
2019-03-07 15:29 ` [PATCH 1/2] legacy stash: fix "rudimentary backport of -q" Johannes Schindelin via GitGitGadget
2019-03-11  7:27   ` Junio C Hamano
2019-03-07 15:29 ` [PATCH 2/2] built-in stash: handle :(glob) pathspecs again Johannes Schindelin via GitGitGadget
2019-03-11  7:28   ` Junio C Hamano
2019-03-11 16:27     ` Johannes Schindelin
2019-03-11 22:19       ` Thomas Gummerer
2019-03-08  1:37 ` [PATCH 0/2] stash: handle pathspec magic again Junio C Hamano
2019-03-08 16:12   ` Johannes Schindelin
2019-03-10  0:56     ` Junio C Hamano
2019-03-11 16:25       ` Johannes Schindelin
2019-03-18  4:39         ` Junio C Hamano
2019-03-18  7:02           ` Junio C Hamano

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=pull.159.git.gitgitgadget@gmail.com \
    --to=gitgitgadget@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.