Skip to content

Commit

Permalink
Bisect: use "$GIT_DIR/BISECT_NAMES" to check if we are bisecting.
Browse files Browse the repository at this point in the history
Previously we tested if the "$GIT_DIR/refs/bisect" directory
existed, to check if we were bisecting.

Now with packed refs, it is simpler to check if the file
"$GIT_DIR/BISECT_NAMES" exists, as it is already created when
starting bisection and removed when reseting bisection.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Christian Couder authored and Junio C Hamano committed Nov 19, 2007
1 parent e3f062b commit 6459c7c
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions git-bisect.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ sq() {
}

bisect_autostart() {
test -d "$GIT_DIR/refs/bisect" || {
test -f "$GIT_DIR/BISECT_NAMES" || {
echo >&2 'You need to start by "git bisect start"'
if test -t 0
then
Expand Down Expand Up @@ -82,7 +82,6 @@ bisect_start() {
# Get rid of any old bisect state
#
bisect_clean_state
mkdir "$GIT_DIR/refs/bisect"

#
# Check for one bad and then some good revisions.
Expand Down Expand Up @@ -191,7 +190,7 @@ bisect_next_check() {
;;
*)
THEN=''
test -d "$GIT_DIR/refs/bisect" || {
test -f "$GIT_DIR/BISECT_NAMES" || {
echo >&2 'You need to start by "git bisect start".'
THEN='then '
}
Expand Down Expand Up @@ -348,8 +347,6 @@ bisect_reset() {
}

bisect_clean_state() {
rm -fr "$GIT_DIR/refs/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
Expand Down

0 comments on commit 6459c7c

Please sign in to comment.