projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge with master.
[git.git]
/
git-diff-script
diff --git
a/git-diff-script
b/git-diff-script
index
ae15871
..
03ed555
100755
(executable)
--- a/
git-diff-script
+++ b/
git-diff-script
@@
-1,15
+1,18
@@
#!/bin/sh
#!/bin/sh
+. git-sh-setup-script || die "Not a git archive"
+
rev=($(git-rev-parse --revs-only "$@"))
rev=($(git-rev-parse --revs-only "$@"))
-flags=($(git-rev-parse --no-revs "$@"))
+flags=($(git-rev-parse --no-revs --flags "$@"))
+files=($(git-rev-parse --no-revs --no-flags "$@"))
case "${#rev[*]}" in
0)
case "${#rev[*]}" in
0)
- git-diff-files -
p -C
"$@";;
+ git-diff-files -
M -p
"$@";;
1)
1)
- git-diff-cache -
p -C
"$@";;
+ git-diff-cache -
M -p
"$@";;
2)
begin=$(echo "${rev[1]}" | tr -d '^')
end="${rev[0]}"
2)
begin=$(echo "${rev[1]}" | tr -d '^')
end="${rev[0]}"
- git-diff-tree -
p -C $flags $begin $end
;;
+ git-diff-tree -
M -p $flags $begin $end $files
;;
*)
echo "I don't understand"
exit 1;;
*)
echo "I don't understand"
exit 1;;