XClose

Research Software Engineering Summer School

Home
Menu

Debugging With Git Bisect

NOTE: using bash/git commands is not fully supported on jupyterlite yet (due to single thread/process restriction), and the cells below might error out on the browser (jupyterlite) version of this notebook

You can use

git bisect

to find out which commit caused a bug.

An example repository

In a nice open source example, I found an arbitrary exemplar on github

In [1]:
import os
top_dir = os.getcwd()
git_dir = os.path.join(top_dir, 'learning_git')
os.chdir(git_dir)
In [2]:
%%bash
rm -rf bisectdemo
git clone https://github.com/UCL-ARC-RSEing-with-Python/bisectdemo.git
Cloning into 'bisectdemo'...
In [3]:
bisect_dir=os.path.join(git_dir,'bisectdemo')
os.chdir(bisect_dir)
In [4]:
%%bash
python squares.py 2 # 4
4

This has been set up to break itself at a random commit, and leave you to use bisect to work out where it has broken:

In [5]:
%%bash
./breakme.sh > break_output
Switched to a new branch 'buggy'

Which will make a bunch of commits, of which one is broken, and leave you in the broken final state

In [6]:
%%bash
python squares.py 2 # Error message
Traceback (most recent call last):
  File "/home/runner/work/rsd-summerschool/rsd-summerschool/ch00g
it/learning_git/bisectdemo/squares.py", line 9, in <module>
    print(integer**2)
          ~~~~~~~^^~
TypeError: unsupported operand type(s) for ** or pow(): '
str' and 'int'
---------------------------------------------------------------------------
CalledProcessError                        Traceback (most recent call last)
Cell In[6], line 1
----> 1 get_ipython().run_cell_magic('bash', '', 'python squares.py 2 #\xa0Error message\n')

File /opt/hostedtoolcache/Python/3.12.11/x64/lib/python3.12/site-packages/IPython/core/interactiveshell.py:2549, in InteractiveShell.run_cell_magic(self, magic_name, line, cell)
   2547 with self.builtin_trap:
   2548     args = (magic_arg_s, cell)
-> 2549     result = fn(*args, **kwargs)
   2551 # The code below prevents the output from being displayed
   2552 # when using magics with decorator @output_can_be_silenced
   2553 # when the last Python token in the expression is a ';'.
   2554 if getattr(fn, magic.MAGIC_OUTPUT_CAN_BE_SILENCED, False):

File /opt/hostedtoolcache/Python/3.12.11/x64/lib/python3.12/site-packages/IPython/core/magics/script.py:159, in ScriptMagics._make_script_magic.<locals>.named_script_magic(line, cell)
    157 else:
    158     line = script
--> 159 return self.shebang(line, cell)

File /opt/hostedtoolcache/Python/3.12.11/x64/lib/python3.12/site-packages/IPython/core/magics/script.py:336, in ScriptMagics.shebang(self, line, cell)
    331 if args.raise_error and p.returncode != 0:
    332     # If we get here and p.returncode is still None, we must have
    333     # killed it but not yet seen its return code. We don't wait for it,
    334     # in case it's stuck in uninterruptible sleep. -9 = SIGKILL
    335     rc = p.returncode or -9
--> 336     raise CalledProcessError(rc, cell)

CalledProcessError: Command 'b'python squares.py 2 #\xc2\xa0Error message\n'' returned non-zero exit status 1.

Bisecting manually

In [7]:
%%bash
git bisect start
git bisect bad # We know the current state is broken
git switch main
git bisect good # We know the main branch state is OK
status: waiting for both good and bad commits
status: waiting for good commit(s), bad commit known
warning: you are switching branch while bisecting
Switched to branch 'main'
Your branch is up to date with 'origin/main'.
Bisecting: 500 revisions left to test after this (roughly 9 steps)
[01b65c7ed031a0637089450d66d83886af1ad091] Comment 500

Bisect needs one known good and one known bad commit to get started

Solving Manually

python squares.py 2 # 4
git bisect good
python squares.py 2 # 4
git bisect good
python squares.py 2 # 4
git bisect good
python squares.py 2 # Crash
git bisect bad
python squares.py 2 # Crash
git bisect bad
python squares.py 2 # Crash
git bisect bad
python squares.py 2 #Crash
git bisect bad
python squares.py 2 # 4
git bisect good
python squares.py 2 # 4
git bisect good
python squares.py 2 # 4
git bisect good

And eventually:

git bisect good
    Bisecting: 0 revisions left to test after this (roughly 0 steps)

python squares.py 2
    4

git bisect good
2777975a2334c2396ccb9faf98ab149824ec465b is the first bad commit
commit 2777975a2334c2396ccb9faf98ab149824ec465b
Author: Shawn Siefkas <shawn.siefkas@meredith.com>
Date:   Thu Nov 14 09:23:55 2013 -0600

    Breaking argument type

Stop the bisect process with:

git bisect reset

Solving automatically

If we have an appropriate unit test, we can do all this automatically:

(NOTE: You don't need to redirect the stderr and stdout (with &>) of git bisect run to a file when running these commands outside a jupyter notebook (i.e., on a shell). This is done here so the errors appears with the right commits)

In [8]:
%%bash
git bisect start
git bisect bad HEAD # We know the current state is broken
git bisect good main # We know main is good
git bisect run python squares.py 2 &> gitbisect.out
cat gitbisect.out
Previous HEAD position was 01b65c7 Comment 500
Switched to branch 'buggy'
status: waiting for both good and bad commits
status: waiting for good commit(s), bad commit known
Bisecting: 500 revisions left to test after this (roughly 9 steps)
[01b65c7ed031a0637089450d66d83886af1ad091] Comment 500
running 'python' 'squares.py' '2'
4
Bisecting: 250 revisions left to test after this (roughly 8 step
s)
[9ba6a8a772a92eb8d575a5f105b0f49e1cd69f5c] Comment 749
running 'python' 'squares.py' '2'
Tracebac
k (most recent call last):
  File "/home/runner/work/rsd-summerschool/rsd-summerschool/ch00git/learn
ing_git/bisectdemo/squares.py", line 9, in <module>
    print(integer**2)
          ~~~~~~~^^~
TypeE
rror: unsupported operand type(s) for ** or pow(): 'str' and 'int'
Bisecting: 124 revisions left to 
test after this (roughly 7 steps)
[c3d83e878bbea847b36b6c4ac7f419e04ea96fac] Comment 624
running 'py
thon' 'squares.py' '2'
Traceback (most recent call last):
  File "/home/runner/work/rsd-summerschool
/rsd-summerschool/ch00git/learning_git/bisectdemo/squares.py", line 9, in <module>
    print(integer
**2)
          ~~~~~~~^^~
TypeError: unsupported operand type(s) for ** or pow(): 'str' and 'int'
Bi
secting: 62 revisions left to test after this (roughly 6 steps)
[14026e7f4aef02e2c079e83498472cc1905
1c101] Comment 561
running 'python' 'squares.py' '2'
Traceback (most recent call last):
  File "/hom
e/runner/work/rsd-summerschool/rsd-summerschool/ch00git/learning_git/bisectdemo/squares.py", line 9,
 in <module>
    print(integer**2)
          ~~~~~~~^^~
TypeError: unsupported operand type(s) for *
* or pow(): 'str' and 'int'
Bisecting: 30 revisions left to test after this (roughly 5 steps)
[c2f28
a06a6658921b2063e8ca21ae7e4c0396921] Comment 531
running 'python' 'squares.py' '2'
4
Bisecting: 15 r
evisions left to test after this (roughly 4 steps)
[adb8402f141ac3580ef52dbf37a77c370954a6cd] Commen
t 546
running 'python' 'squares.py' '2'
4
Bisecting: 7 revisions left to test after this (roughly 3 
steps)
[4f13c2b6ed5ce04904bcea1d0b6e022d0dfff872] Comment 554
running 'python' 'squares.py' '2'
4
Bi
secting: 3 revisions left to test after this (roughly 2 steps)
[d4c011213b5ec9ec58eda1d557c6a06def1f
d87c] Comment 557
running 'python' 'squares.py' '2'
Traceback (most recent call last):
  File "/home
/runner/work/rsd-summerschool/rsd-summerschool/ch00git/learning_git/bisectdemo/squares.py", line 9, 
in <module>
    print(integer**2)
          ~~~~~~~^^~
TypeError: unsupported operand type(s) for **
 or pow(): 'str' and 'int'
Bisecting: 1 revision left to test after this (roughly 1 step)
[390270ef4
b7f45825f9bcff3f7ec2655b3b53dd5] Comment 555
running 'python' 'squares.py' '2'
Traceback (most recen
t call last):
  File "/home/runner/work/rsd-summerschool/rsd-summerschool/ch00git/learning_git/bisec
tdemo/squares.py", line 9, in <module>
    print(integer**2)
          ~~~~~~~^^~
TypeError: unsuppo
rted operand type(s) for ** or pow(): 'str' and 'int'
Bisecting: 0 revisions left to test after this
 (roughly 0 steps)
[88595141e0cb26ba54467e85056c21e51774b7b9] Breaking argument type
running 'python
' 'squares.py' '2'
Traceback (most recent call last):
  File "/home/runner/work/rsd-summerschool/rsd
-summerschool/ch00git/learning_git/bisectdemo/squares.py", line 9, in <module>
    print(integer**2)
          ~~~~~~~^^~
TypeError: unsupported operand type(s) for ** or pow(): 'str' and 'int'
885951
41e0cb26ba54467e85056c21e51774b7b9 is the first bad commit
commit 88595141e0cb26ba54467e85056c21e517
74b7b9
Author: Shawn Siefkas <shawn.siefkas@meredith.com>
Date:   Thu Nov 14 09:23:55 2013 -0600

  
  Breaking argument type

 squares.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
bisect f
ound first bad commit

Boom!