[PATCH] Bisect reset: remove bisect refs that may have been packed.
From: Christian Couder <hidden>
Date: 2016-06-15 22:43:51
Subsystem:
the rest · Maintainer:
Linus Torvalds
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 <redacted> --- git-bisect.sh | 11 ++++++++++- t/t6030-bisect-porcelain.sh | 12 ++++++++++++ 2 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/git-bisect.sh b/git-bisect.sh
index 3aac816..73a4da2 100755
--- a/git-bisect.sh
+++ b/git-bisect.sh@@ -352,7 +352,16 @@ 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/*" | while read ref hash + do + git update-ref -d $ref $hash + done + + hash=$(git show-ref --hash refs/heads/bisect) + git update-ref -d refs/heads/bisect $hash rm -f "$GIT_DIR/BISECT_LOG" rm -f "$GIT_DIR/BISECT_NAMES" rm -f "$GIT_DIR/BISECT_RUN"
diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh
index 53956c0..f09db62 100755
--- a/t/t6030-bisect-porcelain.sh
+++ b/t/t6030-bisect-porcelain.sh@@ -71,6 +71,18 @@ test_expect_success 'bisect start with one bad and good' ' git bisect next ' +test_expect_success 'bisect reset removes packed refs' ' + git bisect reset && + git bisect start && + git bisect good $HASH1 && + git bisect bad $HASH3 && + git pack-refs --all --prune && + git bisect next && + git bisect reset && + test -z "$(git for-each-ref "refs/bisect/*")" && + test -z "$(git for-each-ref "refs/heads/bisect")" +' + # $HASH1 is good, $HASH4 is bad, we skip $HASH3 # but $HASH2 is bad, # so we should find $HASH2 as the first bad commit
--
1.5.3.5.1728.g34b3e-dirty