From: Denton Liu Date: Wed, 20 Nov 2019 00:51:23 +0000 (-0800) Subject: pretty: add struct cmt_fmt_map::default_date_mode_type X-Git-Tag: v2.25.0-rc0~48^2~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=618a855083fbd3b8f9491ec8b32b39bdea91868d;p=thirdparty%2Fgit.git pretty: add struct cmt_fmt_map::default_date_mode_type In a future commit, we plan on having a pretty format which will use a default date format unless otherwise overidden. Add support for this by adding a `default_date_mode_type` member in `struct cmt_fmt_map`. Signed-off-by: Denton Liu Signed-off-by: Junio C Hamano --- diff --git a/pretty.c b/pretty.c index 61014cc25a..63fa600276 100644 --- a/pretty.c +++ b/pretty.c @@ -20,6 +20,7 @@ static struct cmt_fmt_map { int is_tformat; int expand_tabs_in_log; int is_alias; + enum date_mode_type default_date_mode_type; const char *user_format; } *commit_formats; static size_t builtin_formats_len; @@ -181,6 +182,8 @@ void get_commit_format(const char *arg, struct rev_info *rev) rev->commit_format = commit_format->format; rev->use_terminator = commit_format->is_tformat; rev->expand_tabs_in_log_default = commit_format->expand_tabs_in_log; + if (!rev->date_mode_explicit && commit_format->default_date_mode_type) + rev->date_mode.type = commit_format->default_date_mode_type; if (commit_format->format == CMIT_FMT_USERFORMAT) { save_user_format(rev, commit_format->user_format, commit_format->is_tformat);