Skip to content

Commit 66a8a95

Browse files
edith007gitster
authored andcommitted
ident: rename commit_rewrite_person() to apply_mailmap_to_header()
commit_rewrite_person() takes a commit buffer and replaces the idents in the header with their canonical versions using the mailmap mechanism. The name "commit_rewrite_person()" is misleading as it doesn't convey what kind of rewrite are we going to do to the buffer. It also doesn't clearly mention that the function will limit itself to the header part of the buffer. The new name, "apply_mailmap_to_header()", expresses the functionality of the function pretty clearly. We intend to use apply_mailmap_to_header() in git-cat-file to replace idents in the headers of commit and tag object buffers. So, we will be extending this function to take tag objects buffer as well and replace idents on the tagger header using the mailmap mechanism. Mentored-by: Christian Couder <[email protected]> Mentored-by: John Cai <[email protected]> Signed-off-by: Siddharth Asthana <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent dc88e34 commit 66a8a95

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

cache.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -1689,10 +1689,10 @@ struct ident_split {
16891689
int split_ident_line(struct ident_split *, const char *, int);
16901690

16911691
/*
1692-
* Given a commit object buffer and the commit headers, replaces the idents
1693-
* in the headers with their canonical versions using the mailmap mechanism.
1692+
* Given a commit or tag object buffer and the commit or tag headers, replaces
1693+
* the idents in the headers with their canonical versions using the mailmap mechanism.
16941694
*/
1695-
void commit_rewrite_person(struct strbuf *, const char **, struct string_list *);
1695+
void apply_mailmap_to_header(struct strbuf *, const char **, struct string_list *);
16961696

16971697
/*
16981698
* Compare split idents for equality or strict ordering. Note that we

ident.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -387,8 +387,8 @@ static ssize_t rewrite_ident_line(const char *person, size_t len,
387387
return 0;
388388
}
389389

390-
void commit_rewrite_person(struct strbuf *buf, const char **header,
391-
struct string_list *mailmap)
390+
void apply_mailmap_to_header(struct strbuf *buf, const char **header,
391+
struct string_list *mailmap)
392392
{
393393
size_t buf_offset = 0;
394394

revision.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -3792,7 +3792,7 @@ static int commit_match(struct commit *commit, struct rev_info *opt)
37923792
if (!buf.len)
37933793
strbuf_addstr(&buf, message);
37943794

3795-
commit_rewrite_person(&buf, commit_headers, opt->mailmap);
3795+
apply_mailmap_to_header(&buf, commit_headers, opt->mailmap);
37963796
}
37973797

37983798
/* Append "fake" message parts as needed */

0 commit comments

Comments
 (0)