X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-bisect.sh;h=51e1e4417d95530612d3ce5db64c8295c9236f53;hb=9518eb262980d5048ef71e4450ef2cf78d7df6b5;hp=605d58a2becf8bb61281f57db864cd9e5419f694;hpb=215a7ad1ef790467a4cd3f0dcffbd6e5f04c38f7;p=git.git

diff --git a/git-bisect.sh b/git-bisect.sh
index 605d58a2..51e1e441 100755
--- a/git-bisect.sh
+++ b/git-bisect.sh
@@ -1,15 +1,25 @@
 #!/bin/sh
-. git-sh-setup || dir "Not a git archive"
 
-usage() {
-    echo >&2 'usage: git bisect [start|bad|good|next|reset|visualize]
-git bisect start		reset bisect state and start bisection.
+USAGE='[start|bad|good|next|reset|visualize]'
+LONG_USAGE='git bisect start [<pathspec>]	reset bisect state and start bisection.
 git bisect bad [<rev>]		mark <rev> a known-bad revision.
 git bisect good [<rev>...]	mark <rev>... known-good revisions.
 git bisect next			find next bisection to test and check it out.
 git bisect reset [<branch>]	finish bisection search and go back to branch.
-git bisect visualize            show bisect status in gitk.'
-    exit 1
+git bisect visualize            show bisect status in gitk.
+git bisect replay <logfile>	replay bisection log
+git bisect log			show bisect log.'
+
+. git-sh-setup
+
+sq() {
+	perl -e '
+		for (@ARGV) {
+			s/'\''/'\'\\\\\'\''/g;
+			print " '\''$_'\''";
+		}
+		print "\n";
+	' "$@"
 }
 
 bisect_autostart() {
@@ -31,12 +41,12 @@ bisect_autostart() {
 }
 
 bisect_start() {
-        case "$#" in 0) ;; *) usage ;; esac
 	#
 	# Verify HEAD. If we were bisecting before this, reset to the
 	# top-of-line master first!
 	#
-	head=$(readlink $GIT_DIR/HEAD) || die "Bad HEAD - I need a symlink"
+	head=$(GIT_DIR="$GIT_DIR" git-symbolic-ref HEAD) ||
+	die "Bad HEAD - I need a symbolic ref"
 	case "$head" in
 	refs/heads/bisect*)
 		git checkout master || exit
@@ -44,7 +54,7 @@ bisect_start() {
 	refs/heads/*)
 		;;
 	*)
-		die "Bad HEAD - strange symlink"
+		die "Bad HEAD - strange symbolic ref"
 		;;
 	esac
 
@@ -54,6 +64,11 @@ bisect_start() {
 	rm -f "$GIT_DIR/refs/heads/bisect"
 	rm -rf "$GIT_DIR/refs/bisect/"
 	mkdir "$GIT_DIR/refs/bisect"
+	{
+	    printf "git-bisect start"
+	    sq "$@"
+	} >"$GIT_DIR/BISECT_LOG"
+	sq "$@" >"$GIT_DIR/BISECT_NAMES"
 }
 
 bisect_bad() {
@@ -66,7 +81,9 @@ bisect_bad() {
 	*)
 		usage ;;
 	esac || exit
-	echo "$rev" > "$GIT_DIR/refs/bisect/bad"
+	echo "$rev" >"$GIT_DIR/refs/bisect/bad"
+	echo "# bad: "$(git-show-branch $rev) >>"$GIT_DIR/BISECT_LOG"
+	echo "git-bisect bad $rev" >>"$GIT_DIR/BISECT_LOG"
 	bisect_auto_next
 }
 
@@ -81,6 +98,8 @@ bisect_good() {
 	do
 		rev=$(git-rev-parse --verify "$rev") || exit
 		echo "$rev" >"$GIT_DIR/refs/bisect/good-$rev"
+		echo "# good: "$(git-show-branch $rev) >>"$GIT_DIR/BISECT_LOG"
+		echo "git-bisect good $rev" >>"$GIT_DIR/BISECT_LOG"
 	done
 	bisect_auto_next
 }
@@ -103,7 +122,7 @@ bisect_next_check() {
 }
 
 bisect_auto_next() {
-	bisect_next_check && bisect_next
+	bisect_next_check && bisect_next || :
 }
 
 bisect_next() {
@@ -113,7 +132,7 @@ bisect_next() {
 	bad=$(git-rev-parse --verify refs/bisect/bad) &&
 	good=$(git-rev-parse --sq --revs-only --not \
 		$(cd "$GIT_DIR" && ls refs/bisect/good-*)) &&
-	rev=$(eval "git-rev-list --bisect $good $bad") || exit
+	rev=$(eval "git-rev-list --bisect $good $bad -- $(cat $GIT_DIR/BISECT_NAMES)") || exit
 	if [ -z "$rev" ]; then
 	    echo "$bad was both good and bad"
 	    exit 1
@@ -123,17 +142,19 @@ bisect_next() {
 	    git-diff-tree --pretty $rev
 	    exit 0
 	fi
-	nr=$(eval "git-rev-list $rev $good" | wc -l) || exit
+	nr=$(eval "git-rev-list $rev $good -- $(cat $GIT_DIR/BISECT_NAMES)" | wc -l) || exit
 	echo "Bisecting: $nr revisions left to test after this"
 	echo "$rev" > "$GIT_DIR/refs/heads/new-bisect"
 	git checkout new-bisect || exit
 	mv "$GIT_DIR/refs/heads/new-bisect" "$GIT_DIR/refs/heads/bisect" &&
-	ln -sf refs/heads/bisect "$GIT_DIR/HEAD"
+	GIT_DIR="$GIT_DIR" git-symbolic-ref HEAD refs/heads/bisect
+	git-show-branch "$rev"
 }
 
 bisect_visualize() {
 	bisect_next_check fail
-	gitk bisect/bad --not `cd "$GIT_DIR/refs" && echo bisect/good-*`
+	not=`cd "$GIT_DIR/refs" && echo bisect/good-*`
+	eval gitk bisect/bad --not $not -- $(cat "$GIT_DIR/BISECT_NAMES")
 }
 
 bisect_reset() {
@@ -149,7 +170,40 @@ bisect_reset() {
 	esac
 	git checkout "$branch" &&
 	rm -fr "$GIT_DIR/refs/bisect"
-	rm -f "$GIT_DIR/refs/reads/bisect"
+	rm -f "$GIT_DIR/refs/heads/bisect"
+	rm -f "$GIT_DIR/BISECT_LOG"
+}
+
+bisect_replay () {
+	test -r "$1" || {
+		echo >&2 "cannot read $1 for replaying"
+		exit 1
+	}
+	bisect_reset
+	while read bisect command rev
+	do
+		test "$bisect" = "git-bisect" || continue
+		case "$command" in
+		start)
+			cmd="bisect_start $rev"
+			eval "$cmd"
+			;;
+		good)
+			echo "$rev" >"$GIT_DIR/refs/bisect/good-$rev"
+			echo "# good: "$(git-show-branch $rev) >>"$GIT_DIR/BISECT_LOG"
+			echo "git-bisect good $rev" >>"$GIT_DIR/BISECT_LOG"
+			;;
+		bad)
+			echo "$rev" >"$GIT_DIR/refs/bisect/bad"
+			echo "# bad: "$(git-show-branch $rev) >>"$GIT_DIR/BISECT_LOG"
+			echo "git-bisect bad $rev" >>"$GIT_DIR/BISECT_LOG"
+			;;
+		*)
+			echo >&2 "?? what are you talking about?"
+			exit 1 ;;
+		esac
+	done <"$1"
+	bisect_auto_next
 }
 
 case "$#" in
@@ -172,6 +226,10 @@ case "$#" in
 	bisect_visualize "$@" ;;
     reset)
         bisect_reset "$@" ;;
+    replay)
+	bisect_replay "$@" ;;
+    log)
+	cat "$GIT_DIR/BISECT_LOG" ;;
     *)
         usage ;;
     esac