Skip to content

Commit

Permalink
Improve error messages from 'git stash show'
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Gustaf Hendeby authored and Junio C Hamano committed Mar 17, 2010
1 parent 8fcaca3 commit 14cd458
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions git-stash.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down

0 comments on commit 14cd458

Please sign in to comment.