@@ -83,7 +83,7 @@ Bisect reset
83
83
~~~~~~~~~~~~
84
84
85
85
After a bisect session, to clean up the bisection state and return to
86
- the original HEAD, issue the following command:
86
+ the original HEAD (i.e., to quit bisecting) , issue the following command:
87
87
88
88
------------------------------------------------
89
89
$ git bisect reset
@@ -284,13 +284,15 @@ EXAMPLES
284
284
------------
285
285
$ git bisect start HEAD v1.2 -- # HEAD is bad, v1.2 is good
286
286
$ git bisect run make # "make" builds the app
287
+ $ git bisect reset # quit the bisect session
287
288
------------
288
289
289
290
* Automatically bisect a test failure between origin and HEAD:
290
291
+
291
292
------------
292
293
$ git bisect start HEAD origin -- # HEAD is bad, origin is good
293
294
$ git bisect run make test # "make test" builds and tests
295
+ $ git bisect reset # quit the bisect session
294
296
------------
295
297
296
298
* Automatically bisect a broken test case:
@@ -302,6 +304,7 @@ make || exit 125 # this skips broken builds
302
304
~/check_test_case.sh # does the test case pass?
303
305
$ git bisect start HEAD HEAD~10 -- # culprit is among the last 10
304
306
$ git bisect run ~/test.sh
307
+ $ git bisect reset # quit the bisect session
305
308
------------
306
309
+
307
310
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`.)
351
354
------------
352
355
$ git bisect start HEAD HEAD~10 -- # culprit is among the last 10
353
356
$ git bisect run sh -c "make || exit 125; ~/check_test_case.sh"
357
+ $ git bisect reset # quit the bisect session
354
358
------------
355
359
+
356
360
This shows that you can do without a run script if you write the test
@@ -368,6 +372,7 @@ $ git bisect run sh -c '
368
372
rm -f tmp.$$
369
373
test $rc = 0'
370
374
375
+ $ git bisect reset # quit the bisect session
371
376
------------
372
377
+
373
378
In this case, when 'git bisect run' finishes, bisect/bad will refer to a commit that
0 commit comments