Clean up "git log" format with DIFF_FORMAT_NO_OUTPUT
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 9 Oct 2007 16:35:22 +0000 (09:35 -0700)
committerShawn O. Pearce <spearce@spearce.org>
Tue, 16 Oct 2007 00:24:27 +0000 (20:24 -0400)
commit304b5af64f9b5a6b5e9455e2dcab381c568452b6
tree475eab770fc6f36a88593ba7b17f958c0ad9fb4f
parent99516e35d096f41e7133cacde8fbed8ee9a3ecd0
Clean up "git log" format with DIFF_FORMAT_NO_OUTPUT

This fixes an unnecessary empty line that we add to the log message when
we generate diffs, but don't actually end up printing any due to having
DIFF_FORMAT_NO_OUTPUT set.

This can happen with pickaxe or with rename following. The reason is that
we normally add an empty line between the commit and the diff, but we do
that even for the case where we've then suppressed the actual printing of
the diff.

This also updates a couple of tests that assumed the extraneous empty
line would exist at the end of output.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
log-tree.c
t/t3900-i18n-commit.sh
t/t4013/diff.log_-SF_master