From: Linus Torvalds Date: Mon, 13 Jun 2005 22:09:34 +0000 (-0700) Subject: Add "git diff" script X-Git-Tag: v0.99~268 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=940c1bb0181cb20454bf3573134175f86983a0ce;p=git.git 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. --- diff --git a/Makefile b/Makefile index 8216c9903..dd16385d1 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 000000000..d70e8b9f2 --- /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