Invalidate cache-tree entries for touched paths in git-apply.

diff --git a/git-whatchanged.sh b/git-whatchanged.sh
index 80e2500e0ea1769d9d92454c667852dd2056ef04..1fb9feb34849f5030d0b9dc7f91ae65e22322786 100755 (executable)
--- a/git-whatchanged.sh
+++ b/git-whatchanged.sh
@@ -4,15 +4,25 @@ USAGE='[-p] [--max-count=<n>] [<since>..<limit>] [--pretty=<format>] [-m] [git-d
 SUBDIRECTORY_OK='Yes'
 . git-sh-setup
 
-diff_tree_flags=$(git-rev-parse --sq --no-revs --flags "$@")
+diff_tree_flags=$(git-rev-parse --sq --no-revs --flags "$@") || exit
+case "$0" in
+*whatchanged)
+       count=
+       test -z "$diff_tree_flags" &&
+               diff_tree_flags=$(git-repo-config --get whatchanged.difftree)
+       diff_tree_default_flags='-c -M --abbrev' ;;
+*show)
+       count=-n1
+       test -z "$diff_tree_flags" &&
+               diff_tree_flags=$(git-repo-config --get show.difftree)
+       diff_tree_default_flags='--cc --always' ;;
+esac
 test -z "$diff_tree_flags" &&
-       diff_tree_flags=$(git-repo-config --get whatchanged.difftree)
-test -z "$diff_tree_flags" &&
-       diff_tree_flags='-M --abbrev'
+       diff_tree_flags="$diff_tree_default_flags"
 
 rev_list_args=$(git-rev-parse --sq --default HEAD --revs-only "$@") &&
 diff_tree_args=$(git-rev-parse --sq --no-revs --no-flags "$@") &&
 
-eval "git-rev-list $rev_list_args" |
+eval "git-rev-list $count $rev_list_args" |
 eval "git-diff-tree --stdin --pretty -r $diff_tree_flags $diff_tree_args" |
 LESS="$LESS -S" ${PAGER:-less}