Do not fail on hierarchical branch names.

"git-checkout -b frotz/nitfol master" failed to create
$GIT_DIR/refs/heads/frotz/nitfol but went ahead and updated
$GIT_DIR/HEAD to point at it, resulting in a corrupt repository.
Exit when we cannot create the new branch with an error status.

While we are at it, there is no reason to forbid subdirectories
in refs/heads, so make sure we handle that correctly.

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

diff --git a/git-branch.sh b/git-branch.sh
index e2db9063d4c63288c5834046962290ff9dfca127..67f113acb9abc2bbcd444de42326854bdd88ba4a 100755 (executable)
--- a/git-branch.sh
+++ b/git-branch.sh
@@ -102,4 +102,6 @@ rev=$(git-rev-parse --verify "$head") || exit
 git-check-ref-format "heads/$branchname" ||
        die "we do not like '$branchname' as a branch name."
 
 git-check-ref-format "heads/$branchname" ||
        die "we do not like '$branchname' as a branch name."
 

+leading=`expr "refs/heads/$branchname" : '\(.*\)/'` &&
+mkdir -p "$GIT_DIR/$leading" &&

 echo $rev > "$GIT_DIR/refs/heads/$branchname"
 echo $rev > "$GIT_DIR/refs/heads/$branchname"

diff --git a/git-checkout.sh b/git-checkout.sh
index cb33fdc7e20272a77d97d1b68c31d9b93d3cf4d4..4c08f36b591508b5d940384db603e2f4483116d6 100755 (executable)
--- a/git-checkout.sh
+++ b/git-checkout.sh
@@ -126,7 +126,9 @@ fi
 #
 if [ "$?" -eq 0 ]; then
        if [ "$newbranch" ]; then
 #
 if [ "$?" -eq 0 ]; then
        if [ "$newbranch" ]; then

-               echo $new > "$GIT_DIR/refs/heads/$newbranch"
+               leading=`expr "refs/heads/$newbranch" : '\(.*\)/'` &&
+               mkdir -p "$GIT_DIR/$leading" &&
+               echo $new >"$GIT_DIR/refs/heads/$newbranch" || exit

                branch="$newbranch"
        fi
        [ "$branch" ] &&
                branch="$newbranch"
        fi
        [ "$branch" ] &&