[PATCH 3/3] Add support for git's mailmap.

John Keeping john at keeping.me.uk
Mon Aug 29 18:04:18 CEST 2016

On Mon, Aug 29, 2016 at 11:18:16AM -0400, Jason A. Smith wrote:
> On 08/26/2016 07:13 PM, John Keeping wrote:
> > On Fri, Aug 26, 2016 at 05:30:32PM -0400, Jason A. Smith wrote:
> >>
> >> Sorry for the extra email noise, but while fixing these I found two more
> >> cgit_open_filter() function calls that should probably be changed to
> >> cgit_open_email_filter() in the first patch:
> >>
> >> ui-refs.c:146
> >> ui-tag.c:85
> >
> > Those both use tagger_email, so that makes sense, I completely forgot
> > about that one and only converted author_email and committer_email.
> >
> > The reference in ui-tag.c also needs angle brackets inserted in the
> > output in the !noplainemail case.  Feel free to squash that into the
> > first patch, and take ownership if you want.
> I fixed both of these and squashed them into your commits since they 
> were very minor changes.
> > I also noticed that we don't check the return value of read_mailmap(),
> > I'm not entirely sure what we should do if it fails, but it does look
> > like "missing mailmap" is not a failure case, so we probably should be
> > doing something if it returns an error.
> I am going to update the 3rd mailmap commit now. What would you suggest 
> doing if there is an error reading the mailmap file? Should it call 
> cgit_print_error_page() or is that too much and instead just log an 
> error message to stderr so it goes into the web server's error logs?
> I looked at the git sources and didn't see any examples of any other 
> code checking for errors returned by read_mailmap()

Printing to stderr seems reasonable.  As a user there's nothing more
annoying than observing the something isn't working (for example, the
mailmap isn't being applied) and having no way of telling where the
error is, so printing a warning if read_mailmap() fails seems like the
right thing to do.

More information about the CGit mailing list