diff options
| author | Jeff King <peff@peff.net> | 2014-07-29 13:56:48 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-07-30 12:30:08 -0700 |
| commit | b9c7d6e4330e3dcdb3b3e5f013e5667e47555c95 (patch) | |
| tree | 3b2dac6b6d40dfcf8973f6eb74d062c8eaed13c1 /combine-diff.c | |
| parent | c75e7ad28a34081ca6e7e53c0551fa6c99b208b0 (diff) | |
| download | git-b9c7d6e4330e3dcdb3b3e5f013e5667e47555c95.tar.gz | |
pretty: make empty userformats truly emptyjk/pretty-empty-format
If the user provides an empty format with "--format=", we
end up putting in extra whitespace that the user cannot
prevent. This comes from two places:
1. If the format is missing a terminating newline, we add
one automatically. This makes sense for --format=%h, but
not for a truly empty format.
2. We add an extra newline between the pretty-printed
format and a diff or diffstat. If the format is empty,
there's no point in doing so if there's nothing to
separate.
With this patch, one can get a diff with no other cruft out
of "diff-tree --format= $commit".
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'combine-diff.c')
| -rw-r--r-- | combine-diff.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/combine-diff.c b/combine-diff.c index f9975d2c2e..1a1e6598e2 100644 --- a/combine-diff.c +++ b/combine-diff.c @@ -1397,7 +1397,8 @@ void diff_tree_combined(const unsigned char *sha1, show_log(rev); if (rev->verbose_header && opt->output_format && - opt->output_format != DIFF_FORMAT_NO_OUTPUT) + opt->output_format != DIFF_FORMAT_NO_OUTPUT && + !commit_format_is_empty(rev->commit_format)) printf("%s%c", diff_line_prefix(opt), opt->line_termination); } |