diff options
| author |  Gustaf Hendeby <hendeby@isy.liu.se> | 2010-03-16 18:52:37 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-03-16 19:23:24 -0700 |
| commit | 14cd458126c7c70f8cf180861e3db5ed3b788813 (patch) | |
| tree | 50318726039a6f09ba061c0fef51f607930ae48c | |
| parent | don't use default revision if a rev was specified (diff) | |
| download | tgif-14cd458126c7c70f8cf180861e3db5ed3b788813.tar.xz | |
Improve error messages from 'git stash show'
The previous error message "fatal: Needed a single revision" is not
very informative.
Signed-off-by: Gustaf Hendeby <hendeby@isy.liu.se>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | git-stash.sh | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/git-stash.sh b/git-stash.sh index aa47e541ee..59db3dc38e 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 "'$*' is not a stash" + git diff $flags $b_commit $w_commit } |