Clean up "git log" format with DIFF_FORMAT_NO_OUTPUT
- From
Linus Torvalds <torvalds@linux-foundation.org>
- Date
- Oct 8, 2007, 20:46 UTC
- Message-ID
- <alpine.LFD.0.999.0710081342530.4964@woody.linux-foundation.org>
- In-Reply-To
- <alpine.LFD.0.999.0710081337490.4964@woody.linux-foundation.org>
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.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> --- log-tree.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/log-tree.c b/log-tree.c index 2319154..62edd34 100644 --- a/log-tree.c +++ b/log-tree.c @@ -304,7 +304,8 @@ int log_tree_diff_flush(struct rev_info *opt) * output for readability. */ show_log(opt, opt->diffopt.msg_sep); - if (opt->verbose_header && + if ((opt->diffopt.output_format & ~DIFF_FORMAT_NO_OUTPUT) && + opt->verbose_header && opt->commit_format != CMIT_FMT_ONELINE) { int pch = DIFF_FORMAT_DIFFSTAT | DIFF_FORMAT_PATCH; if ((pch & opt->diffopt.output_format) == pch)