pretty: make empty userformats truly empty
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>
This commit is contained in:

committed by
Junio C Hamano

parent
c75e7ad28a
commit
b9c7d6e433
@ -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);
|
||||
}
|
||||
|
Reference in New Issue
Block a user