Home >Backend Development >Python Tutorial >Binary search in GIT (GIT BISECT)

Binary search in GIT (GIT BISECT)

高洛峰
高洛峰Original
2016-12-14 15:56:354140browse

In a code repository managed by git, if a new bug is discovered, you can use "git bisect" to perform a binary search to locate the commit that introduced the bug. This is especially the most commonly used method in open source communities such as Linux, KVM, and QEMU.
When a bug is fixed, you can also use "git bisect" to binary search for the commit that fixed the bug. However, since "git bisect" was originally used to find bad points that introduce bugs rather than good points that fix bugs, when using "git bisect" to find points to fix bugs, you may encounter the following error message from the GIT tool :

[root@jay-linux qemu.git]# git bisect start
# commit-4b274b160 is newer than commit-079944e6.
[root@jay-linux qemu.git]# git bisect good 4b274b160
[root@jay-linux qemu.git]# git bisect bad 079944e6
Some good revs are not ancestor of the bad rev.
git bisect cannot work properly in this case.
Maybe you mistake good and bad revs?

When encountering this situation, you can think about it in another way. Since "git bisect" is only suitable for marking newer commits as bad and older ones as good, then we can "git bisect" Points that are considered good are marked as bad, points that are bad are marked as "good", and then finding the last "the first bad commit" is actually like "the first good commit" that fixes a bug.
Really, this kind of problem can be solved by slightly changing the way of thinking. I once again realize the importance of "think out of the box".

The following is qemu.git as an example to demonstrate the usage of "git bisect":

[root@jay-linux qemu.git]# git bisect reset
Already on 'master'
[root@jay-linux qemu.git]# git bisect start
[root@jay-linux qemu.git]# git bisect good 079944e6
[root@jay-linux qemu.git]# git bisect bad 4b274b16
Bisecting: 55 revisions left to test after this (roughly 6 steps)
[83f58e570f21c3e7227e7fbef1fc0e18b5ed7ea9] rtl8139: preserve link state across device reset
[root@jay-linux qemu.git]# git bisect good
Bisecting: 27 revisions left to test after this (roughly 5 steps)
[4a4343671e183824a3f5db76ad561ce01e6c6e0a] usb/ehci: Move capsbase and opregbase into SysBus EHCI class
[root@jay-linux qemu.git]# git bisect good
Bisecting: 13 revisions left to test after this (roughly 4 steps)
[507066f8a9610c0088df19ce7b3e436f43165ec1] qdev: Include qdev code into *-user, too
[root@jay-linux qemu.git]# git bisect bad
Bisecting: 8 revisions left to test after this (roughly 3 steps)
[c3dd94b129e222e00a4ed00689e11afdd85c740f] Merge remote-tracking branch 'stefanha/net' into staging
[root@jay-linux qemu.git]# git bisect good
Bisecting: 4 revisions left to test after this (roughly 2 steps)
[89eb147c2cfd2c797d3662aa2f55254441f0595a] uhci: stop using portio lists
[root@jay-linux qemu.git]# git bisect bad
Bisecting: 1 revision left to test after this (roughly 1 step)
[358d615b6908b4916c74819ffad823cb4a74314e] exynos4210: Add EHCI support
[root@jay-linux qemu.git]# git bisect bad
Bisecting: 0 revisions left to test after this (roughly 0 steps)
[aee7499a59d6778c10b018da41db4a22655ef8a8] usb/ehci: Add SysBus EHCI device for Exynos4210
[root@jay-linux qemu.git]# git bisect bad
aee7499a59d6778c10b018da41db4a22655ef8a8 is the first bad commit
commit aee7499a59d6778c10b018da41db4a22655ef8a8
Author: Jay <just for fun>
Date:   Sun Dec 16 04:49:45 2012 +0100
### just for testing.  ###
 
:040000 040000 a9ea5da3b5b85d86701f78608405504e9a4de905 0bb166863c84186202c639aff92dd326f1021d42 M      hw


Statement:
The content of this article is voluntarily contributed by netizens, and the copyright belongs to the original author. This site does not assume corresponding legal responsibility. If you find any content suspected of plagiarism or infringement, please contact admin@php.cn