diff options
| author | Christian Couder <chriscool@tuxfamily.org> | 2007-11-18 16:34:03 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-18 16:35:55 -0800 |
| commit | 6459c7c6786aa9bda0c7a095c9db66c36da0e5f0 (patch) | |
| tree | 2173036d1369eda6d14be4a167e5b605e5541d07 /git-bisect.sh | |
| parent | e3f062bfd412adafb7ed6a8f24a3ec89d39211fc (diff) | |
| download | git-6459c7c6786aa9bda0c7a095c9db66c36da0e5f0.tar.gz git-6459c7c6786aa9bda0c7a095c9db66c36da0e5f0.tar.xz | |
Bisect: use "$GIT_DIR/BISECT_NAMES" to check if we are bisecting.
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>
Diffstat (limited to 'git-bisect.sh')
| -rwxr-xr-x | git-bisect.sh | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/git-bisect.sh b/git-bisect.sh index 2b20037a1..414f813be 100755 --- a/git-bisect.sh +++ b/git-bisect.sh @@ -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 @@ -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. @@ -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 ' } @@ -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 |