Paper bag fix diff invocation in 'git stash show'

In 89d750bf6fa025edeb31ad258cdd09a27a5c02fa I got a little too
aggressive with changing "git diff" to "git diff-tree".  This is
shown to the user, who expects to see a full diff on their console,
and will want to see the output of their custom diff drivers (if
any) as the whole point of this call site is to show the diff to
the end-user.

Noticed by Johannes Sixt <j.sixt@viscovery.net>.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

diff --git a/git-stash.sh b/git-stash.sh
index def3163ebbb4f88f800b7cf3c7b856f90b5ae73f..5bbda47b7b6e286e7e8e5d002d7ed461a831b579 100755 (executable)
--- a/git-stash.sh
+++ b/git-stash.sh
@@ -110,7 +110,7 @@ show_stash () {
 
        w_commit=$(git rev-parse --verify "$s") &&
        b_commit=$(git rev-parse --verify "$s^") &&
-       git diff-tree $flags $b_commit $w_commit
+       git diff $flags $b_commit $w_commit
 }
 
 apply_stash () {