2.36 format-patch regression fix