More cherry-related fixes

This series contains two patches that fix some formatting issues with the `cherry` case in `magit-wash-log-line`.