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
5
pretty.c
5
pretty.c
@ -24,6 +24,11 @@ static size_t commit_formats_len;
|
||||
static size_t commit_formats_alloc;
|
||||
static struct cmt_fmt_map *find_commit_format(const char *sought);
|
||||
|
||||
int commit_format_is_empty(enum cmit_fmt fmt)
|
||||
{
|
||||
return fmt == CMIT_FMT_USERFORMAT && !*user_format;
|
||||
}
|
||||
|
||||
static void save_user_format(struct rev_info *rev, const char *cp, int is_tformat)
|
||||
{
|
||||
free(user_format);
|
||||
|
||||
Reference in New Issue
Block a user