2007-05-13 23:25:45 +00:00
|
|
|
PRETTY FORMATS
|
|
|
|
--------------
|
|
|
|
|
|
|
|
If the commit is a merge, and if the pretty-format
|
|
|
|
is not 'oneline', 'email' or 'raw', an additional line is
|
|
|
|
inserted before the 'Author:' line. This line begins with
|
2019-11-20 00:51:06 +00:00
|
|
|
"Merge: " and the hashes of ancestral commits are printed,
|
2007-05-13 23:25:45 +00:00
|
|
|
separated by spaces. Note that the listed commits may not
|
|
|
|
necessarily be the list of the *direct* parent commits if you
|
|
|
|
have limited your view of history: for example, if you are
|
|
|
|
only interested in changes related to a certain directory or
|
|
|
|
file.
|
|
|
|
|
2010-05-02 11:00:44 +00:00
|
|
|
There are several built-in formats, and you can define
|
|
|
|
additional formats by setting a pretty.<name>
|
|
|
|
config option to either another format name, or a
|
|
|
|
'format:' string, as described below (see
|
|
|
|
linkgit:git-config[1]). Here are the details of the
|
|
|
|
built-in formats:
|
2007-05-13 23:25:45 +00:00
|
|
|
|
|
|
|
* 'oneline'
|
2006-11-21 23:49:15 +00:00
|
|
|
|
2021-11-06 18:48:52 +00:00
|
|
|
<hash> <title-line>
|
2006-11-21 23:49:15 +00:00
|
|
|
+
|
|
|
|
This is designed to be as compact as possible.
|
|
|
|
|
2007-05-13 23:25:45 +00:00
|
|
|
* 'short'
|
2006-11-21 23:49:15 +00:00
|
|
|
|
2019-11-20 00:51:06 +00:00
|
|
|
commit <hash>
|
2006-11-21 23:49:15 +00:00
|
|
|
Author: <author>
|
|
|
|
|
2021-11-06 18:48:52 +00:00
|
|
|
<title-line>
|
2006-11-21 23:49:15 +00:00
|
|
|
|
2007-05-13 23:25:45 +00:00
|
|
|
* 'medium'
|
2006-11-21 23:49:15 +00:00
|
|
|
|
2019-11-20 00:51:06 +00:00
|
|
|
commit <hash>
|
2006-11-21 23:49:15 +00:00
|
|
|
Author: <author>
|
2021-11-06 18:48:52 +00:00
|
|
|
Date: <author-date>
|
2006-11-21 23:49:15 +00:00
|
|
|
|
2021-11-06 18:48:52 +00:00
|
|
|
<title-line>
|
2006-11-21 23:49:15 +00:00
|
|
|
|
2021-11-06 18:48:52 +00:00
|
|
|
<full-commit-message>
|
2006-11-21 23:49:15 +00:00
|
|
|
|
2007-05-13 23:25:45 +00:00
|
|
|
* 'full'
|
2006-11-21 23:49:15 +00:00
|
|
|
|
2019-11-20 00:51:06 +00:00
|
|
|
commit <hash>
|
2006-11-21 23:49:15 +00:00
|
|
|
Author: <author>
|
|
|
|
Commit: <committer>
|
|
|
|
|
2021-11-06 18:48:52 +00:00
|
|
|
<title-line>
|
2006-11-21 23:49:15 +00:00
|
|
|
|
2021-11-06 18:48:52 +00:00
|
|
|
<full-commit-message>
|
2006-11-21 23:49:15 +00:00
|
|
|
|
2007-05-13 23:25:45 +00:00
|
|
|
* 'fuller'
|
2006-11-21 23:49:15 +00:00
|
|
|
|
2019-11-20 00:51:06 +00:00
|
|
|
commit <hash>
|
2008-12-19 12:14:52 +00:00
|
|
|
Author: <author>
|
2021-11-06 18:48:52 +00:00
|
|
|
AuthorDate: <author-date>
|
2008-12-19 12:14:52 +00:00
|
|
|
Commit: <committer>
|
2021-11-06 18:48:52 +00:00
|
|
|
CommitDate: <committer-date>
|
2006-11-21 23:49:15 +00:00
|
|
|
|
2021-11-06 18:48:52 +00:00
|
|
|
<title-line>
|
2006-11-21 23:49:15 +00:00
|
|
|
|
2021-11-06 18:48:52 +00:00
|
|
|
<full-commit-message>
|
2006-11-21 23:49:15 +00:00
|
|
|
|
2019-11-20 00:51:25 +00:00
|
|
|
* 'reference'
|
|
|
|
|
2021-11-06 18:48:52 +00:00
|
|
|
<abbrev-hash> (<title-line>, <short-author-date>)
|
2019-11-20 00:51:25 +00:00
|
|
|
+
|
|
|
|
This format is used to refer to another commit in a commit message and
|
|
|
|
is the same as `--pretty='format:%C(auto)%h (%s, %ad)'`. By default,
|
|
|
|
the date is formatted with `--date=short` unless another `--date` option
|
|
|
|
is explicitly specified. As with any `format:` with format
|
|
|
|
placeholders, its output is not affected by other options like
|
|
|
|
`--decorate` and `--walk-reflogs`.
|
|
|
|
|
2007-05-13 23:25:45 +00:00
|
|
|
* 'email'
|
2006-11-21 23:49:15 +00:00
|
|
|
|
2019-11-20 00:51:06 +00:00
|
|
|
From <hash> <date>
|
2006-11-21 23:49:15 +00:00
|
|
|
From: <author>
|
2021-11-06 18:48:52 +00:00
|
|
|
Date: <author-date>
|
|
|
|
Subject: [PATCH] <title-line>
|
2006-11-21 23:49:15 +00:00
|
|
|
|
2021-11-06 18:48:52 +00:00
|
|
|
<full-commit-message>
|
2006-11-21 23:49:15 +00:00
|
|
|
|
2020-04-16 04:16:59 +00:00
|
|
|
* 'mboxrd'
|
|
|
|
+
|
|
|
|
Like 'email', but lines in the commit message starting with "From "
|
|
|
|
(preceded by zero or more ">") are quoted with ">" so they aren't
|
|
|
|
confused as starting a new commit.
|
|
|
|
|
2007-05-13 23:25:45 +00:00
|
|
|
* 'raw'
|
2006-11-21 23:49:15 +00:00
|
|
|
+
|
|
|
|
The 'raw' format shows the entire commit exactly as
|
2019-11-20 00:51:06 +00:00
|
|
|
stored in the commit object. Notably, the hashes are
|
2006-11-21 23:49:15 +00:00
|
|
|
displayed in full, regardless of whether --abbrev or
|
|
|
|
--no-abbrev are used, and 'parents' information show the
|
2014-03-31 22:11:44 +00:00
|
|
|
true parent commits, without taking grafts or history
|
2015-05-18 17:55:58 +00:00
|
|
|
simplification into account. Note that this format affects the way
|
|
|
|
commits are displayed, but not the way the diff is shown e.g. with
|
|
|
|
`git log --raw`. To get full object names in a raw diff format,
|
|
|
|
use `--no-abbrev`.
|
2006-12-30 19:59:08 +00:00
|
|
|
|
2021-11-06 18:48:52 +00:00
|
|
|
* 'format:<format-string>'
|
2007-02-23 00:35:03 +00:00
|
|
|
+
|
2021-11-06 18:48:52 +00:00
|
|
|
The 'format:<format-string>' format allows you to specify which information
|
2007-02-23 00:35:03 +00:00
|
|
|
you want to show. It works a little bit like printf format,
|
|
|
|
with the notable exception that you get a newline with '%n'
|
|
|
|
instead of '\n'.
|
2007-05-13 23:25:45 +00:00
|
|
|
+
|
|
|
|
E.g, 'format:"The author of %h was %an, %ar%nThe title was >>%s<<%n"'
|
2007-02-23 00:35:03 +00:00
|
|
|
would show something like this:
|
2007-05-13 23:25:45 +00:00
|
|
|
+
|
|
|
|
-------
|
2007-02-23 00:35:03 +00:00
|
|
|
The author of fe6e0ee was Junio C Hamano, 23 hours ago
|
|
|
|
The title was >>t4119: test autocomputing -p<n> for traditional diff input.<<
|
|
|
|
|
2014-10-08 20:46:10 +00:00
|
|
|
-------
|
2007-05-13 23:25:45 +00:00
|
|
|
+
|
2007-02-23 00:35:03 +00:00
|
|
|
The placeholders are:
|
|
|
|
|
2018-12-08 16:36:41 +00:00
|
|
|
- Placeholders that expand to a single literal character:
|
|
|
|
'%n':: newline
|
|
|
|
'%%':: a raw '%'
|
2023-08-20 18:50:02 +00:00
|
|
|
'%x00':: '%x' followed by two hexadecimal digits is replaced with a
|
|
|
|
byte with the hexadecimal digits' value (we will call this
|
|
|
|
"literal formatting code" in the rest of this document).
|
2018-12-08 16:36:41 +00:00
|
|
|
|
|
|
|
- Placeholders that affect formatting of later placeholders:
|
|
|
|
'%Cred':: switch color to red
|
|
|
|
'%Cgreen':: switch color to green
|
|
|
|
'%Cblue':: switch color to blue
|
|
|
|
'%Creset':: reset color
|
|
|
|
'%C(...)':: color specification, as described under Values in the
|
|
|
|
"CONFIGURATION FILE" section of linkgit:git-config[1]. By
|
|
|
|
default, colors are shown only when enabled for log output
|
|
|
|
(by `color.diff`, `color.ui`, or `--color`, and respecting
|
|
|
|
the `auto` settings of the former if we are going to a
|
|
|
|
terminal). `%C(auto,...)` is accepted as a historical
|
|
|
|
synonym for the default (e.g., `%C(auto,red)`). Specifying
|
2019-03-07 00:59:52 +00:00
|
|
|
`%C(always,...)` will show the colors even when color is
|
2018-12-08 16:36:41 +00:00
|
|
|
not otherwise enabled (though consider just using
|
|
|
|
`--color=always` to enable color for the whole output,
|
|
|
|
including this format and anything else git might color).
|
|
|
|
`auto` alone (i.e. `%C(auto)`) will turn on auto coloring
|
|
|
|
on the next placeholders until the color is switched
|
|
|
|
again.
|
|
|
|
'%m':: left (`<`), right (`>`) or boundary (`-`) mark
|
|
|
|
'%w([<w>[,<i1>[,<i2>]]])':: switch line wrapping, like the -w option of
|
|
|
|
linkgit:git-shortlog[1].
|
2023-01-19 18:18:23 +00:00
|
|
|
'%<( <N> [,trunc|ltrunc|mtrunc])':: make the next placeholder take at
|
2023-01-19 18:18:24 +00:00
|
|
|
least N column widths, padding spaces on
|
2018-12-08 16:36:41 +00:00
|
|
|
the right if necessary. Optionally
|
2023-01-19 18:18:26 +00:00
|
|
|
truncate (with ellipsis '..') at the left (ltrunc) `..ft`,
|
|
|
|
the middle (mtrunc) `mi..le`, or the end
|
|
|
|
(trunc) `rig..`, if the output is longer than
|
2023-01-19 18:18:23 +00:00
|
|
|
N columns.
|
|
|
|
Note 1: that truncating
|
2018-12-08 16:36:41 +00:00
|
|
|
only works correctly with N >= 2.
|
2023-01-19 18:18:24 +00:00
|
|
|
Note 2: spaces around the N and M (see below)
|
2023-01-19 18:18:23 +00:00
|
|
|
values are optional.
|
doc: pretty-formats note wide char limitations, and add tests
The previous commits added clarifications to the column alignment
placeholders, note that the spaces are optional around the parameters.
Also, a proposed extension [1] to allow hard truncation (without
ellipsis '..') highlighted that the existing code does not play well
with wide characters, such as Asian fonts and emojis.
For example, N wide characters take 2N columns so won't fit an odd number
column width, causing misalignment somewhere.
Further analysis also showed that decomposed characters, e.g. separate
`a` + `umlaut` Unicode code-points may also be mis-counted, in some cases
leaving multiple loose `umlauts` all combined together.
Add some notes about these limitations, and add basic tests to demonstrate
them.
The chosen solution for the tests is to substitute any wide character
that overlaps a splitting boundary for the unicode vertical ellipsis
code point as a rare but 'obvious' substitution.
An alternative could be the substitution with a single dot '.' which
matches regular expression usage, and our two dot ellipsis, and further
in scenarios where the bulk of the text is wide characters, would be
obvious. In mainly 'ascii' scenarios a singleton emoji being substituted
by a dot could be confusing.
It is enough that the tests fail cleanly. The final choice for the
substitute character can be deferred.
[1]
https://lore.kernel.org/git/20221030185614.3842-1-philipoakley@iee.email/
Signed-off-by: Philip Oakley <philipoakley@iee.email>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2023-01-19 18:18:27 +00:00
|
|
|
Note 3: Emojis and other wide characters
|
|
|
|
will take two display columns, which may
|
|
|
|
over-run column boundaries.
|
|
|
|
Note 4: decomposed character combining marks
|
|
|
|
may be misplaced at padding boundaries.
|
2023-01-19 18:18:24 +00:00
|
|
|
'%<|( <M> )':: make the next placeholder take at least until Mth
|
2023-01-19 18:18:25 +00:00
|
|
|
display column, padding spaces on the right if necessary.
|
|
|
|
Use negative M values for column positions measured
|
|
|
|
from the right hand edge of the terminal window.
|
2023-01-19 18:18:24 +00:00
|
|
|
'%>( <N> )', '%>|( <M> )':: similar to '%<( <N> )', '%<|( <M> )' respectively,
|
2018-12-08 16:36:41 +00:00
|
|
|
but padding spaces on the left
|
2023-01-19 18:18:24 +00:00
|
|
|
'%>>( <N> )', '%>>|( <M> )':: similar to '%>( <N> )', '%>|( <M> )'
|
2018-12-08 16:36:41 +00:00
|
|
|
respectively, except that if the next
|
|
|
|
placeholder takes more spaces than given and
|
|
|
|
there are spaces on its left, use those
|
|
|
|
spaces
|
2023-01-19 18:18:24 +00:00
|
|
|
'%><( <N> )', '%><|( <M> )':: similar to '%<( <N> )', '%<|( <M> )'
|
2018-12-08 16:36:41 +00:00
|
|
|
respectively, but padding both sides
|
|
|
|
(i.e. the text is centered)
|
|
|
|
|
|
|
|
- Placeholders that expand to information extracted from the commit:
|
|
|
|
'%H':: commit hash
|
|
|
|
'%h':: abbreviated commit hash
|
|
|
|
'%T':: tree hash
|
|
|
|
'%t':: abbreviated tree hash
|
|
|
|
'%P':: parent hashes
|
|
|
|
'%p':: abbreviated parent hashes
|
|
|
|
'%an':: author name
|
|
|
|
'%aN':: author name (respecting .mailmap, see linkgit:git-shortlog[1]
|
|
|
|
or linkgit:git-blame[1])
|
|
|
|
'%ae':: author email
|
|
|
|
'%aE':: author email (respecting .mailmap, see linkgit:git-shortlog[1]
|
|
|
|
or linkgit:git-blame[1])
|
2019-10-29 12:09:14 +00:00
|
|
|
'%al':: author email local-part (the part before the '@' sign)
|
|
|
|
'%aL':: author local-part (see '%al') respecting .mailmap, see
|
|
|
|
linkgit:git-shortlog[1] or linkgit:git-blame[1])
|
2018-12-08 16:36:41 +00:00
|
|
|
'%ad':: author date (format respects --date= option)
|
|
|
|
'%aD':: author date, RFC2822 style
|
|
|
|
'%ar':: author date, relative
|
|
|
|
'%at':: author date, UNIX timestamp
|
|
|
|
'%ai':: author date, ISO 8601-like format
|
|
|
|
'%aI':: author date, strict ISO 8601 format
|
2019-11-20 00:51:21 +00:00
|
|
|
'%as':: author date, short format (`YYYY-MM-DD`)
|
2021-04-25 10:41:45 +00:00
|
|
|
'%ah':: author date, human style (like the `--date=human` option of
|
|
|
|
linkgit:git-rev-list[1])
|
2018-12-08 16:36:41 +00:00
|
|
|
'%cn':: committer name
|
|
|
|
'%cN':: committer name (respecting .mailmap, see
|
|
|
|
linkgit:git-shortlog[1] or linkgit:git-blame[1])
|
|
|
|
'%ce':: committer email
|
|
|
|
'%cE':: committer email (respecting .mailmap, see
|
|
|
|
linkgit:git-shortlog[1] or linkgit:git-blame[1])
|
2020-06-23 14:24:43 +00:00
|
|
|
'%cl':: committer email local-part (the part before the '@' sign)
|
|
|
|
'%cL':: committer local-part (see '%cl') respecting .mailmap, see
|
2019-10-29 12:09:14 +00:00
|
|
|
linkgit:git-shortlog[1] or linkgit:git-blame[1])
|
2018-12-08 16:36:41 +00:00
|
|
|
'%cd':: committer date (format respects --date= option)
|
|
|
|
'%cD':: committer date, RFC2822 style
|
|
|
|
'%cr':: committer date, relative
|
|
|
|
'%ct':: committer date, UNIX timestamp
|
|
|
|
'%ci':: committer date, ISO 8601-like format
|
|
|
|
'%cI':: committer date, strict ISO 8601 format
|
2019-11-20 00:51:21 +00:00
|
|
|
'%cs':: committer date, short format (`YYYY-MM-DD`)
|
2021-05-09 09:10:00 +00:00
|
|
|
'%ch':: committer date, human style (like the `--date=human` option of
|
2021-04-25 10:41:45 +00:00
|
|
|
linkgit:git-rev-list[1])
|
2018-12-08 16:36:41 +00:00
|
|
|
'%d':: ref names, like the --decorate option of linkgit:git-log[1]
|
|
|
|
'%D':: ref names without the " (", ")" wrapping.
|
2023-08-20 18:50:07 +00:00
|
|
|
'%(decorate[:<options>])'::
|
|
|
|
ref names with custom decorations. The `decorate` string may be followed by a
|
|
|
|
colon and zero or more comma-separated options. Option values may contain
|
|
|
|
literal formatting codes. These must be used for commas (`%x2C`) and closing
|
|
|
|
parentheses (`%x29`), due to their role in the option syntax.
|
|
|
|
+
|
|
|
|
** 'prefix=<value>': Shown before the list of ref names. Defaults to "{nbsp}`(`".
|
|
|
|
** 'suffix=<value>': Shown after the list of ref names. Defaults to "`)`".
|
|
|
|
** 'separator=<value>': Shown between ref names. Defaults to "`,`{nbsp}".
|
2023-08-20 18:50:08 +00:00
|
|
|
** 'pointer=<value>': Shown between HEAD and the branch it points to, if any.
|
|
|
|
Defaults to "{nbsp}`->`{nbsp}".
|
|
|
|
** 'tag=<value>': Shown before tag names. Defaults to "`tag:`{nbsp}".
|
|
|
|
|
|
|
|
+
|
|
|
|
For example, to produce decorations with no wrapping
|
|
|
|
or tag annotations, and spaces as separators:
|
|
|
|
+
|
|
|
|
`%(decorate:prefix=,suffix=,tag=,separator= )`
|
2023-08-20 18:50:07 +00:00
|
|
|
|
2023-08-20 18:50:03 +00:00
|
|
|
'%(describe[:<options>])'::
|
|
|
|
human-readable name, like linkgit:git-describe[1]; empty string for
|
|
|
|
undescribable commits. The `describe` string may be followed by a colon and
|
|
|
|
zero or more comma-separated options. Descriptions can be inconsistent when
|
|
|
|
tags are added or removed at the same time.
|
2021-02-14 10:10:57 +00:00
|
|
|
+
|
2021-12-15 17:39:48 +00:00
|
|
|
** 'tags[=<bool-value>]': Instead of only considering annotated tags,
|
2021-10-31 17:15:09 +00:00
|
|
|
consider lightweight tags as well.
|
2021-10-31 17:15:10 +00:00
|
|
|
** 'abbrev=<number>': Instead of using the default number of hexadecimal digits
|
|
|
|
(which will vary according to the number of objects in the repository with a
|
|
|
|
default of 7) of the abbreviated object name, use <number> digits, or as many
|
|
|
|
digits as needed to form a unique object name.
|
2021-02-14 10:10:57 +00:00
|
|
|
** 'match=<pattern>': Only consider tags matching the given
|
|
|
|
`glob(7)` pattern, excluding the "refs/tags/" prefix.
|
|
|
|
** 'exclude=<pattern>': Do not consider tags matching the given
|
|
|
|
`glob(7)` pattern, excluding the "refs/tags/" prefix.
|
|
|
|
|
2019-03-07 00:59:52 +00:00
|
|
|
'%S':: ref name given on the command line by which the commit was reached
|
|
|
|
(like `git log --source`), only works with `git log`
|
2018-12-08 16:36:41 +00:00
|
|
|
'%e':: encoding
|
|
|
|
'%s':: subject
|
|
|
|
'%f':: sanitized subject line, suitable for a filename
|
|
|
|
'%b':: body
|
|
|
|
'%B':: raw body (unwrapped subject and body)
|
2015-08-23 17:56:40 +00:00
|
|
|
ifndef::git-rev-list[]
|
2018-12-08 16:36:41 +00:00
|
|
|
'%N':: commit notes
|
2015-08-23 17:56:40 +00:00
|
|
|
endif::git-rev-list[]
|
2018-12-08 16:36:41 +00:00
|
|
|
'%GG':: raw verification message from GPG for a signed commit
|
|
|
|
'%G?':: show "G" for a good (valid) signature,
|
|
|
|
"B" for a bad signature,
|
|
|
|
"U" for a good signature with unknown validity,
|
|
|
|
"X" for a good signature that has expired,
|
|
|
|
"Y" for a good signature made by an expired key,
|
|
|
|
"R" for a good signature made by a revoked key,
|
|
|
|
"E" if the signature cannot be checked (e.g. missing key)
|
|
|
|
and "N" for no signature
|
|
|
|
'%GS':: show the name of the signer for a signed commit
|
|
|
|
'%GK':: show the key used to sign a signed commit
|
|
|
|
'%GF':: show the fingerprint of the key used to sign a signed commit
|
|
|
|
'%GP':: show the fingerprint of the primary key whose subkey was used
|
|
|
|
to sign a signed commit
|
gpg-interface: add minTrustLevel as a configuration option
Previously, signature verification for merge and pull operations checked
if the key had a trust-level of either TRUST_NEVER or TRUST_UNDEFINED in
verify_merge_signature(). If that was the case, the process die()d.
The other code paths that did signature verification relied entirely on
the return code from check_commit_signature(). And signatures made with
a good key, irregardless of its trust level, was considered valid by
check_commit_signature().
This difference in behavior might induce users to erroneously assume
that the trust level of a key in their keyring is always considered by
Git, even for operations where it is not (e.g. during a verify-commit or
verify-tag).
The way it worked was by gpg-interface.c storing the result from the
key/signature status *and* the lowest-two trust levels in the `result`
member of the signature_check structure (the last of these status lines
that were encountered got written to `result`). These are documented in
GPG under the subsection `General status codes` and `Key related`,
respectively [1].
The GPG documentation says the following on the TRUST_ status codes [1]:
"""
These are several similar status codes:
- TRUST_UNDEFINED <error_token>
- TRUST_NEVER <error_token>
- TRUST_MARGINAL [0 [<validation_model>]]
- TRUST_FULLY [0 [<validation_model>]]
- TRUST_ULTIMATE [0 [<validation_model>]]
For good signatures one of these status lines are emitted to
indicate the validity of the key used to create the signature.
The error token values are currently only emitted by gpgsm.
"""
My interpretation is that the trust level is conceptionally different
from the validity of the key and/or signature. That seems to also have
been the assumption of the old code in check_signature() where a result
of 'G' (as in GOODSIG) and 'U' (as in TRUST_NEVER or TRUST_UNDEFINED)
were both considered a success.
The two cases where a result of 'U' had special meaning were in
verify_merge_signature() (where this caused git to die()) and in
format_commit_one() (where it affected the output of the %G? format
specifier).
I think it makes sense to refactor the processing of TRUST_ status lines
such that users can configure a minimum trust level that is enforced
globally, rather than have individual parts of git (e.g. merge) do it
themselves (except for a grace period with backward compatibility).
I also think it makes sense to not store the trust level in the same
struct member as the key/signature status. While the presence of a
TRUST_ status code does imply that the signature is good (see the first
paragraph in the included snippet above), as far as I can tell, the
order of the status lines from GPG isn't well-defined; thus it would
seem plausible that the trust level could be overwritten with the
key/signature status if they were stored in the same member of the
signature_check structure.
This patch introduces a new configuration option: gpg.minTrustLevel. It
consolidates trust-level verification to gpg-interface.c and adds a new
`trust_level` member to the signature_check structure.
Backward-compatibility is maintained by introducing a special case in
verify_merge_signature() such that if no user-configurable
gpg.minTrustLevel is set, then the old behavior of rejecting
TRUST_UNDEFINED and TRUST_NEVER is enforced. If, on the other hand,
gpg.minTrustLevel is set, then that value overrides the old behavior.
Similarly, the %G? format specifier will continue show 'U' for
signatures made with a key that has a trust level of TRUST_UNDEFINED or
TRUST_NEVER, even though the 'U' character no longer exist in the
`result` member of the signature_check structure. A new format
specifier, %GT, is also introduced for users that want to show all
possible trust levels for a signature.
Another approach would have been to simply drop the trust-level
requirement in verify_merge_signature(). This would also have made the
behavior consistent with other parts of git that perform signature
verification. However, requiring a minimum trust level for signing keys
does seem to have a real-world use-case. For example, the build system
used by the Qubes OS project currently parses the raw output from
verify-tag in order to assert a minimum trust level for keys used to
sign git tags [2].
[1] https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=blob;f=doc/doc/DETAILS;h=bd00006e933ac56719b1edd2478ecd79273eae72;hb=refs/heads/master
[2] https://github.com/QubesOS/qubes-builder/blob/9674c1991deef45b1a1b1c71fddfab14ba50dccf/scripts/verify-git-tag#L43
Signed-off-by: Hans Jerry Illikainen <hji@dyntopia.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2019-12-27 13:55:57 +00:00
|
|
|
'%GT':: show the trust level for the key used to sign a signed commit
|
2018-12-08 16:36:41 +00:00
|
|
|
'%gD':: reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2
|
2019-09-11 14:52:51 +00:00
|
|
|
minutes ago}`; the format follows the rules described for the
|
2018-12-08 16:36:41 +00:00
|
|
|
`-g` option. The portion before the `@` is the refname as
|
|
|
|
given on the command line (so `git log -g refs/heads/master`
|
|
|
|
would yield `refs/heads/master@{0}`).
|
|
|
|
'%gd':: shortened reflog selector; same as `%gD`, but the refname
|
|
|
|
portion is shortened for human readability (so
|
|
|
|
`refs/heads/master` becomes just `master`).
|
|
|
|
'%gn':: reflog identity name
|
|
|
|
'%gN':: reflog identity name (respecting .mailmap, see
|
|
|
|
linkgit:git-shortlog[1] or linkgit:git-blame[1])
|
|
|
|
'%ge':: reflog identity email
|
|
|
|
'%gE':: reflog identity email (respecting .mailmap, see
|
|
|
|
linkgit:git-shortlog[1] or linkgit:git-blame[1])
|
|
|
|
'%gs':: reflog subject
|
2023-08-20 18:50:03 +00:00
|
|
|
'%(trailers[:<options>])'::
|
|
|
|
display the trailers of the body as interpreted by
|
|
|
|
linkgit:git-interpret-trailers[1]. The `trailers` string may be followed by
|
|
|
|
a colon and zero or more comma-separated options. If any option is provided
|
|
|
|
multiple times, the last occurrence wins.
|
2020-12-09 15:52:05 +00:00
|
|
|
+
|
2021-11-06 18:48:52 +00:00
|
|
|
** 'key=<key>': only show trailers with specified <key>. Matching is done
|
2019-01-28 21:33:34 +00:00
|
|
|
case-insensitively and trailing colon is optional. If option is
|
|
|
|
given multiple times trailer lines matching any of the keys are
|
|
|
|
shown. This option automatically enables the `only` option so that
|
|
|
|
non-trailer lines in the trailer block are hidden. If that is not
|
|
|
|
desired it can be disabled with `only=false`. E.g.,
|
|
|
|
`%(trailers:key=Reviewed-by)` shows trailer lines with key
|
|
|
|
`Reviewed-by`.
|
2021-11-06 18:48:52 +00:00
|
|
|
** 'only[=<bool>]': select whether non-trailer lines from the trailer
|
2020-12-09 15:52:05 +00:00
|
|
|
block should be included.
|
2021-11-06 18:48:52 +00:00
|
|
|
** 'separator=<sep>': specify a separator inserted between trailer
|
2019-01-28 21:33:37 +00:00
|
|
|
lines. When this option is not given each trailer line is
|
2021-11-06 18:48:52 +00:00
|
|
|
terminated with a line feed character. The string <sep> may contain
|
2019-01-28 21:33:37 +00:00
|
|
|
the literal formatting codes described above. To use comma as
|
|
|
|
separator one must use `%x2C` as it would otherwise be parsed as
|
2020-12-09 15:52:05 +00:00
|
|
|
next option. E.g., `%(trailers:key=Ticket,separator=%x2C )`
|
2019-01-28 21:33:37 +00:00
|
|
|
shows all trailer lines whose key is "Ticket" separated by a comma
|
|
|
|
and a space.
|
2021-11-06 18:48:52 +00:00
|
|
|
** 'unfold[=<bool>]': make it behave as if interpret-trailer's `--unfold`
|
2020-12-09 15:52:05 +00:00
|
|
|
option was given. E.g.,
|
2019-01-29 06:49:00 +00:00
|
|
|
`%(trailers:only,unfold=true)` unfolds and shows all trailer lines.
|
2021-11-06 18:48:52 +00:00
|
|
|
** 'keyonly[=<bool>]': only show the key part of the trailer.
|
|
|
|
** 'valueonly[=<bool>]': only show the value part of the trailer.
|
|
|
|
** 'key_value_separator=<sep>': specify a separator inserted between
|
2020-12-09 15:52:08 +00:00
|
|
|
trailer lines. When this option is not given each trailer key-value
|
|
|
|
pair is separated by ": ". Otherwise it shares the same semantics
|
2021-11-06 18:48:52 +00:00
|
|
|
as 'separator=<sep>' above.
|
2008-06-12 06:14:28 +00:00
|
|
|
|
2009-10-19 15:48:10 +00:00
|
|
|
NOTE: Some placeholders may depend on other options given to the
|
|
|
|
revision traversal engine. For example, the `%g*` reflog options will
|
|
|
|
insert an empty string unless we are traversing reflog entries (e.g., by
|
2014-09-18 20:53:53 +00:00
|
|
|
`git log -g`). The `%d` and `%D` placeholders will use the "short"
|
|
|
|
decoration format if `--decorate` was not already provided on the command
|
|
|
|
line.
|
2009-10-19 15:48:10 +00:00
|
|
|
|
2021-12-15 17:39:48 +00:00
|
|
|
The boolean options accept an optional value `[=<bool-value>]`. The values
|
2021-10-31 17:15:09 +00:00
|
|
|
`true`, `false`, `on`, `off` etc. are all accepted. See the "boolean"
|
|
|
|
sub-section in "EXAMPLES" in linkgit:git-config[1]. If a boolean
|
|
|
|
option is given with no value, it's enabled.
|
|
|
|
|
docs: stop using asciidoc no-inline-literal
In asciidoc 7, backticks like `foo` produced a typographic
effect, but did not otherwise affect the syntax. In asciidoc
8, backticks introduce an "inline literal" inside which markup
is not interpreted. To keep compatibility with existing
documents, asciidoc 8 has a "no-inline-literal" attribute to
keep the old behavior. We enabled this so that the
documentation could be built on either version.
It has been several years now, and asciidoc 7 is no longer
in wide use. We can now decide whether or not we want
inline literals on their own merits, which are:
1. The source is much easier to read when the literal
contains punctuation. You can use `master~1` instead
of `master{tilde}1`.
2. They are less error-prone. Because of point (1), we
tend to make mistakes and forget the extra layer of
quoting.
This patch removes the no-inline-literal attribute from the
Makefile and converts every use of backticks in the
documentation to an inline literal (they must be cleaned up,
or the example above would literally show "{tilde}" in the
output).
Problematic sites were found by grepping for '`.*[{\\]' and
examined and fixed manually. The results were then verified
by comparing the output of "html2text" on the set of
generated html pages. Doing so revealed that in addition to
making the source more readable, this patch fixes several
formatting bugs:
- HTML rendering used the ellipsis character instead of
literal "..." in code examples (like "git log A...B")
- some code examples used the right-arrow character
instead of '->' because they failed to quote
- api-config.txt did not quote tilde, and the resulting
HTML contained a bogus snippet like:
<tt><sub></tt> foo <tt></sub>bar</tt>
which caused some parsers to choke and omit whole
sections of the page.
- git-commit.txt confused ``foo`` (backticks inside a
literal) with ``foo'' (matched double-quotes)
- mentions of `A U Thor <author@example.com>` used to
erroneously auto-generate a mailto footnote for
author@example.com
- the description of --word-diff=plain incorrectly showed
the output as "[-removed-] and {added}", not "{+added+}".
- using "prime" notation like:
commit `C` and its replacement `C'`
confused asciidoc into thinking that everything between
the first backtick and the final apostrophe were meant
to be inside matched quotes
- asciidoc got confused by the escaping of some of our
asterisks. In particular,
`credential.\*` and `credential.<url>.\*`
properly escaped the asterisk in the first case, but
literally passed through the backslash in the second
case.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-04-26 08:51:57 +00:00
|
|
|
If you add a `+` (plus sign) after '%' of a placeholder, a line-feed
|
2009-10-05 06:43:32 +00:00
|
|
|
is inserted immediately before the expansion if and only if the
|
|
|
|
placeholder expands to a non-empty string.
|
|
|
|
|
2017-06-15 10:36:07 +00:00
|
|
|
If you add a `-` (minus sign) after '%' of a placeholder, all consecutive
|
|
|
|
line-feeds immediately preceding the expansion are deleted if and only if the
|
2009-10-05 06:43:32 +00:00
|
|
|
placeholder expands to an empty string.
|
|
|
|
|
2010-06-14 16:12:29 +00:00
|
|
|
If you add a ` ` (space) after '%' of a placeholder, a space
|
|
|
|
is inserted immediately before the expansion if and only if the
|
|
|
|
placeholder expands to a non-empty string.
|
|
|
|
|
2008-06-12 06:14:28 +00:00
|
|
|
* 'tformat:'
|
|
|
|
+
|
|
|
|
The 'tformat:' format works exactly like 'format:', except that it
|
|
|
|
provides "terminator" semantics instead of "separator" semantics. In
|
|
|
|
other words, each commit has the message terminator character (usually a
|
|
|
|
newline) appended, rather than a separator placed between entries.
|
|
|
|
This means that the final entry of a single-line format will be properly
|
|
|
|
terminated with a new line, just as the "oneline" format does.
|
|
|
|
For example:
|
|
|
|
+
|
|
|
|
---------------------
|
|
|
|
$ git log -2 --pretty=format:%h 4da45bef \
|
|
|
|
| perl -pe '$_ .= " -- NO NEWLINE\n" unless /\n/'
|
|
|
|
4da45be
|
|
|
|
7134973 -- NO NEWLINE
|
|
|
|
|
|
|
|
$ git log -2 --pretty=tformat:%h 4da45bef \
|
|
|
|
| perl -pe '$_ .= " -- NO NEWLINE\n" unless /\n/'
|
|
|
|
4da45be
|
|
|
|
7134973
|
|
|
|
---------------------
|
2009-02-24 09:59:15 +00:00
|
|
|
+
|
|
|
|
In addition, any unrecognized string that has a `%` in it is interpreted
|
|
|
|
as if it has `tformat:` in front of it. For example, these two are
|
|
|
|
equivalent:
|
|
|
|
+
|
|
|
|
---------------------
|
|
|
|
$ git log -2 --pretty=tformat:%h 4da45bef
|
|
|
|
$ git log -2 --pretty=%h 4da45bef
|
|
|
|
---------------------
|