git-show
This is essentially 'git whatchanged -n1 --always --cc "$@"'. Just like whatchanged takes default flags from whatchanged.difftree configuration, this uses show.difftree configuration. Signed-off-by: Junio C Hamano <junkio@cox.net>maint
parent
df9892ffce
commit
80d48ac623
|
@ -88,6 +88,7 @@ git-send-pack
|
||||||
git-sh-setup
|
git-sh-setup
|
||||||
git-shell
|
git-shell
|
||||||
git-shortlog
|
git-shortlog
|
||||||
|
git-show
|
||||||
git-show-branch
|
git-show-branch
|
||||||
git-show-index
|
git-show-index
|
||||||
git-ssh-fetch
|
git-ssh-fetch
|
||||||
|
|
5
Makefile
5
Makefile
|
@ -125,7 +125,7 @@ SCRIPT_PYTHON = \
|
||||||
SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \
|
SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \
|
||||||
$(patsubst %.perl,%,$(SCRIPT_PERL)) \
|
$(patsubst %.perl,%,$(SCRIPT_PERL)) \
|
||||||
$(patsubst %.py,%,$(SCRIPT_PYTHON)) \
|
$(patsubst %.py,%,$(SCRIPT_PYTHON)) \
|
||||||
git-cherry-pick
|
git-cherry-pick git-show
|
||||||
|
|
||||||
# The ones that do not have to link with lcrypto nor lz.
|
# The ones that do not have to link with lcrypto nor lz.
|
||||||
SIMPLE_PROGRAMS = \
|
SIMPLE_PROGRAMS = \
|
||||||
|
@ -440,6 +440,9 @@ $(patsubst %.py,%,$(SCRIPT_PYTHON)) : % : %.py
|
||||||
git-cherry-pick: git-revert
|
git-cherry-pick: git-revert
|
||||||
cp $< $@
|
cp $< $@
|
||||||
|
|
||||||
|
git-show: git-whatchanged
|
||||||
|
cp $< $@
|
||||||
|
|
||||||
# These can record GIT_VERSION
|
# These can record GIT_VERSION
|
||||||
git$X git.spec \
|
git$X git.spec \
|
||||||
$(patsubst %.sh,%,$(SCRIPT_SH)) \
|
$(patsubst %.sh,%,$(SCRIPT_SH)) \
|
||||||
|
|
|
@ -5,14 +5,24 @@ SUBDIRECTORY_OK='Yes'
|
||||||
. git-sh-setup
|
. git-sh-setup
|
||||||
|
|
||||||
diff_tree_flags=$(git-rev-parse --sq --no-revs --flags "$@") || exit
|
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='-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" &&
|
test -z "$diff_tree_flags" &&
|
||||||
diff_tree_flags=$(git-repo-config --get whatchanged.difftree)
|
diff_tree_flags="$diff_tree_default_flags"
|
||||||
test -z "$diff_tree_flags" &&
|
|
||||||
diff_tree_flags='-M --abbrev'
|
|
||||||
|
|
||||||
rev_list_args=$(git-rev-parse --sq --default HEAD --revs-only "$@") &&
|
rev_list_args=$(git-rev-parse --sq --default HEAD --revs-only "$@") &&
|
||||||
diff_tree_args=$(git-rev-parse --sq --no-revs --no-flags "$@") &&
|
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" |
|
eval "git-diff-tree --stdin --pretty -r $diff_tree_flags $diff_tree_args" |
|
||||||
LESS="$LESS -S" ${PAGER:-less}
|
LESS="$LESS -S" ${PAGER:-less}
|
||||||
|
|
Loading…
Reference in New Issue