Merge branch 'pb/bisect'
* pb/bisect: bisect reset: Leave the tree in usable state if git-checkout failed
This commit is contained in:
commit
8719f93b56
@ -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 () {
|
||||
|
Loading…
Reference in New Issue
Block a user