From: Junio C Hamano <junkio@cox.net>
Date: Tue, 14 Feb 2006 07:34:58 +0000 (-0800)
Subject: Merge some proposed fixes
X-Git-Tag: v1.3.0-rc1~215
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6a9b87972f27edfe53da4ce016adf4c0cd42f5e6?ds=inline;hp=-c

Merge some proposed fixes

Conflicts:

Documentation/git-commit.txt - taking the post 1.2.0 semantics.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

6a9b87972f27edfe53da4ce016adf4c0cd42f5e6
diff --combined git-bisect.sh
index 3c024aae73,07502536ce..03df1433ef
--- a/git-bisect.sh
+++ b/git-bisect.sh
@@@ -49,16 -49,9 +49,16 @@@ bisect_start() 
  	die "Bad HEAD - I need a symbolic ref"
  	case "$head" in
  	refs/heads/bisect*)
 -		git checkout master || exit
 +		if [ -s "$GIT_DIR/head-name" ]; then
 +		    branch=`cat "$GIT_DIR/head-name"`
 +		else
 +		    branch=master
 +	        fi
 +		git checkout $branch || exit
  		;;
  	refs/heads/*)
 +		[ -s "$GIT_DIR/head-name" ] && die "won't bisect on seeked tree"
 +		echo "$head" | sed 's#^refs/heads/##' >"$GIT_DIR/head-name"
  		;;
  	*)
  		die "Bad HEAD - strange symbolic ref"
@@@ -166,11 -159,7 +166,11 @@@ bisect_visualize() 
  
  bisect_reset() {
  	case "$#" in
 -	0) branch=master ;;
 +	0) if [ -s "$GIT_DIR/head-name" ]; then
 +	       branch=`cat "$GIT_DIR/head-name"`
 +	   else
 +	       branch=master
 +	   fi ;;
  	1) test -f "$GIT_DIR/refs/heads/$1" || {
  	       echo >&2 "$1 does not seem to be a valid branch"
  	       exit 1
@@@ -181,8 -170,9 +181,9 @@@
  	esac
  	git checkout "$branch" &&
  	rm -fr "$GIT_DIR/refs/bisect"
 -	rm -f "$GIT_DIR/refs/heads/bisect"
 +	rm -f "$GIT_DIR/refs/heads/bisect" "$GIT_DIR/head-name"
  	rm -f "$GIT_DIR/BISECT_LOG"
+ 	rm -f "$GIT_DIR/BISECT_NAMES"
  }
  
  bisect_replay () {