1 files changed, 15 insertions, 0 deletions
diff --git a/commit-tree.c b/commit-tree.c
index b20957546a..93f3a57991 100644
--- a/commit-tree.c
+++ b/commit-tree.c
@@ -96,6 +96,21 @@ static void remove_special(char *p)
 		if (!c)
 			break;
 	}
+
+	/*
+	 * Go back, and remove crud from the end: some people
+	 * have commas etc in their gecos field
+	 */
+	dst--;
+	while (--dst >= p) {
+		unsigned char c = *dst;
+		switch (c) {
+		case ',': case ';': case '.':
+			*dst = 0;
+			continue;
+		}
+		break;
+	}
 }
 
 static const char *month_names[] = {