Merge branch 'rg/copy-gecos-username'

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

diff --combined ident.c
index 1c4adb0a9a7e94936ba64d286cedd65f4b8255a6,4232084208943c0772e394cfcff2328fb04493af..8e56b5e941e85c9634d420a3e8140c328bca9c30
--- 1/ident.c
--- 2/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, " <");