summaryrefslogtreecommitdiff
path: root/git-stash.sh
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2007-10-19 06:18:14 (GMT)
committerShawn O. Pearce <spearce@spearce.org>2007-10-19 06:18:14 (GMT)
commite7187e4e0fece6c2947fbceff251f3ce69ae0aa8 (patch)
treeaed85d12e8040259a3fc9561ec788b488ddeca9c /git-stash.sh
parentbbaf63f2f18242484868d6c03d5df9bd071d6deb (diff)
downloadgit-e7187e4e0fece6c2947fbceff251f3ce69ae0aa8.zip
git-e7187e4e0fece6c2947fbceff251f3ce69ae0aa8.tar.gz
git-e7187e4e0fece6c2947fbceff251f3ce69ae0aa8.tar.bz2
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>
Diffstat (limited to 'git-stash.sh')
-rwxr-xr-xgit-stash.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-stash.sh b/git-stash.sh
index def3163..5bbda47 100755
--- 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 () {