From: Junio C Hamano <gitster@pobox.com>
To: Gustaf Hendeby <hendeby@isy.liu.se>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 1/1] Improve error messages from 'git stash show'
Date: Mon, 15 Mar 2010 16:17:50 -0700 [thread overview]
Message-ID: <7vbpepb2e9.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <1268691590-27100-1-git-send-email-hendeby@isy.liu.se> (Gustaf Hendeby's message of "Mon\, 15 Mar 2010 23\:19\:50 +0100")
Gustaf Hendeby <hendeby@isy.liu.se> writes:
> The previous error message "fatal: Needed a single revision" is not
> very informative.
>
> Signed-off-by: Gustaf Hendeby <hendeby@isy.liu.se>
> ---
> git-stash.sh | 8 ++++++--
> 1 files changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/git-stash.sh b/git-stash.sh
> index aa47e54..cf221c6 100755
> --- a/git-stash.sh
> +++ b/git-stash.sh
> @@ -210,14 +210,18 @@ list_stash () {
> }
>
> show_stash () {
> + have_stash || die 'No stash found'
> +
> flags=$(git rev-parse --no-revs --flags "$@")
> if test -z "$flags"
> then
> flags=--stat
> fi
>
> - w_commit=$(git rev-parse --verify --default $ref_stash "$@") &&
> - b_commit=$(git rev-parse --verify "$w_commit^") &&
> + w_commit=$(git rev-parse --quiet --verify --default $ref_stash "$@") &&
> + b_commit=$(git rev-parse --quiet --verify "$w_commit^") ||
> + die 'Stash not found'
> +
Because you checked have_stash upfront, an error detected here cannot be
"stash not found". It is something else, isn't it?
> git diff $flags $b_commit $w_commit
> }
>
> --
> 1.7.0.2.274.gc376e.dirty
next prev parent reply other threads:[~2010-03-15 23:18 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-15 22:19 [PATCH 1/1] Improve error messages from 'git stash show' Gustaf Hendeby
2010-03-15 23:17 ` Junio C Hamano [this message]
2010-03-16 8:04 ` Gustaf Hendeby
2010-03-16 16:53 ` Junio C Hamano
2010-03-16 17:52 ` [PATCH v2] " Gustaf Hendeby
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=7vbpepb2e9.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=hendeby@isy.liu.se \
/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).