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 /pretty.c | |
parent | c75e7ad28a34081ca6e7e53c0551fa6c99b208b0 (diff) | |
download | git-b9c7d6e4330e3dcdb3b3e5f013e5667e47555c95.tar.gz git-b9c7d6e4330e3dcdb3b3e5f013e5667e47555c95.tar.xz |
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>
Diffstat (limited to 'pretty.c')
-rw-r--r-- | pretty.c | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -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); |