X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-branch.sh;h=e0501ec23f5c40134af0e6211cf1ba28e69e1d5b;hb=1a82e79315ed633f6b0b1fc4076054950c5380d3;hp=074229c206d01b8ca097b4ced902e9bf40987a06;hpb=79a9d8ea0d88a3667ad19be8e705405ab5d896f1;p=git.git

diff --git a/git-branch.sh b/git-branch.sh
index 074229c2..e0501ec2 100755
--- a/git-branch.sh
+++ b/git-branch.sh
@@ -1,60 +1,79 @@
 #!/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" branch_name="$2"
-    headref=$(GIT_DIR="$GIT_DIR" git-symbolic-ref HEAD |
-    	       sed -e 's|^refs/heads/||')
-    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 the HEAD.
+    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)
 	    ;;
 	*)
-	    echo >&2 "The branch '$branch_name' is not a strict subset of your current HEAD.
+	    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
+		exit 1
+		;;
+	    esac
 	    ;;
 	esac
-	;;
-    esac
-    rm -f "$GIT_DIR/refs/heads/$branch_name"
-    echo "Deleted branch $branch_name."
+	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
 	-d | -D)
-		delete_branch "$1" "$2"
+		delete_branch "$@"
+		exit
+		;;
+	-r)
+		ls_remote_branches
 		exit
 		;;
+	-f)
+		force="$1"
+		;;
+	-l)
+		create_log="yes"
+		;;
 	--)
 		shift
 		break
@@ -68,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
@@ -93,6 +109,22 @@ 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
+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