diff options
author | Junio C Hamano <gitster@pobox.com> | 2008-04-07 17:11:34 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-04-10 03:25:03 -0700 |
commit | 4da45bef56e1547eb6525015ada0fdfc01d8295b (patch) | |
tree | 4af8e1a09c9f98ec9473ae466374076e3e7dd3cf /builtin-commit.c | |
parent | Merge branch 'maint' (diff) | |
download | tgif-4da45bef56e1547eb6525015ada0fdfc01d8295b.tar.xz |
log: teach "terminator" vs "separator" mode to "--pretty=format"
This attached patch introduces a single bit "use_terminator" in "struct
rev_info", which is normally false (i.e. most formats use separator
semantics) but by flipping it to true, you can ask for terminator
semantics just like oneline format does.
The function get_commit_format(), which is what parses "--pretty=" option,
now takes a pointer to "struct rev_info" and updates its commit_format and
use_terminator fields. It used to return the value of type "enum
cmit_fmt", but all the callers assigned it to rev->commit_format.
There are only two cases the code turns use_terminator on. Obviously, the
traditional oneline format (--pretty=oneline) is one of them, and the new
case is --pretty=tformat:... that acts like --pretty=format:... but flips
the bit on.
With this, "--pretty=tformat:%H %s" acts like --pretty=oneline.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-commit.c')
-rw-r--r-- | builtin-commit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-commit.c b/builtin-commit.c index 660a3458f7..8bf35033e4 100644 --- a/builtin-commit.c +++ b/builtin-commit.c @@ -810,7 +810,7 @@ static void print_summary(const char *prefix, const unsigned char *sha1) rev.verbose_header = 1; rev.show_root_diff = 1; - rev.commit_format = get_commit_format("format:%h: %s"); + get_commit_format("format:%h: %s", &rev); rev.always_show_header = 0; rev.diffopt.detect_rename = 1; rev.diffopt.rename_limit = 100; |