averello/git-mirror
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-12-12 20:36:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jk/send-email-mailmap'

Browse Source 
"git send-email" learned "--mailmap" option to allow rewriting the
recipient addresses.

* jk/send-email-mailmap:
  send-email: add mailmap support via sendemail.mailmap and --mailmap
  check-mailmap: add options for additional mailmap sources
  check-mailmap: accept "user@host" contacts
This commit is contained in:
Junio C Hamano
2024-09-06 10:38:49 -07:00
parent 2e7b89e038 241499aba0
commit 6dcb2db0fa
7 changed files with 222 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mailmap.c
View File

@@ -142,11 +142,8 @@ static void read_mailmap_line(struct string_list *map, char *buffer)
add_mapping(map, name1, email1, name2, email2);
}
/* Flags for read_mailmap_file() */
#define MAILMAP_NOFOLLOW (1<<0)
static int read_mailmap_file(struct string_list *map, const char *filename,
unsigned flags)
int read_mailmap_file(struct string_list *map, const char *filename,
unsigned flags)
{
char buffer[1024];
FILE *f;
@@ -186,7 +183,7 @@ static void read_mailmap_string(struct string_list *map, char *buf)
}
}
static int read_mailmap_blob(struct string_list *map, const char *name)
int read_mailmap_blob(struct string_list *map, const char *name)
{
struct object_id oid;
char *buf;