X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-diff-script;h=03ed555e777b6dfeac8811338986eb752418ab72;hb=b097584b790b3ec214ceed4ecc6eb6a8f4a69a8f;hp=ae1587121bcbf76be2ffc655580b4f24319f49cf;hpb=40d8cfe4117564e5520e8f4f953addaa94844476;p=git.git

diff --git a/git-diff-script b/git-diff-script
index ae158712..03ed555e 100755
--- a/git-diff-script
+++ b/git-diff-script
@@ -1,15 +1,18 @@
 #!/bin/sh
+. git-sh-setup-script || die "Not a git archive"
+
 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)
-	git-diff-files -p -C "$@";;
+	git-diff-files -M -p "$@";;
 1)
-	git-diff-cache -p -C "$@";;
+	git-diff-cache -M -p "$@";;
 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;;