Merge branch 'jc/diff' into next

diff --git a/commit.c b/commit.c
index 06e00987cc471cb80b9ab891cb2c99bc42f26b96..42b44bba52b3bcf8545f7e7753d5ebb755155163 100644 (file)
--- a/commit.c
+++ b/commit.c
@@ -442,7 +442,8 @@ static int add_user_info(const char *what, enum cmit_fmt fmt, char *buf, const c
                ret += sprintf(buf + ret, "Date:   %s\n", show_date(time, tz));
                break;
        case CMIT_FMT_EMAIL:
-               ret += sprintf(buf + ret, "Date: %s\n", show_date(time, tz));
+               ret += sprintf(buf + ret, "Date: %s\n",
+                              show_rfc2822_date(time, tz));
                break;
        case CMIT_FMT_FULLER:
                ret += sprintf(buf + ret, "%sDate: %s\n", what, show_date(time, tz));
@@ -574,8 +575,9 @@ unsigned long pretty_print_commit(enum cmit_fmt fmt, const struct commit *commit
                }
 
                if (subject) {
-                       memcpy(buf + offset, subject, 9);
-                       offset += 9;
+                       int slen = strlen(subject);
+                       memcpy(buf + offset, subject, slen);
+                       offset += slen;
                }
                memset(buf + offset, ' ', indent);
                memcpy(buf + offset + indent, line, linelen);