global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-02-22 15:51:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jc/fmt-merge-msg-people' into next

Browse Source 
By Junio C Hamano
* jc/fmt-merge-msg-people:
  fmt-merge-msg: finishing touches
This commit is contained in:
Junio C Hamano
2012-03-07 14:27:00 -08:00
parent 04cb5c5cd3 8291cf649e
commit 76fbac3690
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
builtin/fmt-merge-msg.c
View File

@@ -182,6 +182,8 @@ static void add_branch_desc(struct strbuf *out, const char *name)
strbuf_release(&desc);
}
#define util_as_int(elem) ((intptr_t)((elem)->util))
static void record_person(int which, struct string_list *people,
struct commit *commit)
{
@@ -206,13 +208,11 @@ static void record_person(int which, struct string_list *people,
elem = string_list_lookup(people, name_buf);
if (!elem) {
elem = string_list_insert(people, name_buf);
elem->util = (void *) 0;
elem->util = (void *)0;
}
elem->util = (void*)(((intptr_t)elem->util) + 1);
elem->util = (void*)(util_as_int(elem) + 1);
}
#define util_as_int(elem) ((intptr_t)((elem)->util))
static int cmp_string_list_util_as_int(const void *a_, const void *b_)
{
const struct string_list_item *a = a_, *b = b_;
@@ -237,10 +237,10 @@ static void add_people_count(struct strbuf *out, struct string_list *people)
static int committer_is_me(const char *name)
{
int namelen = strlen(name);
const char *me = git_committer_info(IDENT_NO_DATE);
return (me && !memcmp(me, name, namelen) &&
!memcmp(me + namelen, " <", 2));
return (me &&
(me = skip_prefix(me, name)) != NULL &&
skip_prefix(me, " <"));
}
static void add_people_info(struct strbuf *out,
@@ -341,6 +341,7 @@ static void shortlog(const char *name,
rev->pending.nr = 0;
string_list_clear(&authors, 0);
string_list_clear(&committers, 0);
string_list_clear(&subjects, 0);
}