I'm sorry, my "fix" to the patch wasn incorrect.  I didn't update the line count.

test-rebase-mq-skip_extend-patch_fixed_again.patch is the one you want.