6932c78cb4
Marco says it breaks qgit. This makes the flags a bit more
orthogonal.
$ git-diff-tree -r --abbrev ca18
No output from this command because you asked to skip merge by
not having -m there.
$ git-diff-tree -r -m --abbrev ca18
ca182053c7
:100644 100644 538d21d... 59042d1... M Makefile
:100644 100644 410b758... 6c47c3a... M entry.c
ca182053c7
:100644 100644 30479b4... 59042d1... M Makefile
The same "independent sets of diff" as before without -c.
$ git-diff-tree -r -m -c --abbrev ca18
ca182053c7
::100644 100644 100644 538d21d... 30479b4... 59042d1... MM Makefile
Combined.
$ git-diff-tree -r -c --abbrev ca18
ca182053c7
::100644 100644 100644 538d21d... 30479b4... 59042d1... MM Makefile
Asking for combined without -m does not make sense, so -c
implies -m.
We need to supply -c as default to whatchanged, which is a
one-liner.
Signed-off-by: Junio C Hamano <junkio@cox.net>
29 lines
934 B
Bash
Executable File
29 lines
934 B
Bash
Executable File
#!/bin/sh
|
|
|
|
USAGE='[-p] [--max-count=<n>] [<since>..<limit>] [--pretty=<format>] [-m] [git-diff-tree options] [git-rev-list options]'
|
|
SUBDIRECTORY_OK='Yes'
|
|
. git-sh-setup
|
|
|
|
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="$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 $count $rev_list_args" |
|
|
eval "git-diff-tree --stdin --pretty -r $diff_tree_flags $diff_tree_args" |
|
|
LESS="$LESS -S" ${PAGER:-less}
|