summaryrefslogtreecommitdiff
path: root/git-branch.sh
diff options
context:
space:
mode:
authorAmos Waterland <apw@rossby.metr.ou.edu>2005-09-08 02:13:26 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-09-08 05:08:30 (GMT)
commita3b427b9fa1fdfd6d0c119d1f9db075ff92ffdf7 (patch)
treee0027c4eb430e15a82af1646ee44c5f2fe851314 /git-branch.sh
parentf0ebff0dfebc667e5edf6f67d190fd960513ab66 (diff)
downloadgit-a3b427b9fa1fdfd6d0c119d1f9db075ff92ffdf7.zip
git-a3b427b9fa1fdfd6d0c119d1f9db075ff92ffdf7.tar.gz
git-a3b427b9fa1fdfd6d0c119d1f9db075ff92ffdf7.tar.bz2
[PATCH] Do not create bogus branch from flag to git branch
If you run `git branch --help', you will unexpectedly have created a new branch named "--help". This simple patch adds logic and a usage statement to catch this and similar problems, and adds a testcase for it. Signed-off-by: Amos Waterland <apw@rossby.metr.ou.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-branch.sh')
-rwxr-xr-xgit-branch.sh16
1 files changed, 16 insertions, 0 deletions
diff --git a/git-branch.sh b/git-branch.sh
index 145a7b7..81b9e6c 100755
--- a/git-branch.sh
+++ b/git-branch.sh
@@ -2,6 +2,16 @@
. git-sh-setup || die "Not a git archive"
+usage () {
+ echo >&2 "usage: $(basename $0)"' [<branchname> [start-point]]
+
+If no arguments, show available branches and mark current branch with a star.
+If one argument, create a new branch <branchname> based off of current HEAD.
+If two arguments, create a new branch <branchname> based off of <start-point>.
+'
+ exit 1
+}
+
case "$#" in
0)
headref=$(readlink "$GIT_DIR/HEAD" | sed -e 's|^refs/heads/||')
@@ -25,6 +35,12 @@ case "$#" in
head="$2^0" ;;
esac
branchname="$1"
+
+case "$branchname" in
+-*)
+ usage;;
+esac
+
rev=$(git-rev-parse --verify "$head") || exit
[ -e "$GIT_DIR/refs/heads/$branchname" ] && die "$branchname already exists"