aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-09-30 15:21:28 -0700
committerJunio C Hamano <junkio@cox.net>2006-09-30 15:26:21 -0700
commit936a9508cc0d5369b00c76ee63cdb81556e7be39 (patch)
treeeb97c5348a999373829ae388b664954bf36c0664
parentc0277d15effb9efcaaaa0cd84decf71a327ac07b (diff)
downloadgit-936a9508cc0d5369b00c76ee63cdb81556e7be39.tar.gz
git-936a9508cc0d5369b00c76ee63cdb81556e7be39.tar.xz
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>
-rwxr-xr-xgit-branch.sh10
1 files changed, 0 insertions, 10 deletions
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