Skip to content

Commit

Permalink
Paper bag fix diff invocation in 'git stash show'
Browse files Browse the repository at this point in the history
In 89d750b 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>
  • Loading branch information
Shawn O. Pearce committed Oct 19, 2007
1 parent bbaf63f commit e7187e4
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion git-stash.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 () {
Expand Down

0 comments on commit e7187e4

Please sign in to comment.