Merge branch 'gl/cleanup' into gl/cleanup-next

diff --git a/git-bisect.sh b/git-bisect.sh
index 3c024aae73430f1927e65c925135d3030cb43f10..06a8d26945a679b06438308ceb96c69cd76c43db 100755 (executable)
--- a/git-bisect.sh
+++ b/git-bisect.sh
@@ -13,7 +13,7 @@ git bisect log                        show bisect log.'
 . git-sh-setup
 
 sq() {
-       perl -e '
+       @@PERL@@ -e '
                for (@ARGV) {
                        s/'\''/'\'\\\\\'\''/g;
                        print " '\''$_'\''";
@@ -183,6 +183,7 @@ bisect_reset() {
        rm -fr "$GIT_DIR/refs/bisect"
        rm -f "$GIT_DIR/refs/heads/bisect" "$GIT_DIR/head-name"
        rm -f "$GIT_DIR/BISECT_LOG"
+       rm -f "$GIT_DIR/BISECT_NAMES"
 }
 
 bisect_replay () {