lock_ref_sha1(): do not sometimes error() and sometimes die().

diff --git a/git-branch.sh b/git-branch.sh
index bf84b30695fdeda5d5e18456813e0b3cc3d11275..c61683033da84b6630aff7451f829040be9d5a37 100755 (executable)
--- a/git-branch.sh
+++ b/git-branch.sh
@@ -121,6 +121,16 @@ then
        done
 fi
 
+branchdir=$(dirname $branchname)
+while test "$branchdir" != "."
+do
+       if git-show-ref --verify --quiet -- "refs/heads/$branchdir"
+       then
+               die "$branchdir already exists."
+       fi
+       branchdir=$(dirname $branchdir)
+done
+
 prev=''
 if git-show-ref --verify --quiet -- "refs/heads/$branchname"
 then