mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Merge branch 'zh/pretty-date-human'
"git log --format=..." placeholders learned %ah/%ch placeholders to request the --date=human output. * zh/pretty-date-human: pretty: provide human date format
This commit is contained in:
commit
f16a4660de
|
@ -190,6 +190,8 @@ The placeholders are:
|
|||
'%ai':: author date, ISO 8601-like format
|
||||
'%aI':: author date, strict ISO 8601 format
|
||||
'%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 (respecting .mailmap, see
|
||||
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, strict ISO 8601 format
|
||||
'%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 without the " (", ")" wrapping.
|
||||
'%(describe[:options])':: human-readable name, like
|
||||
|
|
3
pretty.c
3
pretty.c
|
@ -745,6 +745,9 @@ static size_t format_person_part(struct strbuf *sb, char part,
|
|||
case 'I': /* date, ISO 8601 strict */
|
||||
strbuf_addstr(sb, show_ident_date(&s, DATE_MODE(ISO8601_STRICT)));
|
||||
return placeholder_len;
|
||||
case 'h': /* date, human */
|
||||
strbuf_addstr(sb, show_ident_date(&s, DATE_MODE(HUMAN)));
|
||||
return placeholder_len;
|
||||
case 's':
|
||||
strbuf_addstr(sb, show_ident_date(&s, DATE_MODE(SHORT)));
|
||||
return placeholder_len;
|
||||
|
|
|
@ -538,6 +538,12 @@ test_expect_success '--date=short %ad%cd is the same as %as%cs' '
|
|||
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)
|
||||
test_expect_success 'set up log decoration tests' '
|
||||
head1=$(git rev-parse --verify HEAD~0) &&
|
||||
|
|
Loading…
Reference in a new issue