From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 2 Apr 2009 05:46:31 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.3-rc0~50
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/02c62b10de16515497f1b6fde6278ac531b90f1c?ds=inline;hp=-c

Merge branch 'maint'

* maint:
Documentation: Remove an odd "instead"
fix portability problem with IS_RUN_COMMAND_ERR
mailmap: resurrect lower-casing of email addresses
---

02c62b10de16515497f1b6fde6278ac531b90f1c
diff --combined mailmap.c
index 654c6295cb,6be91b60df..bb1f2fb711
--- a/mailmap.c
+++ b/mailmap.c
@@@ -50,6 -50,15 +50,15 @@@ static void add_mapping(struct string_l
  {
  	struct mailmap_entry *me;
  	int index;
+ 	char *p;
+ 
+ 	if (old_email)
+ 		for (p = old_email; *p; p++)
+ 			*p = tolower(*p);
+ 	if (new_email)
+ 		for (p = new_email; *p; p++)
+ 			*p = tolower(*p);
+ 
  	if (old_email == NULL) {
  		old_email = new_email;
  		new_email = NULL;
@@@ -90,8 -99,7 +99,8 @@@
  		 old_name, old_email, new_name, new_email);
  }
  
 -static char *parse_name_and_email(char *buffer, char **name, char **email)
 +static char *parse_name_and_email(char *buffer, char **name,
 +		char **email, int allow_empty_email)
  {
  	char *left, *right, *nstart, *nend;
  	*name = *email = 0;
@@@ -100,7 -108,7 +109,7 @@@
  		return NULL;
  	if ((right = strchr(left+1, '>')) == NULL)
  		return NULL;
 -	if (left+1 == right)
 +	if (!allow_empty_email && (left+1 == right))
  		return NULL;
  
  	/* remove whitespace from beginning and end of name */
@@@ -151,8 -159,8 +160,8 @@@ static int read_single_mailmap(struct s
  			}
  			continue;
  		}
 -		if ((name2 = parse_name_and_email(buffer, &name1, &email1)) != NULL)
 -			parse_name_and_email(name2, &name2, &email2);
 +		if ((name2 = parse_name_and_email(buffer, &name1, &email1, 0)) != NULL)
 +			parse_name_and_email(name2, &name2, &email2, 1);
  
  		if (email1)
  			add_mapping(map, name1, email1, name2, email2);