summaryrefslogtreecommitdiff
path: root/ident.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-05-26 09:37:04 -0700
committerJunio C Hamano <gitster@pobox.com>2011-05-26 09:37:04 -0700
commit93446aa760041a5a6f55605d94cdfad7bcd5a2f1 (patch)
tree33310ff4d5bc5fb380e67f7f880082688a83cd86 /ident.c
parent9e0ec12728dc3be3c0df4fa1ca4f7b8f33b89111 (diff)
parentc0336ff27a9a4bf9db87d65c5dec1ebf7dd9f8c6 (diff)
downloadgit-93446aa760041a5a6f55605d94cdfad7bcd5a2f1.tar.gz
Merge branch 'rg/copy-gecos-username' into maint
* rg/copy-gecos-username: copy_gecos: fix not adding nlen to len when processing "&"
Diffstat (limited to 'ident.c')
-rw-r--r--ident.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/ident.c b/ident.c
index 1c4adb0a9a..8e56b5e941 100644
--- a/ident.c
+++ b/ident.c
@@ -34,6 +34,7 @@ static void copy_gecos(const struct passwd *w, char *name, size_t sz)
*dst++ = toupper(*w->pw_name);
memcpy(dst, w->pw_name + 1, nlen - 1);
dst += nlen - 1;
+ len += nlen;
}
}
if (len < sz)