Merge part of js/portable into next

diff --git a/git-branch.sh b/git-branch.sh
index 11d52fd78ed11887006ba23470083e2560439c0c..6ac961e6d18b8419abdaa5ed57a55ef58f7bc0fb 100755 (executable)
--- a/git-branch.sh
+++ b/git-branch.sh
@@ -1,22 +1,18 @@
 #!/bin/sh
 
-. git-sh-setup || die "Not a git archive"
+USAGE='[(-d | -D) <branchname>] | [[-f] <branchname> [<start-point>]]'
+LONG_USAGE='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>.'
 
-usage () {
-    echo >&2 "usage: $(basename $0)"' [-d <branch>] | [<branch> [start-point]]
+SUBDIRECTORY_OK='Yes'
+. git-sh-setup
 
-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
-}
+headref=$(git-symbolic-ref HEAD | sed -e 's|^refs/heads/||')
 
 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
@@ -36,11 +32,11 @@ delete_branch () {
            case " $mbs " in
            *' '$branch' '*)
                # the merge base of branch and HEAD contains branch --
-               # which means that the HEAD contains everything in the HEAD.
+               # which means that the HEAD contains everything in both.
                ;;
            *)
                echo >&2 "The branch '$branch_name' is not a strict subset of your current HEAD.
-    If you are sure you want to delete it, run 'git branch -D $branch_name'."
+If you are sure you want to delete it, run 'git branch -D $branch_name'."
                exit 1
                ;;
            esac
@@ -52,6 +48,7 @@ delete_branch () {
     exit 0
 }
 
+force=
 while case "$#,$1" in 0,*) break ;; *,-*) ;; *) break ;; esac
 do
        case "$1" in
@@ -59,6 +56,9 @@ do
                delete_branch "$@"
                exit
                ;;
+       -f)
+               force="$1"
+               ;;
        --)
                shift
                break
@@ -72,8 +72,6 @@ done
 
 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 |
@@ -97,10 +95,17 @@ branchname="$1"
 
 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."
 
+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
-