Replace open-coded version of hash_sha1_file()

diff --git a/git-branch.sh b/git-branch.sh
index e2db9063d4c63288c5834046962290ff9dfca127..4f31903d63662db7d49d3d257e328004ca2958f7 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='[-l] [(-d | -D) <branchname>] | [[-f] <branchname> [<start-point>]] | -r'
+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,22 +32,31 @@ 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
            ;;
        esac
+       rm -f "$GIT_DIR/logs/refs/heads/$branch_name"
        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=
+create_log=
 while case "$#,$1" in 0,*) break ;; *,-*) ;; *) break ;; esac
 do
        case "$1" in
@@ -59,6 +64,16 @@ do
                delete_branch "$@"
                exit
                ;;
+       -r)
+               ls_remote_branches
+               exit
+               ;;
+       -f)
+               force="$1"
+               ;;
+       -l)
+               create_log="yes"
+               ;;
        --)
                shift
                break
@@ -72,10 +87,7 @@ 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' |
+       git-rev-parse --symbolic --branches |
        sort |
        while read ref
        do
@@ -97,9 +109,32 @@ 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 [ -d "$GIT_DIR/refs/heads/$branchname" ]
+then
+       for refdir in `cd "$GIT_DIR" && \
+               find "refs/heads/$branchname" -type d | sort -r`
+       do
+               rmdir "$GIT_DIR/$refdir" || \
+                   die "Could not delete '$refdir', there may still be a ref there."
+       done
+fi
+
+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
+if test "$create_log" = 'yes'
+then
+       mkdir -p $(dirname "$GIT_DIR/logs/refs/heads/$branchname")
+       touch "$GIT_DIR/logs/refs/heads/$branchname"
+fi
+git update-ref -m "branch: Created from $head" "refs/heads/$branchname" $rev