diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-02-26 08:51:00 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-02-26 08:51:00 -0800 |
| commit | e24570b0a3d987e2dfeddb8c3a7cfb9a7a7cf726 (patch) | |
| tree | 338398383954edb73a727b49f690a7bdeeeb8b19 | |
| parent | Merge branch 'ek/mingw-rename-symlink' (diff) | |
| parent | mailmap: fix check-mailmap with full mailmap line (diff) | |
| download | git-e24570b0a3d987e2dfeddb8c3a7cfb9a7a7cf726.tar.gz git-e24570b0a3d987e2dfeddb8c3a7cfb9a7a7cf726.zip | |
Merge branch 'jk/check-mailmap-wo-name-fix'
"git check-mailmap" segfault fix.
* jk/check-mailmap-wo-name-fix:
mailmap: fix check-mailmap with full mailmap line
| -rw-r--r-- | builtin/check-mailmap.c | 2 | ||||
| -rwxr-xr-x | t/t4203-mailmap.sh | 12 |
2 files changed, 13 insertions, 1 deletions
diff --git a/builtin/check-mailmap.c b/builtin/check-mailmap.c index df00b5ee13..be2cebe121 100644 --- a/builtin/check-mailmap.c +++ b/builtin/check-mailmap.c @@ -35,7 +35,7 @@ static void check_mailmap(struct string_list *mailmap, const char *contact) mail = ident.mail_begin; maillen = ident.mail_end - ident.mail_begin; } else { - name = NULL; + name = ""; namelen = 0; mail = contact; maillen = strlen(contact); diff --git a/t/t4203-mailmap.sh b/t/t4203-mailmap.sh index 2421491931..4a6242ff99 100755 --- a/t/t4203-mailmap.sh +++ b/t/t4203-mailmap.sh @@ -113,6 +113,18 @@ test_expect_success 'check-mailmap --stdin simple address: no mapping' ' test_cmp expect actual ' +test_expect_success 'check-mailmap name and address: mapping' ' + test_when_finished "rm .mailmap" && + cat >.mailmap <<-EOF && + Bug Reports <bugs-new@company.xx> Bugs <bugs@company.xx> + EOF + cat >expect <<-EOF && + <bugs@company.xx> + EOF + git check-mailmap "bugs@company.xx" >actual && + test_cmp expect actual +' + test_expect_success 'No mailmap' ' cat >expect <<-EOF && $GIT_AUTHOR_NAME (1): |