path: root/log-tree.c
diff options
authorJunio C Hamano <>2008-04-08 00:11:34 (GMT)
committerJunio C Hamano <>2008-04-10 10:25:03 (GMT)
commit4da45bef56e1547eb6525015ada0fdfc01d8295b (patch)
tree4af8e1a09c9f98ec9473ae466374076e3e7dd3cf /log-tree.c
parent71349732c53a4c1b64729628b04db7b3c3f7606d (diff)
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 <>
Diffstat (limited to 'log-tree.c')
1 files changed, 2 insertions, 2 deletions
diff --git a/log-tree.c b/log-tree.c
index 9d54061..8f5436b 100644
--- a/log-tree.c
+++ b/log-tree.c
@@ -249,9 +249,9 @@ void show_log(struct rev_info *opt, const char *sep)
* not have an empty line between entries.
extra = "";
- if (*sep != '\n' && opt->commit_format == CMIT_FMT_ONELINE)
+ if (*sep != '\n' && opt->use_terminator)
extra = "\n";
- if (opt->shown_one && opt->commit_format != CMIT_FMT_ONELINE)
+ if (opt->shown_one && !opt->use_terminator)
opt->shown_one = 1;