diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-08-03 20:01:27 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-08-03 20:01:27 +0200 |
| commit | d939af12bd96db7ad3e671a0585ad8570aa7e9d3 (patch) | |
| tree | 5772ac1192ed299db657ffcfbc71c318521db653 /builtin/log.c | |
| parent | Merge branch 'pt/am-tests' (diff) | |
| parent | strbuf: make strbuf_addftime more robust (diff) | |
| download | git-d939af12bd96db7ad3e671a0585ad8570aa7e9d3.tar.xz git-d939af12bd96db7ad3e671a0585ad8570aa7e9d3.zip | |
Merge branch 'jk/date-mode-format'
Teach "git log" and friends a new "--date=format:..." option to
format timestamps using system's strftime(3).
* jk/date-mode-format:
strbuf: make strbuf_addftime more robust
introduce "format" date-mode
convert "enum date_mode" into a struct
show-branch: use DATE_RELATIVE instead of magic number
Diffstat (limited to 'builtin/log.c')
| -rw-r--r-- | builtin/log.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/log.c b/builtin/log.c index c851c7cc23..b50ef7510c 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -116,7 +116,7 @@ static void cmd_log_init_defaults(struct rev_info *rev) DIFF_OPT_SET(&rev->diffopt, ALLOW_TEXTCONV); if (default_date_mode) - rev->date_mode = parse_date_format(default_date_mode); + parse_date_format(default_date_mode, &rev->date_mode); rev->diffopt.touched_flags = 0; } @@ -956,7 +956,7 @@ static void make_cover_letter(struct rev_info *rev, int use_stdout, msg = body; pp.fmt = CMIT_FMT_EMAIL; - pp.date_mode = DATE_RFC2822; + pp.date_mode.type = DATE_RFC2822; pp_user_info(&pp, NULL, &sb, committer, encoding); pp_title_line(&pp, &msg, &sb, encoding, need_8bit_cte); pp_remainder(&pp, &msg, &sb, 0); |