summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-07-06 10:09:58 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-06 10:09:58 -0700
commit9e9824ba0e641095f1cbc01c724d8e0a382c0580 (patch)
tree87c7cffcfecaea687f529b1c7cfb1878208c054a
parentf79b65aa65b7697a1cae0f895061ce822f410c5d (diff)
downloadgit-9e9824ba0e641095f1cbc01c724d8e0a382c0580.tar.gz
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.
-rwxr-xr-xgit-diff-script5
1 files changed, 3 insertions, 2 deletions
diff --git a/git-diff-script b/git-diff-script
index 673853b9ce..020816bbf0 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;;