projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bisect: limit the searchspace by pathspecs
[git.git]
/
git-branch.sh
diff --git
a/git-branch.sh
b/git-branch.sh
index
11d52fd
..
4cd5da1
100755
(executable)
--- a/
git-branch.sh
+++ b/
git-branch.sh
@@
-1,9
+1,9
@@
#!/bin/sh
#!/bin/sh
-. git-sh-setup
|| die "Not a git archive"
+. git-sh-setup
usage () {
usage () {
- echo >&2 "usage: $(basename $0)"' [-d <branch>] | [<branch> [start-point]]
+ echo >&2 "usage: $(basename $0)"' [-d <branch>] | [
[-f]
<branch> [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 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.
@@
-12,11
+12,12
@@
If two arguments, create a new branch <branchname> based off of <start-point>.
exit 1
}
exit 1
}
+headref=$(GIT_DIR="$GIT_DIR" git-symbolic-ref HEAD |
+ sed -e 's|^refs/heads/||')
+
delete_branch () {
option="$1"
shift
delete_branch () {
option="$1"
shift
- headref=$(GIT_DIR="$GIT_DIR" git-symbolic-ref HEAD |
- sed -e 's|^refs/heads/||')
for branch_name
do
case ",$headref," in
for branch_name
do
case ",$headref," in
@@
-52,6
+53,7
@@
delete_branch () {
exit 0
}
exit 0
}
+force=
while case "$#,$1" in 0,*) break ;; *,-*) ;; *) break ;; esac
do
case "$1" in
while case "$#,$1" in 0,*) break ;; *,-*) ;; *) break ;; esac
do
case "$1" in
@@
-59,6
+61,9
@@
do
delete_branch "$@"
exit
;;
delete_branch "$@"
exit
;;
+ -f)
+ force="$1"
+ ;;
--)
shift
break
--)
shift
break
@@
-72,8
+77,6
@@
done
case "$#" in
0)
case "$#" in
0)
- headref=$(GIT_DIR="$GIT_DIR" git-symbolic-ref HEAD |
- sed -e 's|^refs/heads/||')
git-rev-parse --symbolic --all |
sed -ne 's|^refs/heads/||p' |
sort |
git-rev-parse --symbolic --all |
sed -ne 's|^refs/heads/||p' |
sort |
@@
-97,10
+100,18
@@
branchname="$1"
rev=$(git-rev-parse --verify "$head") || exit
rev=$(git-rev-parse --verify "$head") || exit
-[ -e "$GIT_DIR/refs/heads/$branchname" ] &&
- die "$branchname already exists."
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."
+if [ -e "$GIT_DIR/refs/heads/$branchname" ]
+then
+ if test '' = "$force"
+ then
+ die "$branchname already exists."
+ elif test "$branchname" = "$headref"
+ then
+ die "cannot force-update the current branch."
+ fi
+fi
git update-ref "refs/heads/$branchname" $rev
git update-ref "refs/heads/$branchname" $rev