From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 20 May 2011 03:37:21 +0000 (-0700)
Subject: Merge branch 'rg/copy-gecos-username'
X-Git-Tag: v1.7.6-rc0~49
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ac39c5f554f80b5baddea9a6e6b5ff53cb92b6e3?ds=sidebyside;hp=-c

Merge branch 'rg/copy-gecos-username'

* rg/copy-gecos-username:
copy_gecos: fix not adding nlen to len when processing "&"
---

ac39c5f554f80b5baddea9a6e6b5ff53cb92b6e3
diff --combined ident.c
index 1c4adb0a9a,4232084208..8e56b5e941
--- a/ident.c
+++ b/ident.c
@@@ -34,6 -34,7 +34,7 @@@ static void copy_gecos(const struct pas
  			*dst++ = toupper(*w->pw_name);
  			memcpy(dst, w->pw_name + 1, nlen - 1);
  			dst += nlen - 1;
+ 			len += nlen;
  		}
  	}
  	if (len < sz)
@@@ -217,10 -218,8 +218,10 @@@ const char *fmt_ident(const char *name
  	}
  
  	strcpy(date, git_default_date);
 -	if (!name_addr_only && date_str)
 -		parse_date(date_str, date, sizeof(date));
 +	if (!name_addr_only && date_str && date_str[0]) {
 +		if (parse_date(date_str, date, sizeof(date)) < 0)
 +			die("invalid date format: %s", date_str);
 +	}
  
  	i = copy(buffer, sizeof(buffer), 0, name);
  	i = add_raw(buffer, sizeof(buffer), i, " <");