bottle: make writing commit message more robust.