mirror of
https://github.com/git/git
synced 2024-11-05 18:59:29 +00:00
ea51d416c0
It adds "--" to the git-diff.sh scripts, to keep any filenames that start with a "-" from being confused with an option. But in order to do that, it needs to teach git-diff-files to honor "--". Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
47 lines
952 B
Bash
Executable file
47 lines
952 B
Bash
Executable file
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2005 Linus Torvalds
|
|
# Copyright (c) 2005 Junio C Hamano
|
|
|
|
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 "$@")
|
|
|
|
: ${flags:="'-M' '-p'"}
|
|
|
|
# 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
|
|
|
|
case "$rev" in
|
|
?*' '?*' '?*)
|
|
echo >&2 "I don't understand"
|
|
exit 1
|
|
;;
|
|
?*' '^?*)
|
|
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"
|
|
;;
|
|
*)
|
|
die "I don't understand $*"
|
|
;;
|
|
esac
|
|
|
|
eval "$cmd"
|