pretty: find pretty formats case-insensitively

User-defined pretty formats are stored in config, which is meant to use case-insensitive matching for names as noted in config.txt's 'Syntax' section: All the other lines [...] are recognized as setting variables, in the form 'name = value' [...]. The variable names are case-insensitive, [...]. When a user specifies one of their format aliases with an uppercase in it, however, it is not found. $ git config pretty.testAlias %h $ git config --list | grep pretty pretty.testalias=%h $ git log --format=testAlias -1 fatal: invalid --pretty format: testAlias $ git log --format=testalias -1 3c2a3fdc38 This is true whether the name in the config file uses any uppercase characters or not. Use case-insensitive comparisons when identifying format aliases. Co-authored-by: Jeff King <peff@peff.net> Signed-off-by: Brian Lyles <brianmlyles@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Brian Lyles committed Mar 25, 2024 at 02:25 UTC f999d5188b4060aa0f784a6f4cf1574ea352a1e7
2 files changed +9 -1
pretty.c
+1 -1
@@ -140,7 +140,7 @@ static struct cmt_fmt_map *find_commit_format_recursive(const char *sought,
140 for (i = 0; i < commit_formats_len; i++) {
141 size_t match_len;
142
143 - if (!starts_with(commit_formats[i].name, sought))
143 + if (!istarts_with(commit_formats[i].name, sought))
144 continue;
145
146 match_len = strlen(commit_formats[i].name);
t/t4205-log-pretty-formats.sh
+8
@@ -58,6 +58,14 @@ test_expect_success 'alias user-defined format' '
58 test_cmp expected actual
59 '
60
61 +test_expect_success 'alias user-defined format is matched case-insensitively' '
62 + git log --pretty="format:%h" >expected &&
63 + test_config pretty.testone "format:%h" &&
64 + test_config pretty.testtwo testOne &&
65 + git log --pretty=testTwo >actual &&
66 + test_cmp expected actual
67 +'
68 +
69 test_expect_success 'alias user-defined tformat with %s (ISO8859-1 encoding)' '
70 test_config i18n.logOutputEncoding $test_encoding &&
71 git log --oneline >expected-s &&