Browse Source

git-diff: Usage string clean-up

Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
maint
Fredrik Kuivinen 19 years ago committed by Junio C Hamano
parent
commit
92811b5767
  1. 14
      git-diff.sh

14
git-diff.sh

@ -3,15 +3,14 @@ @@ -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 @@ -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 @@ -58,7 +56,7 @@ case "$rev" in
cmd="git-diff-files $flags -- $files"
;;
*)
die "I don't understand $*"
usage
;;
esac


Loading…
Cancel
Save