diff options
author | Junio C Hamano <junio@hera.kernel.org> | 2007-10-31 05:57:20 +0000 |
---|---|---|
committer | Junio C Hamano <junio@hera.kernel.org> | 2007-10-31 05:57:20 +0000 |
commit | 1974bf2632180e353120c4cd1dca476df26c5bc0 (patch) | |
tree | 39039cbcca848350765016f3ed12085d5db69612 /git-bisect.html | |
parent | fb4fa4ebbe0c116c4dbc060c9d1f3b2f1e84e0bd (diff) | |
download | git-htmldocs-1974bf2632180e353120c4cd1dca476df26c5bc0.tar.gz |
Autogenerated HTML docs for v1.5.3.4-498-g9c514
Diffstat (limited to 'git-bisect.html')
-rw-r--r-- | git-bisect.html | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/git-bisect.html b/git-bisect.html index 105681297..87f8c1665 100644 --- a/git-bisect.html +++ b/git-bisect.html @@ -281,8 +281,9 @@ on the subcommand:</p> <div class="literalblock">
<div class="content">
<pre><tt>git bisect start [<bad> [<good>...]] [--] [<paths>...]
-git bisect bad <rev>
-git bisect good <rev>
+git bisect bad [<rev>]
+git bisect good [<rev>...]
+git bisect skip [<rev>...]
git bisect reset [<branch>]
git bisect visualize
git bisect replay <logfile>
@@ -372,6 +373,16 @@ $ git reset --hard HEAD~3 # try 3 revs before what </div></div>
<p>Then compile and test the one you chose to try. After that, tell
bisect what the result was as usual.</p>
+<h3>Bisect skip</h3>
+<p>Instead of choosing by yourself a nearby commit, you may just want git
+to do it for you using:</p>
+<div class="listingblock">
+<div class="content">
+<pre><tt>$ git bisect skip # Current version cannot be tested</tt></pre>
+</div></div>
+<p>But computing the commit to test may be slower afterwards and git may
+eventually not be able to tell the first bad among a bad and one or
+more "skip"ped commits.</p>
<h3>Cutting down bisection by giving more parameters to bisect start</h3>
<p>You can further cut down the number of trials if you know what part of
the tree is involved in the problem you are tracking down, by giving
@@ -398,12 +409,15 @@ or bad, you can automatically bisect using:</p> <pre><tt>$ git bisect run my_script</tt></pre>
</div></div>
<p>Note that the "run" script (<tt>my_script</tt> in the above example) should
-exit with code 0 in case the current source code is good and with a
-code between 1 and 127 (included) in case the current source code is
-bad.</p>
+exit with code 0 in case the current source code is good. Exit with a
+code between 1 and 127 (inclusive), except 125, if the current
+source code is bad.</p>
<p>Any other exit code will abort the automatic bisect process. (A
program that does "exit(-1)" leaves $? = 255, see exit(3) manual page,
the value is chopped with "& 0377".)</p>
+<p>The special exit code 125 should be used when the current source code
+cannot be tested. If the "run" script exits with this code, the current
+revision will be skipped, see <tt>git bisect skip</tt> above.</p>
<p>You may often find that during bisect you want to have near-constant
tweaks (e.g., s/#define DEBUG 0/#define DEBUG 1/ in a header file, or
"revision that does not have this commit needs this patch applied to
@@ -431,7 +445,7 @@ know the outcome.</p> </div>
<div id="footer">
<div id="footer-text">
-Last updated 19-Jul-2007 02:09:31 UTC
+Last updated 31-Oct-2007 05:56:47 UTC
</div>
</div>
</body>
|