diff options
| author | Fredrik Kuivinen <freku045@student.liu.se> | 2005-12-15 23:47:57 +0100 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-12-15 16:02:04 -0800 |
| commit | 92811b57674ce81e0d7fa1cfeca44023bc650641 (patch) | |
| tree | efb9a2ddd550c98ded8e9184430bd510b4cb4a17 | |
| parent | c6f60f991f29ce1140b9dede1185562fbffe2549 (diff) | |
| download | git-92811b57674ce81e0d7fa1cfeca44023bc650641.tar.gz git-92811b57674ce81e0d7fa1cfeca44023bc650641.tar.xz | |
git-diff: Usage string clean-up
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rwxr-xr-x | git-diff.sh | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/git-diff.sh b/git-diff.sh index b62e58341..4812ae4c1 100755 --- a/git-diff.sh +++ b/git-diff.sh @@ -3,15 +3,14 @@ # Copyright (c) 2005 Linus Torvalds # Copyright (c) 2005 Junio C Hamano +USAGE='[ --diff-options ] <ent>{0,2} [<path>...]' +SUBDIRECTORY_OK='Yes' +. git-sh-setup + rev=$(git-rev-parse --revs-only --no-flags --sq "$@") || exit flags=$(git-rev-parse --no-revs --flags --sq "$@") files=$(git-rev-parse --no-revs --no-flags --sq "$@") -die () { - echo >&2 "$*" - exit 1 -} - # I often say 'git diff --cached -p' and get scolded by git-diff-files, but # obviously I mean 'git diff --cached -p HEAD' in that case. case "$rev" in @@ -40,8 +39,7 @@ esac case "$rev" in ?*' '?*' '?*) - echo >&2 "I don't understand" - exit 1 + usage ;; ?*' '^?*) begin=$(expr "$rev" : '.*^.\([0-9a-f]*\).*') && @@ -58,7 +56,7 @@ case "$rev" in cmd="git-diff-files $flags -- $files" ;; *) - die "I don't understand $*" + usage ;; esac |