Skip to content

Commit

Permalink
detached-stash: simplify git stash show
Browse files Browse the repository at this point in the history
This commit refactors git stash show to make use of the assert_stash_like function.

git show now dies if the presented argument is non-stash-like.

Previous behaviour was to tolerate commits that were not even stash-like.

Previously, git stash show would accept stash-like arguments, but
only if there was a stash on the stack.

Now, git stash accepts stash-like arguments always and only fails
if no stash-like argument is specified and there is no stash stack.

Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Jon Seymour authored and Junio C Hamano committed Aug 22, 2010
1 parent fb433dc commit a9bf09e
Showing 1 changed file with 2 additions and 12 deletions.
14 changes: 2 additions & 12 deletions git-stash.sh
Original file line number Diff line number Diff line change
Expand Up @@ -210,19 +210,9 @@ 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 --quiet --verify --default $ref_stash "$@") &&
b_commit=$(git rev-parse --quiet --verify "$w_commit^") ||
die "'$*' is not a stash"
assert_stash_like "$@"

git diff $flags $b_commit $w_commit
git diff ${FLAGS:---stat} $b_commit $w_commit
}

#
Expand Down

0 comments on commit a9bf09e

Please sign in to comment.