From: Junio C Hamano <junkio@cox.net>
Date: Sat, 30 Sep 2006 22:21:28 +0000 (-0700)
Subject: git-branch: remove D/F check done by hand.
X-Git-Tag: v1.4.4-rc1~43^2~3
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=936a9508cc0d5369b00c76ee63cdb81556e7be39;p=git.git

git-branch: remove D/F check done by hand.

Now ref creation codepath in lock_ref_sha1() and friends notices
the directory/file conflict situation, we do not do this by hand
in git-branch anymore.

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

diff --git a/git-branch.sh b/git-branch.sh
index c61683033..bf84b3069 100755
--- a/git-branch.sh
+++ b/git-branch.sh
@@ -121,16 +121,6 @@ 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