Merge branches 'jc/branch' and 'jc/rebase'

Junio C Hamano · Junio C Hamano · commit 0b4276931f41 · 2005-11-18T15:54:23.000-08:00
diff --git a/git-branch.sh b/git-branch.sh
@@ -3,7 +3,7 @@
 . git-sh-setup || die "Not a git archive"
 
 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.
@@ -12,11 +12,12 @@ If two arguments, create a new branch <branchname> based off of <start-point>.
     exit 1
 }
 
+headref=$(GIT_DIR="$GIT_DIR" 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
@@ -52,13 +53,17 @@ delete_branch () {
     exit 0
 }
 
+force=
 while case "$#,$1" in 0,*) break ;; *,-*) ;; *) break ;; esac
 do
 	case "$1" in
 	-d | -D)
 		delete_branch "$@"
 		exit
 		;;
+	-f)
+		force="$1"
+		;;
 	--)
 		shift
 		break
@@ -72,8 +77,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 +100,18 @@ 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
 
diff --git a/git-rebase.sh b/git-rebase.sh
@@ -5,65 +5,25 @@
 
 . git-sh-setup || die "Not a git archive."
 
-usage="usage: $0 "'<upstream> [<head>]
-
-Uses output from git-cherry to rebase local commits to the new head of
-upstream tree.'
-
-case "$#,$1" in
-1,*..*)
-    upstream=$(expr "$1" : '\(.*\)\.\.') ours=$(expr "$1" : '.*\.\.\(.*\)$')
-    set x "$upstream" "$ours"
-    shift ;;
-esac
+# The other head is given
+other=$(git-rev-parse --verify "$1^0") || exit
 
+# The tree must be really really clean.
 git-update-index --refresh || exit
+diff=$(git-diff-index --cached --name-status -r HEAD)
+case "$different" in
+?*)	echo "$diff"
+	exit 1
+	;;
+esac
 
+# If the branch to rebase is given, first switch to it.
 case "$#" in
-1) ours_symbolic=HEAD ;;
-2) ours_symbolic="$2" ;;
-*) die "$usage" ;;
+2)
+	git-checkout "$2" || exit
 esac
 
-upstream=`git-rev-parse --verify "$1"` &&
-ours=`git-rev-parse --verify "$ours_symbolic"` || exit
-different1=$(git-diff-index --name-only --cached "$ours") &&
-different2=$(git-diff-index --name-only "$ours") &&
-test "$different1$different2" = "" ||
-die "Your working tree does not match $ours_symbolic."
-
-git-read-tree -m -u $ours $upstream &&
-new_head=$(git-rev-parse --verify "$upstream^0") &&
-git-update-ref HEAD "$new_head" || exit
-
-tmp=.rebase-tmp$$
-fail=$tmp-fail
-trap "rm -rf $tmp-*" 1 2 3 15
-
->$fail
-
-git-cherry -v $upstream $ours |
-while read sign commit msg
-do
-	case "$sign" in
-	-)
-		echo >&2 "* Already applied: $msg"
-		continue ;;
-	esac
-	echo >&2 "* Applying: $msg"
-	S=$(git-rev-parse --verify HEAD) &&
-	git-cherry-pick --replay $commit || {
-		echo >&2 "* Not applying the patch and continuing."
-		echo $commit >>$fail
-		git-reset --hard $S
-	}
-done
-if test -s $fail
-then
-	echo >&2 Some commits could not be rebased, check by hand:
-	cat >&2 $fail
-	echo >&2 "(the same list of commits are found in $tmp)"
-	exit 1
-else
-	rm -f $fail
-fi
+# Rewind the head to "$other"
+git-reset --hard "$other"
+git-format-patch -k --stdout --full-index "$other" ORIG_HEAD |
+git am --binary -3 -k
