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

diff --git a/git-branch.sh b/git-branch.sh
index 4379a07210cf30c5d6e5abdb36722985983edb46..c61683033da84b6630aff7451f829040be9d5a37 100755 (executable)
--- a/git-branch.sh
+++ b/git-branch.sh
@@ -111,6 +111,26 @@ rev=$(git-rev-parse --verify "$head") || exit
 git-check-ref-format "heads/$branchname" ||
        die "we do not like '$branchname' as a branch name."
 
+if [ -d "$GIT_DIR/refs/heads/$branchname" ]
+then
+       for refdir in `cd "$GIT_DIR" && \
+               find "refs/heads/$branchname" -type d | sort -r`
+       do
+               rmdir "$GIT_DIR/$refdir" || \
+                   die "Could not delete '$refdir', there may still be a ref there."
+       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