diff options
| author | Peter Anvin <hpa@tazenda.sc.orionmulti.com> | 2005-10-03 12:04:44 -0700 |
|---|---|---|
| committer | Peter Anvin <hpa@tazenda.sc.orionmulti.com> | 2005-10-03 12:04:44 -0700 |
| commit | 79a9d8ea0d88a3667ad19be8e705405ab5d896f1 (patch) | |
| tree | 15d04fe258e969f2a43aaff3c292286984d0147c /git-bisect.sh | |
| parent | 039c6f162a63e9d91f360e2e6138e21a4015c543 (diff) | |
| parent | baaac6a7143ad07de62926421f8740cd640c241c (diff) | |
| download | git-79a9d8ea0d88a3667ad19be8e705405ab5d896f1.tar.xz | |
Merge with master.kernel.org:/pub/scm/git/git.git
Diffstat (limited to 'git-bisect.sh')
| -rwxr-xr-x | git-bisect.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/git-bisect.sh b/git-bisect.sh index 8dc77c991c..1ab2f187dc 100755 --- a/git-bisect.sh +++ b/git-bisect.sh @@ -38,7 +38,8 @@ bisect_start() { # Verify HEAD. If we were bisecting before this, reset to the # top-of-line master first! # - head=$(readlink $GIT_DIR/HEAD) || die "Bad HEAD - I need a symlink" + head=$(GIT_DIR="$GIT_DIR" git-symbolic-ref HEAD) || + die "Bad HEAD - I need a symbolic ref" case "$head" in refs/heads/bisect*) git checkout master || exit @@ -46,7 +47,7 @@ bisect_start() { refs/heads/*) ;; *) - die "Bad HEAD - strange symlink" + die "Bad HEAD - strange symbolic ref" ;; esac @@ -135,7 +136,7 @@ bisect_next() { echo "$rev" > "$GIT_DIR/refs/heads/new-bisect" git checkout new-bisect || exit mv "$GIT_DIR/refs/heads/new-bisect" "$GIT_DIR/refs/heads/bisect" && - ln -sf refs/heads/bisect "$GIT_DIR/HEAD" + GIT_DIR="$GIT_DIR" git-symbolic-ref HEAD refs/heads/bisect git-show-branch "$rev" } |