summaryrefslogtreecommitdiff
path: root/git-bisect.sh
diff options
context:
space:
mode:
authorChristian Couder <chriscool@tuxfamily.org>2007-11-15 07:18:07 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-11-16 09:35:58 (GMT)
commit947a604b01a8e81b3d0341d38fbf891289f3c0bb (patch)
tree129010894e4b33a3847d61fbb162482c946203ab /git-bisect.sh
parent41a7aa588f449d3b139480b102f510abc5ef7f85 (diff)
downloadgit-947a604b01a8e81b3d0341d38fbf891289f3c0bb.zip
git-947a604b01a8e81b3d0341d38fbf891289f3c0bb.tar.gz
git-947a604b01a8e81b3d0341d38fbf891289f3c0bb.tar.bz2
Bisect reset: remove bisect refs that may have been packed.
If refs were ever packed in the middle of bisection, the bisect refs were not removed from the "packed-refs" file. This patch fixes this problem by using "git update-ref -d $ref $hash" in "bisect_clean_state". Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-bisect.sh')
-rwxr-xr-xgit-bisect.sh8
1 files changed, 7 insertions, 1 deletions
diff --git a/git-bisect.sh b/git-bisect.sh
index 1ed44e5..46a7b8d 100755
--- 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"