revert: refactor code into a do_pick_commit() function