Merge branch 'pb/bisect'

* pb/bisect: bisect reset: Leave the tree in usable state if git-checkout failed
19 years ago · 8719f93b56
1 changed files with 6 additions and 5 deletions
--- a/git-bisect.sh
+++ b/git-bisect.sh
@ -179,11 +179,12 @@ bisect_reset() {
				@@ -179,11 +179,12 @@ bisect_reset() {
        *)
 	    usage ;;
 	esac
-	git checkout "$branch" &&
-	rm -fr "$GIT_DIR/refs/bisect"
-	rm -f "$GIT_DIR/refs/heads/bisect" "$GIT_DIR/head-name"
-	rm -f "$GIT_DIR/BISECT_LOG"
-	rm -f "$GIT_DIR/BISECT_NAMES"
+	if git checkout "$branch"; then
+		rm -fr "$GIT_DIR/refs/bisect"
+		rm -f "$GIT_DIR/refs/heads/bisect" "$GIT_DIR/head-name"
+		rm -f "$GIT_DIR/BISECT_LOG"
+		rm -f "$GIT_DIR/BISECT_NAMES"
+	fi
 }

 bisect_replay () {