mirror of
https://github.com/git/git.git
synced 2024-10-31 22:37:54 +01:00
df9892ffce
The --cc output is much nicer when dealing with merges, so use it by default. Signed-off-by: Junio C Hamano <junkio@cox.net>
63 lines
1.3 KiB
Bash
Executable file
63 lines
1.3 KiB
Bash
Executable file
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2005 Linus Torvalds
|
|
# Copyright (c) 2005 Junio C Hamano
|
|
|
|
USAGE='[ --diff-options ] <ent>{0,2} [<path>...]'
|
|
SUBDIRECTORY_OK='Yes'
|
|
. git-sh-setup
|
|
|
|
rev=$(git-rev-parse --revs-only --no-flags --sq "$@") || exit
|
|
flags=$(git-rev-parse --no-revs --flags --sq "$@")
|
|
files=$(git-rev-parse --no-revs --no-flags --sq "$@")
|
|
|
|
# I often say 'git diff --cached -p' and get scolded by git-diff-files, but
|
|
# obviously I mean 'git diff --cached -p HEAD' in that case.
|
|
case "$rev" in
|
|
'')
|
|
case " $flags " in
|
|
*" '--cached' "*)
|
|
rev='HEAD '
|
|
;;
|
|
esac
|
|
esac
|
|
|
|
# If we do not have --name-status, --name-only nor -r, default to --cc.
|
|
# If we do not have -B nor -C, default to -M.
|
|
case " $flags " in
|
|
*" '--name-status' "* | *" '--name-only' "* | *" '-r' "* )
|
|
;;
|
|
*)
|
|
flags="$flags'--cc' " ;;
|
|
esac
|
|
case " $flags " in
|
|
*" '-"[BCM]* | *" '--find-copies-harder' "*)
|
|
;; # something like -M50.
|
|
*)
|
|
flags="$flags'-M' " ;;
|
|
esac
|
|
|
|
case "$rev" in
|
|
?*' '?*' '?*)
|
|
usage
|
|
;;
|
|
?*' '^?*)
|
|
begin=$(expr "$rev" : '.*^.\([0-9a-f]*\).*') &&
|
|
end=$(expr "$rev" : '.\([0-9a-f]*\). .*') || exit
|
|
cmd="git-diff-tree $flags $begin $end -- $files"
|
|
;;
|
|
?*' '?*)
|
|
cmd="git-diff-tree $flags $rev -- $files"
|
|
;;
|
|
?*' ')
|
|
cmd="git-diff-index $flags $rev -- $files"
|
|
;;
|
|
'')
|
|
cmd="git-diff-files $flags -- $files"
|
|
;;
|
|
*)
|
|
usage
|
|
;;
|
|
esac
|
|
|
|
eval "$cmd"
|