Fix issue #2219

Signed-off-by: Yue Lin Ho <b8732003@student.nsysu.edu.tw>
I notice that the option "-x" of "cherry-pick" is used, so try to get the body modified by git, instead format the extra message by self.