summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c0277d1)
raw | patch | inline | side by side (parent: c0277d1)
author | Junio C Hamano <junkio@cox.net> | |
Sat, 30 Sep 2006 22:21:28 +0000 (15:21 -0700) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Sat, 30 Sep 2006 22:26:21 +0000 (15:26 -0700) |
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>
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>
git-branch.sh | patch | blob | history |
diff --git a/git-branch.sh b/git-branch.sh
index c61683033da84b6630aff7451f829040be9d5a37..bf84b30695fdeda5d5e18456813e0b3cc3d11275 100755 (executable)
--- a/git-branch.sh
+++ b/git-branch.sh
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