diff options
| author | Petr Baudis <pasky@suse.cz> | 2006-10-16 02:59:25 +0200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-10-16 23:04:05 -0700 |
| commit | 9b709e47ae46079efe1d7858580dcf5b8cf6ea33 (patch) | |
| tree | a3050a689dbc9d46407630d708baee7af5cf4ed3 /git-bisect.sh | |
| parent | 3453f862e1c74e400da67def9b810300ef90c3ac (diff) | |
| download | git-9b709e47ae46079efe1d7858580dcf5b8cf6ea33.tar.gz | |
bisect reset: Leave the tree in usable state if git-checkout failed
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>
Diffstat (limited to 'git-bisect.sh')
| -rwxr-xr-x | git-bisect.sh | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/git-bisect.sh b/git-bisect.sh index 06a8d26945..6da31e87a0 100755 --- a/git-bisect.sh +++ b/git-bisect.sh @@ -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 () { |