On Mon, May 21, 2012 at 02:11:58AM -0700, Junio C Hamano wrote: > > So I think my preference would be: > > > > - apply the patch below as 5.5/13 > > > > - tweak patch 9 to remove the extra trimming > > > > - add a patch 14 to call strbuf_trim on the name and email buffers > > after reading them from system files. > > Sounds sensible; thanks. Here's the whole series again. Most of it is unchanged, but given the ordering problem earlier, it seems reasonable to just post it all again. [01/15]: ident: split setup_ident into separate functions [02/15]: http-push: do not access git_default_email directly [03/15]: fmt-merge-msg: don't use static buffer in record_person [04/15]: move identity config parsing to ident.c [05/15]: move git_default_* variables to ident.c [06/15]: ident: trim trailing newline from /etc/mailname This one is new and fixes the t4014 failure. The earlier version I posted trimmed all trailing whitespace, but there's not much point in being thorough, since this code gets removed later, anyway. [07/15]: format-patch: use default email for generating message ids [08/15]: fmt_ident: drop IDENT_WARN_ON_NO_NAME code [09/15]: ident: don't write fallback username into git_default_name [10/15]: drop length limitations on gecos-derived names and emails This one drops the new code from patch 6, as it is pointless with strbufs. I considered reordering the patches to avoid patch 6 altogether, but there is a circular dependency with getting rid of the WARN case in patch 8. [11/15]: ident: report passwd errors with a more friendly message [12/15]: ident: use full dns names to generate email addresses [13/15]: ident: use a dynamic strbuf in fmt_ident [14/15]: ident: trim whitespace from default name/email This one is new, and actually does a good job of trimming unnecessary whitespace (from both the front and back, and from both name and email). [15/15]: format-patch: refactor get_patch_filename -Peff -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html