git-diff: Usage string clean-up
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
Fredrik Kuivinen committed
Dec 15, 2005 at 23:47 UTC
92811b57674ce81e0d7fa1cfeca44023bc650641
1 file changed
+6
-8
git-diff.sh
+6
-8
@@ -3,15 +3,14 @@
3
# Copyright (c) 2005 Linus Torvalds
4
# Copyright (c) 2005 Junio C Hamano
5
6
+USAGE='[ --diff-options ] <ent>{0,2} [<path>...]'
7
+SUBDIRECTORY_OK='Yes'
8
+. git-sh-setup
9
+
10
rev=$(git-rev-parse --revs-only --no-flags --sq "$@") || exit
11
flags=$(git-rev-parse --no-revs --flags --sq "$@")
12
files=$(git-rev-parse --no-revs --no-flags --sq "$@")
13
10
-die () {
11
- echo >&2 "$*"
12
- exit 1
13
-}
14
-
14
# I often say 'git diff --cached -p' and get scolded by git-diff-files, but
15
# obviously I mean 'git diff --cached -p HEAD' in that case.
16
case "$rev" in
@@ -40,8 +39,7 @@ esac
39
40
case "$rev" in
41
?*' '?*' '?*)
43
- echo >&2 "I don't understand"
44
- exit 1
42
+ usage
43
;;
44
?*' '^?*)
45
begin=$(expr "$rev" : '.*^.\([0-9a-f]*\).*') &&
@@ -58,7 +56,7 @@ case "$rev" in
56
cmd="git-diff-files $flags -- $files"
57
;;
58
*)
61
- die "I don't understand $*"
59
+ usage
60
;;
61
esac
62