Re: [BUGFIX/RFC] git-show: fix 'git show -s' to not add extra terminator after merge commit

2014-05-12 Thread Junio C Hamano
Max Kirillov m...@max630.net writes: When git show -s is called for merge commit it prints extra newline between any merge commit and the next one. This looks especially ugly for --oneline and other single-line formats. Looks very much like a bug. Yeah, it is not limited to one-line formats.

Re: [BUGFIX/RFC] git-show: fix 'git show -s' to not add extra terminator after merge commit

2014-05-12 Thread Max Kirillov
On Mon, May 12, 2014 at 09:59:39AM -0700, Junio C Hamano wrote: A good way to double-check may be to see the fixes to the tests to correct their wrong expectations, and if the updated expectation is sensible. I have sent the fixes to tests. To me they look sensible. Also fixed the things you

[BUGFIX/RFC] git-show: fix 'git show -s' to not add extra terminator after merge commit

2014-05-11 Thread Max Kirillov
When git show -s is called for merge commit it prints extra newline between any merge commit and the next one. This looks especially ugly for --oneline and other single-line formats. Looks very much like a bug. The code in question exists since commit 3969cf7db1. Probably the correct condition