From: "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: [PATCH 1/2] legacy stash: fix "rudimentary backport of -q"
Date: Thu, 07 Mar 2019 07:29:32 -0800 (PST) [thread overview]
Message-ID: <f76c7cb66c43a6c4bf712516949a867b09710103.1551972571.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.159.git.gitgitgadget@gmail.com>
From: Johannes Schindelin <johannes.schindelin@gmx.de>
When this developer backported support for `--quiet` to the scripted
version of `git stash` in 80590055ea (stash: optionally use the scripted
version again, 2018-12-20), it looked like a sane choice to use `eval`
to execute the command line passed in via the parameter list of
`maybe_quiet`.
However, that is not what we should have done, as that command-line was
already in the correct shape.
This can be seen very clearly when passing arguments with special
characters, like
git stash -- ':(glob)**/*.txt'
Since this is exactly what we want to test in the next commit (where we
fix this very incantation with the built-in stash), let's fix the legacy
scripted version of `git stash` first.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
git-legacy-stash.sh | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/git-legacy-stash.sh b/git-legacy-stash.sh
index 8a8c4a9270..f60e9b3e87 100755
--- a/git-legacy-stash.sh
+++ b/git-legacy-stash.sh
@@ -86,17 +86,17 @@ maybe_quiet () {
shift
if test -n "$GIT_QUIET"
then
- eval "$@" 2>/dev/null
+ "$@" 2>/dev/null
else
- eval "$@"
+ "$@"
fi
;;
*)
if test -n "$GIT_QUIET"
then
- eval "$@" >/dev/null 2>&1
+ "$@" >/dev/null 2>&1
else
- eval "$@"
+ "$@"
fi
;;
esac
--
gitgitgadget
next prev parent 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 [PATCH 0/2] stash: handle pathspec magic again Johannes Schindelin via GitGitGadget
2019-03-07 15:29 ` Johannes Schindelin via GitGitGadget [this message]
2019-03-11 7:27 ` [PATCH 1/2] legacy stash: fix "rudimentary backport of -q" 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
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=f76c7cb66c43a6c4bf712516949a867b09710103.1551972571.git.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johannes.schindelin@gmx.de \
/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).