Re: [PATCH v3] git-show: fix 'git show -s' to not add extra terminator after merge commit

2014-05-15 Thread Junio C Hamano
Thanks, will replace the topic. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

[PATCH v3] git-show: fix 'git show -s' to not add extra terminator after merge commit

2014-05-14 Thread Max Kirillov
When git show -s is called for merge commit it prints extra newline after any merge commit. This differs from output for commits with one parent. Fix it by more thorough checking that diff output is disabled. The code in question exists since commit 3969cf7db1. The additional newline is really