mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Merge branch 'gh/maint-stash-show-error-message' into maint
* gh/maint-stash-show-error-message: Improve error messages from 'git stash show'
This commit is contained in:
commit
5d4bd79d80
|
@ -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
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue