diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-02-14 13:11:15 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-02-14 13:11:15 -0800 |
| commit | 97cc08f5827dea14476b5c0c9a6acb89945e87aa (patch) | |
| tree | f88fefa0b6554937ad904828c986eb44ad9c2423 /git-bisect.txt | |
| parent | bca4cd67b31ff555a6fff228e094f1d44b1a8306 (diff) | |
| download | git-htmldocs-97cc08f5827dea14476b5c0c9a6acb89945e87aa.tar.gz | |
Autogenerated HTML docs for v1.8.1.3-605-g0233
Diffstat (limited to 'git-bisect.txt')
| -rw-r--r-- | git-bisect.txt | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/git-bisect.txt b/git-bisect.txt index b4831bb0c..f986c5cb3 100644 --- a/git-bisect.txt +++ b/git-bisect.txt @@ -83,7 +83,7 @@ Bisect reset ~~~~~~~~~~~~ After a bisect session, to clean up the bisection state and return to -the original HEAD, issue the following command: +the original HEAD (i.e., to quit bisecting), issue the following command: ------------------------------------------------ $ git bisect reset @@ -284,6 +284,7 @@ EXAMPLES ------------ $ git bisect start HEAD v1.2 -- # HEAD is bad, v1.2 is good $ git bisect run make # "make" builds the app +$ git bisect reset # quit the bisect session ------------ * Automatically bisect a test failure between origin and HEAD: @@ -291,6 +292,7 @@ $ git bisect run make # "make" builds the app ------------ $ git bisect start HEAD origin -- # HEAD is bad, origin is good $ git bisect run make test # "make test" builds and tests +$ git bisect reset # quit the bisect session ------------ * Automatically bisect a broken test case: @@ -302,6 +304,7 @@ make || exit 125 # this skips broken builds ~/check_test_case.sh # does the test case pass? $ git bisect start HEAD HEAD~10 -- # culprit is among the last 10 $ git bisect run ~/test.sh +$ git bisect reset # quit the bisect session ------------ + Here we use a "test.sh" custom script. In this script, if "make" @@ -351,6 +354,7 @@ use `git cherry-pick` instead of `git merge`.) ------------ $ git bisect start HEAD HEAD~10 -- # culprit is among the last 10 $ git bisect run sh -c "make || exit 125; ~/check_test_case.sh" +$ git bisect reset # quit the bisect session ------------ + This shows that you can do without a run script if you write the test @@ -368,6 +372,7 @@ $ git bisect run sh -c ' rm -f tmp.$$ test $rc = 0' +$ git bisect reset # quit the bisect session ------------ + In this case, when 'git bisect run' finishes, bisect/bad will refer to a commit that |