Merge branch 'ap/log-mailmap'
Teach commands in the "log" family to optionally pay attention to the mailmap. * ap/log-mailmap: log --use-mailmap: optimize for cases without --author/--committer search log: add log.mailmap configuration option log: grep author/committer using mailmap test: add test for --use-mailmap option log: add --use-mailmap option pretty: use mailmap to display username and email mailmap: add mailmap structure to rev_info and pp mailmap: simplify map_user() interface mailmap: remove email copy and length limitation Use split_ident_line to parse author and committer string-list: allow case-insensitive string list
This commit is contained in:
@ -5,10 +5,14 @@ struct string_list_item {
|
||||
char *string;
|
||||
void *util;
|
||||
};
|
||||
|
||||
typedef int (*compare_strings_fn)(const char *, const char *);
|
||||
|
||||
struct string_list {
|
||||
struct string_list_item *items;
|
||||
unsigned int nr, alloc;
|
||||
unsigned int strdup_strings:1;
|
||||
compare_strings_fn cmp; /* NULL uses strcmp() */
|
||||
};
|
||||
|
||||
#define STRING_LIST_INIT_NODUP { NULL, 0, 0, 0 }
|
||||
|
||||
Reference in New Issue
Block a user