In 1f0fc1db8599 (pretty: implement 'reference' format, 2019-11-19), the
"reference" format was added. As a built-in format, it cannot be
overridden, although different projects may have divergent conventions
on how to format a commit reference. E.g., Git uses
<hash> (<subject>, <short-date>) [1]
while Linux uses
<hash> ("<subject>") [2]
Teach pretty to look at a different set of config variables, all
starting with "override" (e.g. "pretty.overrideReference"), to override
the built-in formats. Note that a format called "override" by itself is
not affected. The prefix was chosen to make it clear to the user that
this should not be done without thought, as it may cause issues with
other tools that expect the built-in formats to be immutable.
[1] https://github.com/git/git/blob/3a238e539bcdfe3f9eb5010fd218640c1b499f7a/Documentation/SubmittingPatches#L144
[2] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/process/submitting-patches.rst?h=v5.9-rc3#n167
Signed-off-by: Beat Bolli <dev+git@xxxxxxxxx>
---
I intend to also submit a patch to gitk that will use "git show -s
--pretty=reference" if it is available, with a fallback to reading
"pretty.overrideReference", so there's a single point of configuration
for the reference format.
Documentation/config/pretty.txt | 6 ++++--
pretty.c | 20 +++++++++++++++-----
t/t4205-log-pretty-formats.sh | 8 ++++++++
3 files changed, 27 insertions(+), 7 deletions(-)
diff --git a/Documentation/config/pretty.txt b/Documentation/config/pretty.txt
index 063c6b63d9..d9dac7b3ee 100644
--- a/Documentation/config/pretty.txt
+++ b/Documentation/config/pretty.txt
@@ -5,5 +5,7 @@ pretty.<name>::
running `git config pretty.changelog "format:* %H %s"`
would cause the invocation `git log --pretty=changelog`
to be equivalent to running `git log "--pretty=format:* %H %s"`.
- Note that an alias with the same name as a built-in format
- will be silently ignored.
+ Note that you can override a built-in format by prefixing its
+ name with `override`, e.g. `pretty.overrideReference` to override
+ the built-in reference format. Doing so can cause interoperability
+ issues with tools that expect a built-in format to be immutable.
diff --git a/pretty.c b/pretty.c
index 2a3d46bf42..a8f8ade470 100644
--- a/pretty.c
+++ b/pretty.c
@@ -46,18 +46,28 @@ static int git_pretty_formats_config(const char *var, const char *value, void *c
{
struct cmt_fmt_map *commit_format = NULL;
const char *name;
+ const char *suffix;
const char *fmt;
int i;
if (!skip_prefix(var, "pretty.", &name))
return 0;
-
- for (i = 0; i < builtin_formats_len; i++) {
- if (!strcmp(commit_formats[i].name, name))
- return 0;
+ if (skip_prefix(name, "override", &suffix) && *suffix) {
+ name = suffix;
+ /* also search the built-in formats */
+ i = 0;
+ } else {
+ for (i = 0; i < builtin_formats_len; i++) {
+ if (!strcmp(commit_formats[i].name, name))
+ return 0;
+ }
+ /*
+ * Here, i == builtin_formats_len, so we only search the
+ * user-defined formats
+ */
}
- for (i = builtin_formats_len; i < commit_formats_len; i++) {
+ for (; i < commit_formats_len; i++) {
if (!strcmp(commit_formats[i].name, name)) {
commit_format = &commit_formats[i];
break;
diff --git a/t/t4205-log-pretty-formats.sh b/t/t4205-log-pretty-formats.sh
index 204c149d5a..55c37be392 100755
--- a/t/t4205-log-pretty-formats.sh
+++ b/t/t4205-log-pretty-formats.sh
@@ -52,6 +52,14 @@ test_expect_success 'alias masking builtin format' '
test_cmp expected actual
'
+test_expect_success 'overriding builtin format' '
+ git log --pretty=%H >expected &&
+ git config pretty.overrideOneline "%H" &&
+ git log --pretty=oneline >actual &&
+ git config --unset pretty.overrideOneline &&
+ test_cmp expected actual
+'
+
test_expect_success 'alias user-defined format' '
git log --pretty="format:%h" >expected &&
git config pretty.test-alias "format:%h" &&
--
2.26.0.277.gb8618d28a9
