Merge branch 'lt/diffgen' into next

[git.git] / git-branch.sh

diff --git a/git-branch.sh b/git-branch.sh
index 145a7b7..663a3a3 100755 (executable)
--- a/git-branch.sh
+++ b/git-branch.sh
@@ -1,10 +1,87 @@
 #!/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>.'
+
+SUBDIRECTORY_OK='Yes'
+. git-sh-setup
+
+headref=$(git-symbolic-ref HEAD | sed -e 's|^refs/heads/||')
+
+delete_branch () {
+    option="$1"
+    shift
+    for branch_name
+    do
+       case ",$headref," in
+       ",$branch_name,")
+           die "Cannot delete the branch you are on." ;;
+       ,,)
+           die "What branch are you on anyway?" ;;
+       esac
+       branch=$(cat "$GIT_DIR/refs/heads/$branch_name") &&
+           branch=$(git-rev-parse --verify "$branch^0") ||
+               die "Seriously, what branch are you talking about?"
+       case "$option" in
+       -D)
+           ;;
+       *)
+           mbs=$(git-merge-base -a "$branch" HEAD | tr '\012' ' ')
+           case " $mbs " in
+           *' '$branch' '*)
+               # the merge base of branch and HEAD contains branch --
+               # 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'."
+               exit 1
+               ;;
+           esac
+           ;;
+       esac
+       rm -f "$GIT_DIR/refs/heads/$branch_name"
+       echo "Deleted branch $branch_name."
+    done
+    exit 0
+}
+
+ls_remote_branches () {
+    git-rev-parse --symbolic --all |
+    sed -ne 's|^refs/\(remotes/\)|\1|p' |
+    sort
+}
+
+force=
+while case "$#,$1" in 0,*) break ;; *,-*) ;; *) break ;; esac
+do
+       case "$1" in
+       -d | -D)
+               delete_branch "$@"
+               exit
+               ;;
+       -r)
+               ls_remote_branches
+               exit
+               ;;
+       -f)
+               force="$1"
+               ;;
+       --)
+               shift
+               break
+               ;;
+       -*)
+               usage
+               ;;
+       esac
+       shift
+done
 
 case "$#" in
 0)
-       headref=$(readlink "$GIT_DIR/HEAD" | sed -e 's|^refs/heads/||')
        git-rev-parse --symbolic --all |
        sed -ne 's|^refs/heads/||p' |
        sort |
@@ -25,8 +102,20 @@ case "$#" in
        head="$2^0" ;;
 esac
 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."
 
-echo $rev > "$GIT_DIR/refs/heads/$branchname"
+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