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

diff --git a/git-branch.sh b/git-branch.sh
index 2594518e9f7a812a77aaba5b10f3194a7eced423..0266f46223c2f20973bbbcb78f4825ff880d9bd3 100755 (executable)
--- a/git-branch.sh
+++ b/git-branch.sh
@@ -1,19 +1,14 @@
 #!/bin/sh
 
-. git-sh-setup || die "Not a git archive"
-
-usage () {
-    echo >&2 "usage: $(basename $0)"' [-d <branch>] | [[-f] <branch> [start-point]]
-
-If no arguments, show available branches and mark current branch with a star.
+USAGE='[-d <branch>] | [[-f] <branch> [start-point]]'
+LONG_USAGE='If no arguments, show available branches and mark current branch with a star.
 If one argument, create a new branch <branchname> based off of current HEAD.
-If two arguments, create a new branch <branchname> based off of <start-point>.
-'
-    exit 1
-}
+If two arguments, create a new branch <branchname> based off of <start-point>.'
 
-headref=$(GIT_DIR="$GIT_DIR" git-symbolic-ref HEAD |
-       sed -e 's|^refs/heads/||')
+SUBDIRECTORY_OK='Yes'
+. git-sh-setup
+
+headref=$(git-symbolic-ref HEAD | sed -e 's|^refs/heads/||')
 
 delete_branch () {
     option="$1"
@@ -114,4 +109,3 @@ then
        fi
 fi
 git update-ref "refs/heads/$branchname" $rev
-