undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bisect reset: Leave the tree in usable state if git-checkout failed

Browse Source 
I had local modifications in the tree and doing bisect reset required me to
manually edit .git/HEAD.

Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Petr Baudis 2006-10-16 02:59:25 +02:00 committed by Junio C Hamano
parent 3453f862e1
commit 9b709e47ae
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
git-bisect.sh
View File

@ -179,11 +179,12 @@ bisect_reset() {
*) *)
usage ;; usage ;;
esac esac
git checkout "$branch" && if git checkout "$branch"; then
rm -fr "$GIT_DIR/refs/bisect" rm -fr "$GIT_DIR/refs/bisect"
rm -f "$GIT_DIR/refs/heads/bisect" "$GIT_DIR/head-name" rm -f "$GIT_DIR/refs/heads/bisect" "$GIT_DIR/head-name"
rm -f "$GIT_DIR/BISECT_LOG" rm -f "$GIT_DIR/BISECT_LOG"
rm -f "$GIT_DIR/BISECT_NAMES" rm -f "$GIT_DIR/BISECT_NAMES"
fi
} }
bisect_replay () { bisect_replay () {