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.12/x64/lib/python3.12/site-packages/IPython/core/interactiveshell.py:2572, in InteractiveShell.run_cell_magic(self, magic_name, line, cell)
   2570 with self.builtin_trap:
   2571     args = (magic_arg_s, cell)
-> 2572     result = fn(*args, **kwargs)
   2574 # The code below prevents the output from being displayed
   2575 # when using magics with decorator @output_can_be_silenced
   2576 # when the last Python token in the expression is a ';'.
   2577 if getattr(fn, magic.MAGIC_OUTPUT_CAN_BE_SILENCED, False):

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

File /opt/hostedtoolcache/Python/3.12.12/x64/lib/python3.12/site-packages/IPython/core/magics/script.py:348, in ScriptMagics.shebang(self, line, cell)
    343 if args.raise_error and p.returncode != 0:
    344     # If we get here and p.returncode is still None, we must have
    345     # killed it but not yet seen its return code. We don't wait for it,
    346     # in case it's stuck in uninterruptible sleep. -9 = SIGKILL
    347     rc = p.returncode or -9
--> 348     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)
[4a2c24b1b1ee0922fe34e140688fb4ddaae0098e] 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 4a2c24b 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)
[4a2c24b1b1ee0922fe34e140688fb4ddaae0098e] Comment 500
running 'python' 'squares.py' '2'
4
Bisecting: 250 revisions left to test after this (roughly 8 step
s)
[553a19cd721a17fe7504bc81b09ba68f8f70efda] Comment 750
running 'python' 'squares.py' '2'
4
Bisect
ing: 125 revisions left to test after this (roughly 7 steps)
[36e56a8136e05a43427ef9a3503bcb919f3d03
11] Comment 874
running 'python' 'squares.py' '2'
Traceback (most recent call last):
  File "/home/r
unner/work/rsd-summerschool/rsd-summerschool/ch00git/learning_git/bisectdemo/squares.py", line 9, in
 <module>
    print(integer**2)
          ~~~~~~~^^~
TypeError: unsupported operand type(s) for ** o
r pow(): 'str' and 'int'
Bisecting: 62 revisions left to test after this (roughly 6 steps)
[725d4054
279c270c85d90214797cc869ac473a13] Comment 812
running 'python' 'squares.py' '2'
4
Bisecting: 31 revi
sions left to test after this (roughly 5 steps)
[5d4634f0bd89786b8ceb9bbe2db7c9ac595110d3] Comment 8
43
running 'python' 'squares.py' '2'
4
Bisecting: 15 revisions left to test after this (roughly 4 st
eps)
[753e307b31d12d5c3ab586cc3b97bb1cb08878b4] Comment 859
running 'python' 'squares.py' '2'
4
Bise
cting: 7 revisions left to test after this (roughly 3 steps)
[bd925bef7a2d5c05eb2b84bc732da64c4462f5
50] Comment 866
running 'python' 'squares.py' '2'
Traceback (most recent call last):
  File "/home/r
unner/work/rsd-summerschool/rsd-summerschool/ch00git/learning_git/bisectdemo/squares.py", line 9, in
 <module>
    print(integer**2)
          ~~~~~~~^^~
TypeError: unsupported operand type(s) for ** o
r pow(): 'str' and 'int'
Bisecting: 3 revisions left to test after this (roughly 2 steps)
[5a8a6788d
a62c8eacbe3ad8f031d72ccf02f00dd] Comment 863
running 'python' 'squares.py' '2'
4
Bisecting: 1 revisi
on left to test after this (roughly 1 step)
[0d2a164544d1364a7e12365a793df8aeea345cc4] Comment 864
r
unning 'python' 'squares.py' '2'
Traceback (most recent call last):
  File "/home/runner/work/rsd-su
mmerschool/rsd-summerschool/ch00git/learning_git/bisectdemo/squares.py", line 9, in <module>
    pri
nt(integer**2)
          ~~~~~~~^^~
TypeError: unsupported operand type(s) for ** or pow(): 'str' an
d 'int'
Bisecting: 0 revisions left to test after this (roughly 0 steps)
[69c73d6076023da614e05fea46
3511b719501318] 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 o
perand type(s) for ** or pow(): 'str' and 'int'
69c73d6076023da614e05fea463511b719501318 is the firs
t bad commit
commit 69c73d6076023da614e05fea463511b719501318
Author: Shawn Siefkas <shawn.siefkas@me
redith.com>
Date:   Thu Nov 14 09:23:55 2013 -0600

    Breaking argument type

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

Boom!