git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jon Seymour <jon.seymour@gmail.com>
To: git@vger.kernel.org
Cc: chriscool@tuxfamily.org, gitster@pobox.com, j6t@kdbg.org,
	jnareb@gmail.com, Jon Seymour <jon.seymour@gmail.com>
Subject: [PATCH v8 6/7] bisect: add documentation for --no-checkout and --update-ref=<ref> options.
Date: Sun, 31 Jul 2011 21:55:20 +1000	[thread overview]
Message-ID: <1312113321-28760-7-git-send-email-jon.seymour@gmail.com> (raw)
In-Reply-To: <1312113321-28760-1-git-send-email-jon.seymour@gmail.com>

Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
---
 Documentation/git-bisect.txt |   34 +++++++++++++++++++++++++++++++++-
 1 files changed, 33 insertions(+), 1 deletions(-)

diff --git a/Documentation/git-bisect.txt b/Documentation/git-bisect.txt
index ab60a18..25a25b3 100644
--- a/Documentation/git-bisect.txt
+++ b/Documentation/git-bisect.txt
@@ -17,7 +17,7 @@ The command takes various subcommands, and different options depending
 on the subcommand:
 
  git bisect help
- git bisect start [<bad> [<good>...]] [--] [<paths>...]
+ git bisect start [--no-checkout|--update-ref=<ref>] [<bad> [<good>...]] [--] [<paths>...]
  git bisect bad [<rev>]
  git bisect good [<rev>...]
  git bisect skip [(<rev>|<range>)...]
@@ -263,6 +263,21 @@ rewind the tree to the pristine state.  Finally the script should exit
 with the status of the real test to let the "git bisect run" command loop
 determine the eventual outcome of the bisect session.
 
+OPTIONS
+-------
+--no-checkout::
++
+This option is a synonym for --update-ref=HEAD.
+
+--update-ref=<ref>::
++
+This option is used to specify that 'git bisect' should not modify the working
+tree or index on each iteration of the bisection process but should
+update the reference specified by <ref> instead.
++
+This option is useful in circumstances in which checkout is either not
+possible (because of a damaged respository) or is otherwise not required.
+
 EXAMPLES
 --------
 
@@ -343,6 +358,23 @@ $ git bisect run sh -c "make || exit 125; ~/check_test_case.sh"
 This shows that you can do without a run script if you write the test
 on a single line.
 
+* Locate a good region of the object graph in a damaged repository
++
+------------
+$ git bisect start HEAD <known-good-commit> [ <missing-or-damaged-commit> ... ] --no-checkout
+$ git bisect run eval '
+rc=1;
+if git rev-list --objects HEAD >tmp.$$; then
+   git pack-objects --stdout >/dev/null < tmp.$$ && rc=0;
+fi;
+rm tmp.$$;
+test $rc -eq 0;'
+
+------------
++
+In this case, when 'git bisect run' finishes, bisect/bad will refer to a commit that
+has at least one parent which is fully reachable in the sense of 'git pack-objects'.
+
 SEE ALSO
 --------
 link:git-bisect-lk2009.html[Fighting regressions with git bisect],
-- 
1.7.6.391.g168d0.dirty

  parent reply	other threads:[~2011-07-31 11:57 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-07-31 11:55 [PATCH v8 0/7] bisect: Add support for --no-checkout and --update-ref=<ref> options Jon Seymour
2011-07-31 11:55 ` [PATCH v8 1/7] bisect: move argument parsing before state modification Jon Seymour
2011-07-31 11:55 ` [PATCH v8 2/7] bisect: add tests to document expected behaviour in presence of broken trees Jon Seymour
2011-07-31 11:55 ` [PATCH v8 3/7] bisect: introduce support for --update-ref=<ref> option Jon Seymour
2011-07-31 11:55 ` [PATCH v8 4/7] bisect: introduce --no-checkout, --update-ref=<ref> support into porcelain Jon Seymour
2011-07-31 18:35   ` Christian Couder
2011-07-31 19:48     ` Jon Seymour
2011-07-31 20:05       ` Christian Couder
2011-07-31 19:21   ` Christian Couder
2011-07-31 19:40     ` Jon Seymour
2011-07-31 20:07       ` Christian Couder
2011-07-31 20:51         ` Christian Couder
2011-07-31 21:11         ` Jon Seymour
2011-07-31 11:55 ` [PATCH v8 5/7] bisect: add tests for the --no-checkout and --update-ref options Jon Seymour
2011-07-31 11:55 ` Jon Seymour [this message]
2011-07-31 11:55 ` [PATCH v8 7/7] bisect: support --update-ref <ref> Jon Seymour
2011-07-31 13:26 ` [PATCH v8 0/7] bisect: Add support for --no-checkout and --update-ref=<ref> options Jon Seymour

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1312113321-28760-7-git-send-email-jon.seymour@gmail.com \
    --to=jon.seymour@gmail.com \
    --cc=chriscool@tuxfamily.org \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=j6t@kdbg.org \
    --cc=jnareb@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).