mailinfo and git-am: allow "John Doe <johndoe>"

diff --git a/git-diff.sh b/git-diff.sh
index 7baf7044e440e6d052f5e92e1008f710dd319c67..b62e58341cd9d11fc893613949426126871531e2 100755 (executable)
--- a/git-diff.sh
+++ b/git-diff.sh
@@ -7,6 +7,11 @@ 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