X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-diff.sh;h=4812ae4c1ff937ded49334a97ee1dc2c1732e433;hb=e6c310fd0d7384973efc6b1d5999a5e8a5b2f3bd;hp=7baf7044e440e6d052f5e92e1008f710dd319c67;hpb=5401f3040b61e11da79d676e42aacfa9f1131083;p=git.git diff --git a/git-diff.sh b/git-diff.sh index 7baf7044..4812ae4c 100755 --- a/git-diff.sh +++ b/git-diff.sh @@ -3,6 +3,10 @@ # Copyright (c) 2005 Linus Torvalds # Copyright (c) 2005 Junio C Hamano +USAGE='[ --diff-options ] {0,2} [...]' +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 "$@") @@ -35,8 +39,7 @@ esac case "$rev" in ?*' '?*' '?*) - echo >&2 "I don't understand" - exit 1 + usage ;; ?*' '^?*) begin=$(expr "$rev" : '.*^.\([0-9a-f]*\).*') && @@ -53,7 +56,7 @@ case "$rev" in cmd="git-diff-files $flags -- $files" ;; *) - die "I don't understand $*" + usage ;; esac