undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pretty: provide human date format

Browse Source 
Add the placeholders %ah and %ch to format author date and committer
date, like --date=human does, which provides more humanity date output.

Signed-off-by: ZheNing Hu <adlternative@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
ZheNing Hu 2021-04-25 10:41:45 +00:00 committed by Junio C Hamano
parent 3593ebd3f5
commit b722d4560e
3 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/pretty-formats.txt
View File

@ -190,6 +190,8 @@ The placeholders are:
'%ai':: author date, ISO 8601-like format '%ai':: author date, ISO 8601-like format
'%aI':: author date, strict ISO 8601 format '%aI':: author date, strict ISO 8601 format
'%as':: author date, short format (`YYYY-MM-DD`) '%as':: author date, short format (`YYYY-MM-DD`)
'%ah':: author date, human style (like the `--date=human` option of
linkgit:git-rev-list[1])
'%cn':: committer name '%cn':: committer name
'%cN':: committer name (respecting .mailmap, see '%cN':: committer name (respecting .mailmap, see
linkgit:git-shortlog[1] or linkgit:git-blame[1]) linkgit:git-shortlog[1] or linkgit:git-blame[1])
@ -206,6 +208,8 @@ The placeholders are:
'%ci':: committer date, ISO 8601-like format '%ci':: committer date, ISO 8601-like format
'%cI':: committer date, strict ISO 8601 format '%cI':: committer date, strict ISO 8601 format
'%cs':: committer date, short format (`YYYY-MM-DD`) '%cs':: committer date, short format (`YYYY-MM-DD`)
'%ch':: committer date, human style(like the `--date=human` option of
linkgit:git-rev-list[1])
'%d':: ref names, like the --decorate option of linkgit:git-log[1] '%d':: ref names, like the --decorate option of linkgit:git-log[1]
'%D':: ref names without the " (", ")" wrapping. '%D':: ref names without the " (", ")" wrapping.
'%(describe[:options])':: human-readable name, like '%(describe[:options])':: human-readable name, like

3
pretty.c
View File

@ -745,6 +745,9 @@ static size_t format_person_part(struct strbuf *sb, char part,
case 'I': /* date, ISO 8601 strict */ case 'I': /* date, ISO 8601 strict */
strbuf_addstr(sb, show_ident_date(&s, DATE_MODE(ISO8601_STRICT))); strbuf_addstr(sb, show_ident_date(&s, DATE_MODE(ISO8601_STRICT)));
return placeholder_len; return placeholder_len;
case 'h': /* date, human */
strbuf_addstr(sb, show_ident_date(&s, DATE_MODE(HUMAN)));
return placeholder_len;
case 's': case 's':
strbuf_addstr(sb, show_ident_date(&s, DATE_MODE(SHORT))); strbuf_addstr(sb, show_ident_date(&s, DATE_MODE(SHORT)));
return placeholder_len; return placeholder_len;

6
t/t4205-log-pretty-formats.sh
View File

@ -538,6 +538,12 @@ test_expect_success '--date=short %ad%cd is the same as %as%cs' '
test_cmp expected actual test_cmp expected actual
' '
test_expect_success '--date=human %ad%cd is the same as %ah%ch' '
git log --format=%ad%n%cd --date=human >expected &&
git log --format=%ah%n%ch >actual &&
test_cmp expected actual
'
# get new digests (with no abbreviations) # get new digests (with no abbreviations)
test_expect_success 'set up log decoration tests' ' test_expect_success 'set up log decoration tests' '
head1=$(git rev-parse --verify HEAD~0) && head1=$(git rev-parse --verify HEAD~0) &&