From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Wed, 6 Jul 2005 17:09:58 +0000 (-0700)
Subject: Use the new git-rev-parse "--[no-]flags" in "git diff".
X-Git-Tag: v0.99~50
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=9e9824ba0e641095f1cbc01c724d8e0a382c0580;p=git.git

Use the new git-rev-parse "--[no-]flags" in "git diff".

This allows you to do

	git diff v2.6.12..v2.6.13-rc1 drivers/pcmcia

to see the diff between v2.6.12 and v2.6.13-rc1 as limited by the
filename argument.
---

diff --git a/git-diff-script b/git-diff-script
index 673853b9c..020816bbf 100755
--- a/git-diff-script
+++ b/git-diff-script
@@ -1,6 +1,7 @@
 #!/bin/sh
 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 -M -p "$@";;
@@ -9,7 +10,7 @@ case "${#rev[*]}" in
 2)
 	begin=$(echo "${rev[1]}" | tr -d '^')
 	end="${rev[0]}"
-	git-diff-tree -M -p $flags $begin $end;;
+	git-diff-tree -M -p $flags $begin $end $files;;
 *)
 	echo "I don't understand"
 	exit 1;;