Bisect reset: remove bisect refs that may have been packed.

diff --git a/git-bisect.sh b/git-bisect.sh
index 1ed44e56ad5021a74b2a0ec3e91849e55d4a67ce..46a7b8d54a5ccec26c322c19ec821d71af317cf4 100755 (executable)
--- a/git-bisect.sh
+++ b/git-bisect.sh
@@ -351,7 +351,13 @@ bisect_reset() {
 
 bisect_clean_state() {
        rm -fr "$GIT_DIR/refs/bisect"
-       rm -f "$GIT_DIR/refs/heads/bisect"
+
+       # There may be some refs packed during bisection.
+       git for-each-ref --format='%(refname) %(objectname)' refs/bisect/\* refs/heads/bisect |
+       while read ref hash
+       do
+               git update-ref -d $ref $hash
+       done
        rm -f "$GIT_DIR/BISECT_LOG"
        rm -f "$GIT_DIR/BISECT_NAMES"
        rm -f "$GIT_DIR/BISECT_RUN"