X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-branch.sh;h=b0e54ed2af9dbf06e79b7230a62029ee2ee8a269;hb=e99fcf96deab45ca81b22948328deb2d8586aa8d;hp=2594518e9f7a812a77aaba5b10f3194a7eced423;hpb=302ebfe52192fff9a2c1c612dff22325fd073acc;p=git.git

diff --git a/git-branch.sh b/git-branch.sh
index 2594518e..b0e54ed2 100755
--- 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"
@@ -37,11 +32,11 @@ delete_branch () {
 	    case " $mbs " in
 	    *' '$branch' '*)
 		# the merge base of branch and HEAD contains branch --
-		# which means that the HEAD contains everything in the HEAD.
+		# which means that the HEAD contains everything in both.
 		;;
 	    *)
 		echo >&2 "The branch '$branch_name' is not a strict subset of your current HEAD.
-    If you are sure you want to delete it, run 'git branch -D $branch_name'."
+If you are sure you want to delete it, run 'git branch -D $branch_name'."
 		exit 1
 		;;
 	    esac
@@ -114,4 +109,3 @@ then
 	fi
 fi
 git update-ref "refs/heads/$branchname" $rev
-