branch: make it operable from a subdirectory.

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/git-branch.sh b/git-branch.sh
index 4cd5da16f74cee6e277d33bce74242496eca94fe..b48c32988fc16fe9d221cca18c1030bbaaa5838b 100755 (executable)
--- a/git-branch.sh
+++ b/git-branch.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. git-sh-setup
+GIT_DIR=`git-rev-parse --git-dir` || exit $?
 
 usage () {
     echo >&2 "usage: $(basename $0)"' [-d <branch>] | [[-f] <branch> [start-point]]
@@ -12,8 +12,7 @@ If two arguments, create a new branch <branchname> based off of <start-point>.
     exit 1
 }
 
-headref=$(GIT_DIR="$GIT_DIR" git-symbolic-ref HEAD |
-       sed -e 's|^refs/heads/||')
+headref=$(git-symbolic-ref HEAD | sed -e 's|^refs/heads/||')
 
 delete_branch () {
     option="$1"
@@ -114,4 +113,3 @@ then
        fi
 fi
 git update-ref "refs/heads/$branchname" $rev
-