From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jon Seymour Subject: [PATCH v13 0/8] bisect: Add support for --no-checkout option Date: Tue, 2 Aug 2011 21:28:57 +1000 Message-ID: <1312284545-2426-1-git-send-email-jon.seymour@gmail.com> Cc: chriscool@tuxfamily.org, gitster@pobox.com, j6t@kdbg.org, jnareb@gmail.com, Jon Seymour To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Tue Aug 02 13:30:11 2011 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1QoDAl-0004Rs-HH for gcvg-git-2@lo.gmane.org; Tue, 02 Aug 2011 13:30:07 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753993Ab1HBLaD (ORCPT ); Tue, 2 Aug 2011 07:30:03 -0400 Received: from mail-gx0-f174.google.com ([209.85.161.174]:34550 "EHLO mail-gx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753971Ab1HBL3v (ORCPT ); Tue, 2 Aug 2011 07:29:51 -0400 Received: by gxk21 with SMTP id 21so3980572gxk.19 for ; Tue, 02 Aug 2011 04:29:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; bh=dwq1WWxRHy/+nKTUz2Ttqwx15+BxarRUSdudYbJSYAs=; b=x70OisTVgGNqMaGI/LEidFDz75ty93pLeu6ZaP34qQ1XulBlIsSaj1tUlkZYMwYv78 Sv9juqUT8xVthn6ye3O0thBEpsMjcWJ8NmIc32XEgj2lZxc6+e4gGqu6CE/bBffhnI64 Nbeecnfgavm9E97cSX3d9yy2wS5RSZ1h7Bmj0= Received: by 10.143.60.20 with SMTP id n20mr3452134wfk.421.1312284590730; Tue, 02 Aug 2011 04:29:50 -0700 (PDT) Received: from localhost.localdomain ([120.16.93.94]) by mx.google.com with ESMTPS id t20sm3715018wfe.12.2011.08.02.04.29.46 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 02 Aug 2011 04:29:49 -0700 (PDT) X-Mailer: git-send-email 1.7.6.353.g3461 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Motivation ========== For some bisection tasks, checking out the commit at each stage of the bisection process is unecessary or undesirable. This series adds support for a --no-checkout option to git-bisect. If specified on a start command, --no-checkout causes 'git bisect' to update HEAD at each stage of the bisection process instead of checking out the commit at that point. One application of the --no-checkout option is to find, within a partially damaged repository, a commit that has at least one parent whose graph is fully reachable in the sense of 'git pack-objects'. For example: git bisect start BISECT_HEAD --no-checkout git bisect run eval ' rc=1; if git rev-list --objects BISECT_HEAD >tmp.$$; then git pack-objects --stdout >/dev/null < tmp.$$ && rc=0; fi; rm tmp.$$; test $rc -eq 0;' is a known good commit, for which the test passes. are commits chosen to prevent the bisection visiting missing or corrupt commit objects. Assuming this git bisect run completes successfully, bisect/bad will refer to a commit which has at least one parent that is fully reachable in the sense of 'git pack-objects'. Patch Synopsis ============== Remediation ----------- Patch 1/8 changes existing behaviour in the case that an invalid revision argument is supplied to 'git bisect start'. In particular, in this case, bisection state is neither created or modified if argument validation fails. Previously, existing bisection state would be cleared even if the revision arguments were subsequently determined to be invalid. Patch 2/8 remediates a potential flaw that might hide a failure in a chain of pasted statements. Patch 3/8 adds a test which documents the existing behaviour of git bisect in the presence of tree damage. New Function ------------ Patch 4/8 modifies the C code that supports bisection. Patch 5/8 modifies porcelain to enable option exposed by 4/8. Patch 6/8 adds some tests. Patch 7/8 adds some documentation. Patch 8/8 --no-checkout bisections now update BISECT_HEAD rather than HEAD. Revision History ---------------- v13: Following suggestions from Junio: * Replaced BISECT_NO_CHECKOUT control file with BISECT_MODE. * Changed name of internal option on bisect--helper from --no-checkout to --bisect-mode=checkout|update-ref. * Changed --no-checkout bisections to update BISECT_HEAD instead of HEAD. v11: Removed support for --update-ref=, per Junio's preference. v10: Changed the way deferred statements are connected. Reverted some whitespace minimization. v8: Further feedback from Christian Couder. Support --update-ref . v6: This series includes numerous improvements suggested by Christian Couder. Reworks: "bisect: allow git bisect to be used with repos containing damaged trees." Replaced --ignore-checkout-failure with --no-checkout option suggested by Junio. Jon Seymour (8): bisect: move argument parsing before state modification. bisect: use && to connect statements that are deferred with eval. bisect: add tests to document expected behaviour in presence of broken trees. bisect: introduce support for --no-checkout option. bisect: introduce --no-checkout support into porcelain. bisect: add tests for the --no-checkout option. bisect: add documentation for --no-checkout option. bisect: change bisect function to update BISECT_HEAD, rather than HEAD. Documentation/git-bisect.txt | 32 ++++++++++- bisect.c | 33 +++++++---- bisect.h | 2 +- builtin/bisect--helper.c | 9 ++- git-bisect.sh | 113 ++++++++++++++++++++++-------------- t/t6030-bisect-porcelain.sh | 132 +++++++++++++++++++++++++++++++++++++++++- 6 files changed, 260 insertions(+), 61 deletions(-) -- 1.7.6.353.g3461