From: Junio C Hamano <gitster@pobox.com>
To: David Aguilar <davvid@gmail.com>
Cc: git@vger.kernel.org, "Johannes Sixt" <j6t@kdbg.org>,
"Christian Couder" <chriscool@tuxfamily.org>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Jon Seymour" <jon.seymour@gmail.com>
Subject: Re: [PATCH v2] stash: prefer --quiet over shell redirection
Date: Fri, 12 Sep 2014 12:05:48 -0700 [thread overview]
Message-ID: <xmqqoaukacc3.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1409470973-67707-1-git-send-email-davvid@gmail.com> (David Aguilar's message of "Sun, 31 Aug 2014 00:42:53 -0700")
David Aguilar <davvid@gmail.com> writes:
> Use `git rev-parse --verify --quiet` instead of redirecting
> stderr to /dev/null.
>
> Signed-off-by: David Aguilar <davvid@gmail.com>
> ---
Has this patch ever been tested? t3903 seems to break with this at
least for me.
> git-stash.sh | 13 +++++++------
> 1 file changed, 7 insertions(+), 6 deletions(-)
>
> diff --git a/git-stash.sh b/git-stash.sh
> index bcc757b..2ff8b94 100755
> --- a/git-stash.sh
> +++ b/git-stash.sh
> @@ -50,7 +50,7 @@ clear_stash () {
> then
> die "$(gettext "git stash clear with parameters is unimplemented")"
> fi
> - if current=$(git rev-parse --verify $ref_stash 2>/dev/null)
> + if current=$(git rev-parse --verify --quiet $ref_stash)
> then
> git update-ref -d $ref_stash $current
> fi
> @@ -292,7 +292,7 @@ save_stash () {
> }
>
> have_stash () {
> - git rev-parse --verify $ref_stash >/dev/null 2>&1
> + git rev-parse --verify --quiet $ref_stash >/dev/null
> }
>
> list_stash () {
> @@ -392,12 +392,12 @@ parse_flags_and_rev()
> ;;
> esac
>
> - REV=$(git rev-parse --quiet --symbolic --verify "$1" 2>/dev/null) || {
> + REV=$(git rev-parse --symbolic --verify --quiet "$1") || {
> reference="$1"
> die "$(eval_gettext "\$reference is not valid reference")"
> }
>
> - i_commit=$(git rev-parse --quiet --verify "$REV^2" 2>/dev/null) &&
> + i_commit=$(git rev-parse --verify --quiet "$REV^2") &&
> set -- $(git rev-parse "$REV" "$REV^1" "$REV:" "$REV^1:" "$REV^2:" 2>/dev/null) &&
> s=$1 &&
> w_commit=$1 &&
> @@ -409,7 +409,7 @@ parse_flags_and_rev()
> test "$ref_stash" = "$(git rev-parse --symbolic-full-name "${REV%@*}")" &&
> IS_STASH_REF=t
>
> - u_commit=$(git rev-parse --quiet --verify "$REV^3" 2>/dev/null) &&
> + u_commit=$(git rev-parse --verify --quiet "$REV^3") &&
> u_tree=$(git rev-parse "$REV^3:" 2>/dev/null)
> }
>
> @@ -531,7 +531,8 @@ drop_stash () {
> die "$(eval_gettext "\${REV}: Could not drop stash entry")"
>
> # clear_stash if we just dropped the last stash entry
> - git rev-parse --verify "$ref_stash@{0}" >/dev/null 2>&1 || clear_stash
> + git rev-parse --verify --quiet "$ref_stash@{0}" >/dev/null ||
> + clear_stash
> }
>
> apply_to_branch () {
next prev parent reply other threads:[~2014-09-12 19:06 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-31 7:42 [PATCH v2] stash: prefer --quiet over shell redirection David Aguilar
2014-09-12 19:05 ` Junio C Hamano [this message]
2014-09-13 21:57 ` David Aguilar
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=xmqqoaukacc3.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox.com \
--cc=avarab@gmail.com \
--cc=chriscool@tuxfamily.org \
--cc=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=j6t@kdbg.org \
--cc=jon.seymour@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).