From: Jon Seymour Date: Sun, 24 Jul 2011 05:57:50 GMT Subject: [PATCH 5/9] bisect: replace existing calls to git checkout with bisect_checkout_with_ignore Message-ID: <1311487074-25070-6-git-send-email-jon.seymour@gmail.com> In-Reply-To: <1311487074-25070-1-git-send-email-jon.seymour@gmail.com> Signed-off-by: Jon Seymour --- git-bisect.sh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/git-bisect.sh b/git-bisect.sh index 486a860..ecbd5bf 100755 --- a/git-bisect.sh +++ b/git-bisect.sh @@ -76,7 +76,7 @@ bisect_start() { then # Reset to the rev from where we started. start_head=$(cat "$GIT_DIR/BISECT_START") - git checkout "$start_head" -- || exit + bisect_checkout_with_ignore "$start_head" else # Get rev from where we start. case "$head" in @@ -359,7 +359,7 @@ bisect_reset() { *) usage ;; esac - if git checkout "$branch" -- ; then + if ( bisect_checkout_with_ignore "$branch" ) ; then bisect_clean_state else die "$(eval_gettext "Could not check out original HEAD '\$branch'. -- 1.7.6.347.g96e0b.dirty