make some more strings translatable

[TortoiseGit.git] / doc / source / en / TortoiseGit / git_doc / git-bisect.html.xml

<?xml version="1.0" encoding="UTF-8"?>\r
<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">\r
\r
<article lang="en" id="git-bisect(1)">\r
<articleinfo>\r
    <title>git-bisect(1)</title>\r
        <indexterm>\r
                <primary>git-bisect(1)</primary>\r
        </indexterm>\r
</articleinfo>\r
<simplesect id="_name">\r
<title>NAME</title>\r
<simpara>git-bisect - Find the change that introduced a bug by binary search</simpara>\r
</simplesect>\r
<simplesect id="_synopsis">\r
<title>SYNOPSIS</title>\r
<simpara><emphasis>git bisect</emphasis> &lt;subcommand&gt; &lt;options&gt;</simpara>\r
</simplesect>\r
<simplesect id="_description">\r
<title>DESCRIPTION</title>\r
<simpara>The command takes various subcommands, and different options depending\r
on the subcommand:</simpara>\r
<literallayout class="monospaced">git bisect help\r
git bisect start [&lt;bad&gt; [&lt;good&gt;...]] [--] [&lt;paths&gt;...]\r
git bisect bad [&lt;rev&gt;]\r
git bisect good [&lt;rev&gt;...]\r
git bisect skip [(&lt;rev&gt;|&lt;range&gt;)...]\r
git bisect reset [&lt;branch&gt;]\r
git bisect visualize\r
git bisect replay &lt;logfile&gt;\r
git bisect log\r
git bisect run &lt;cmd&gt;...</literallayout>\r
<simpara>This command uses <emphasis>git rev-list --bisect</emphasis> to help drive the\r
binary search process to find which change introduced a bug, given an\r
old "good" commit object name and a later "bad" commit object name.</simpara>\r
<simplesect id="_getting_help">\r
<title>Getting help</title>\r
<simpara>Use "git bisect" to get a short usage description, and "git bisect\r
help" or "git bisect -h" to get a long usage description.</simpara>\r
</simplesect>\r
<simplesect id="_basic_bisect_commands_start_bad_good">\r
<title>Basic bisect commands: start, bad, good</title>\r
<simpara>The way you use it is:</simpara>\r
<literallayout>$ git bisect start\r
$ git bisect bad                 # Current version is bad\r
$ git bisect good v2.6.13-rc2    # v2.6.13-rc2 was the last version\r
                                 # tested that was good</literallayout>\r
<simpara>When you give at least one bad and one good versions, it will bisect\r
the revision tree and say something like:</simpara>\r
<literallayout>Bisecting: 675 revisions left to test after this</literallayout>\r
<simpara>and check out the state in the middle. Now, compile that kernel, and\r
boot it. Now, let&#8217;s say that this booted kernel works fine, then just\r
do</simpara>\r
<literallayout>$ git bisect good                       # this one is good</literallayout>\r
<simpara>which will now say</simpara>\r
<literallayout>Bisecting: 337 revisions left to test after this</literallayout>\r
<simpara>and you continue along, compiling that one, testing it, and depending\r
on whether it is good or bad, you say "git bisect good" or "git bisect\r
bad", and ask for the next bisection.</simpara>\r
<simpara>Until you have no more left, and you&#8217;ll have been left with the first\r
bad kernel rev in "refs/bisect/bad".</simpara>\r
</simplesect>\r
<simplesect id="_bisect_reset">\r
<title>Bisect reset</title>\r
<simpara>Oh, and then after you want to reset to the original head, do a</simpara>\r
<literallayout>$ git bisect reset</literallayout>\r
<simpara>to get back to the original branch, instead of being on the bisection\r
commit ("git bisect start" will do that for you too, actually: it will\r
reset the bisection state).</simpara>\r
</simplesect>\r
<simplesect id="_bisect_visualize">\r
<title>Bisect visualize</title>\r
<simpara>During the bisection process, you can say</simpara>\r
<literallayout>$ git bisect visualize</literallayout>\r
<simpara>to see the currently remaining suspects in <emphasis>gitk</emphasis>.  <literal>visualize</literal> is a bit\r
too long to type and <literal>view</literal> is provided as a synonym.</simpara>\r
<simpara>If <emphasis>DISPLAY</emphasis> environment variable is not set, <emphasis>git log</emphasis> is used\r
instead.  You can even give command line options such as <literal>-p</literal> and\r
<literal>--stat</literal>.</simpara>\r
<literallayout>$ git bisect view --stat</literallayout>\r
</simplesect>\r
<simplesect id="_bisect_log_and_bisect_replay">\r
<title>Bisect log and bisect replay</title>\r
<simpara>The good/bad input is logged, and</simpara>\r
<literallayout>$ git bisect log</literallayout>\r
<simpara>shows what you have done so far. You can truncate its output somewhere\r
and save it in a file, and run</simpara>\r
<literallayout>$ git bisect replay that-file</literallayout>\r
<simpara>if you find later you made a mistake telling good/bad about a\r
revision.</simpara>\r
</simplesect>\r
<simplesect id="_avoiding_to_test_a_commit">\r
<title>Avoiding to test a commit</title>\r
<simpara>If in a middle of bisect session, you know what the bisect suggested\r
to try next is not a good one to test (e.g. the change the commit\r
introduces is known not to work in your environment and you know it\r
does not have anything to do with the bug you are chasing), you may\r
want to find a near-by commit and try that instead.</simpara>\r
<simpara>It goes something like this:</simpara>\r
<literallayout>$ git bisect good/bad                   # previous round was good/bad.\r
Bisecting: 337 revisions left to test after this\r
$ git bisect visualize                  # oops, that is uninteresting.\r
$ git reset --hard HEAD~3               # try 3 revs before what\r
                                        # was suggested</literallayout>\r
<simpara>Then compile and test the one you chose to try. After that, tell\r
bisect what the result was as usual.</simpara>\r
</simplesect>\r
<simplesect id="_bisect_skip">\r
<title>Bisect skip</title>\r
<simpara>Instead of choosing by yourself a nearby commit, you may just want git\r
to do it for you using:</simpara>\r
<literallayout>$ git bisect skip                 # Current version cannot be tested</literallayout>\r
<simpara>But computing the commit to test may be slower afterwards and git may\r
eventually not be able to tell the first bad among a bad and one or\r
more "skip"ped commits.</simpara>\r
<simpara>You can even skip a range of commits, instead of just one commit,\r
using the "<emphasis>&lt;commit1&gt;</emphasis>..<emphasis>&lt;commit2&gt;</emphasis>" notation. For example:</simpara>\r
<literallayout>$ git bisect skip v2.5..v2.6</literallayout>\r
<simpara>would mean that no commit between <literal>v2.5</literal> excluded and <literal>v2.6</literal> included\r
can be tested.</simpara>\r
<simpara>Note that if you want to also skip the first commit of a range you can\r
use something like:</simpara>\r
<literallayout>$ git bisect skip v2.5 v2.5..v2.6</literallayout>\r
<simpara>and the commit pointed to by <literal>v2.5</literal> will be skipped too.</simpara>\r
</simplesect>\r
<simplesect id="_cutting_down_bisection_by_giving_more_parameters_to_bisect_start">\r
<title>Cutting down bisection by giving more parameters to bisect start</title>\r
<simpara>You can further cut down the number of trials if you know what part of\r
the tree is involved in the problem you are tracking down, by giving\r
paths parameters when you say <literal>bisect start</literal>, like this:</simpara>\r
<literallayout>$ git bisect start -- arch/i386 include/asm-i386</literallayout>\r
<simpara>If you know beforehand more than one good commits, you can narrow the\r
bisect space down without doing the whole tree checkout every time you\r
give good commits. You give the bad revision immediately after <literal>start</literal>\r
and then you give all the good revisions you have:</simpara>\r
<literallayout>$ git bisect start v2.6.20-rc6 v2.6.20-rc4 v2.6.20-rc1 --\r
                   # v2.6.20-rc6 is bad\r
                   # v2.6.20-rc4 and v2.6.20-rc1 are good</literallayout>\r
</simplesect>\r
<simplesect id="_bisect_run">\r
<title>Bisect run</title>\r
<simpara>If you have a script that can tell if the current source code is good\r
or bad, you can automatically bisect using:</simpara>\r
<literallayout>$ git bisect run my_script</literallayout>\r
<simpara>Note that the "run" script (<literal>my_script</literal> in the above example) should\r
exit with code 0 in case the current source code is good.  Exit with a\r
code between 1 and 127 (inclusive), except 125, if the current\r
source code is bad.</simpara>\r
<simpara>Any other exit code will abort the automatic bisect process. (A\r
program that does "exit(-1)" leaves $? = 255, see exit(3) manual page,\r
the value is chopped with "&amp; 0377".)</simpara>\r
<simpara>The special exit code 125 should be used when the current source code\r
cannot be tested. If the "run" script exits with this code, the current\r
revision will be skipped, see <literal>git bisect skip</literal> above.</simpara>\r
<simpara>You may often find that during bisect you want to have near-constant\r
tweaks (e.g., s/#define DEBUG 0/#define DEBUG 1/ in a header file, or\r
"revision that does not have this commit needs this patch applied to\r
work around other problem this bisection is not interested in")\r
applied to the revision being tested.</simpara>\r
<simpara>To cope with such a situation, after the inner <emphasis>git bisect</emphasis> finds the\r
next revision to test, with the "run" script, you can apply that tweak\r
before compiling, run the real test, and after the test decides if the\r
revision (possibly with the needed tweaks) passed the test, rewind the\r
tree to the pristine state.  Finally the "run" script can exit with\r
the status of the real test to let the "git bisect run" command loop to\r
determine the outcome.</simpara>\r
</simplesect>\r
</simplesect>\r
<simplesect id="_examples">\r
<title>EXAMPLES</title>\r
<itemizedlist>\r
<listitem>\r
<simpara>\r
Automatically bisect a broken build between v1.2 and HEAD:\r
</simpara>\r
<literallayout>$ git bisect start HEAD v1.2 --      # HEAD is bad, v1.2 is good\r
$ git bisect run make                # "make" builds the app</literallayout>\r
</listitem>\r
<listitem>\r
<simpara>\r
Automatically bisect a broken test suite:\r
</simpara>\r
<literallayout>$ cat ~/test.sh\r
#!/bin/sh\r
make || exit 125                   # this "skip"s broken builds\r
make test                          # "make test" runs the test suite\r
$ git bisect start v1.3 v1.1 --    # v1.3 is bad, v1.1 is good\r
$ git bisect run ~/test.sh</literallayout>\r
<simpara>Here we use a "test.sh" custom script. In this script, if "make"\r
fails, we "skip" the current commit.</simpara>\r
<simpara>It&#8217;s safer to use a custom script outside the repo to prevent\r
interactions between the bisect, make and test processes and the\r
script.</simpara>\r
<simpara>And "make test" should "exit 0", if the test suite passes, and\r
"exit 1" (for example) otherwise.</simpara>\r
</listitem>\r
<listitem>\r
<simpara>\r
Automatically bisect a broken test case:\r
</simpara>\r
<literallayout>$ cat ~/test.sh\r
#!/bin/sh\r
make || exit 125                     # this "skip"s broken builds\r
~/check_test_case.sh                 # does the test case passes ?\r
$ git bisect start HEAD HEAD~10 --   # culprit is among the last 10\r
$ git bisect run ~/test.sh</literallayout>\r
<simpara>Here "check_test_case.sh" should "exit 0", if the test case passes,\r
and "exit 1" (for example) otherwise.</simpara>\r
<simpara>It&#8217;s safer if both "test.sh" and "check_test_case.sh" scripts are\r
outside the repo to prevent interactions between the bisect, make and\r
test processes and the scripts.</simpara>\r
</listitem>\r
</itemizedlist>\r
</simplesect>\r
<simplesect id="_author">\r
<title>Author</title>\r
<simpara>Written by Linus Torvalds &lt;<ulink url="mailto:torvalds@osdl.org">torvalds@osdl.org</ulink>&gt;</simpara>\r
</simplesect>\r
<simplesect id="_documentation">\r
<title>Documentation</title>\r
<simpara>Documentation by Junio C Hamano and the git-list &lt;<ulink url="mailto:git@vger.kernel.org">git@vger.kernel.org</ulink>&gt;.</simpara>\r
</simplesect>\r
<simplesect id="_git">\r
<title>GIT</title>\r
<simpara>Part of the <xref linkend="git(1)"/> suite</simpara>\r
</simplesect>\r
</article>\r