X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-bisect.sh;h=df0ae63b4e40f9aa7373269e9a7fb7eeeb66cd18;hb=f92f2038a5192ac5fc1bb4f38c49906aa45b3f1e;hp=e313bdea70d0a765106aa42a17a66f01d3d0f7d8;hpb=e785dadc90df20e1038c053dc168a6458b1e672b;p=git.git diff --git a/git-bisect.sh b/git-bisect.sh index e313bdea7..df0ae63b4 100755 --- a/git-bisect.sh +++ b/git-bisect.sh @@ -77,7 +77,7 @@ bisect_start() { then # Reset to the rev from where we started. start_head=$(cat "$GIT_DIR/BISECT_START") - git checkout "$start_head" || exit + git checkout "$start_head" -- || exit else # Get rev from where we start. case "$head" in @@ -370,7 +370,7 @@ bisect_checkout() { _msg="$2" echo "Bisecting: $_msg" mark_expected_rev "$_rev" - git checkout -q "$_rev" || exit + git checkout -q "$_rev" -- || exit git show-branch "$_rev" } @@ -549,7 +549,7 @@ bisect_reset() { *) usage ;; esac - git checkout "$branch" && bisect_clean_state + git checkout "$branch" -- && bisect_clean_state } bisect_clean_state() {