mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

log: teach "terminator" vs "separator" mode to "--pretty=format"

Browse Source 
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>
This commit is contained in:
Junio C Hamano
2008-04-07 17:11:34 -07:00
parent 71349732c5
commit 4da45bef56
7 changed files with 42 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
log-tree.c
View File

@ -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)
putchar(opt->diffopt.line_termination);
opt->shown_one = 1;