summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-13 22:09:34 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-13 22:09:34 (GMT)
commit940c1bb0181cb20454bf3573134175f86983a0ce (patch)
tree5aa582bf5d5dcca3c7c93b87fb6963c004a240b1
parent921d865ea24ffea6452f9b24302e651a347d7905 (diff)
downloadgit-940c1bb0181cb20454bf3573134175f86983a0ce.zip
git-940c1bb0181cb20454bf3573134175f86983a0ce.tar.gz
git-940c1bb0181cb20454bf3573134175f86983a0ce.tar.bz2
Add "git diff" script
It's a simple helper that depending on the arguments will either use git-diff-files, git-diff-cache or git-diff-tree.
-rw-r--r--Makefile2
-rwxr-xr-xgit-diff-script16
2 files changed, 17 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 8216c99..dd16385 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@ INSTALL=install
SCRIPTS=git git-apply-patch-script git-merge-one-file-script git-prune-script \
git-pull-script git-tag-script git-resolve-script git-whatchanged \
git-deltafy-script git-fetch-script git-status-script git-commit-script \
- git-log-script git-shortlog git-cvsimport-script
+ git-log-script git-shortlog git-cvsimport-script git-diff-script
PROG= git-update-cache git-diff-files git-init-db git-write-tree \
git-read-tree git-commit-tree git-cat-file git-fsck-cache \
diff --git a/git-diff-script b/git-diff-script
new file mode 100755
index 0000000..d70e8b9
--- /dev/null
+++ b/git-diff-script
@@ -0,0 +1,16 @@
+#!/bin/sh
+rev=($(git-rev-parse --revs-only "$@"))
+flags=($(git-rev-parse --no-revs "$@"))
+case "${#rev[*]}" in
+0)
+ git-diff-files -p "$@";;
+1)
+ git-diff-cache -p "$@";;
+2)
+ begin=$(echo "${rev[1]}" | tr -d '^')
+ end="${rev[0]}"
+ git-diff-tree -p $flags $begin $end;;
+*)
+ echo "I don't understand"
+ exit 1;;
+esac