Merge branch 'jc/fmt-patch' into next

* jc/fmt-patch:
  git-fmt-patch: thinkofix to show [PATCH] properly.
This commit is contained in:
Junio C Hamano 2006-04-22 03:06:58 -07:00
commit f1f114d080

View File

@ -574,8 +574,9 @@ unsigned long pretty_print_commit(enum cmit_fmt fmt, const struct commit *commit
} }
if (subject) { if (subject) {
memcpy(buf + offset, subject, 9); int slen = strlen(subject);
offset += 9; memcpy(buf + offset, subject, slen);
offset += slen;
} }
memset(buf + offset, ' ', indent); memset(buf + offset, ' ', indent);
memcpy(buf + offset + indent, line, linelen); memcpy(buf + offset + indent, line, linelen);