Merge branch 'jc/doc-diff-filter-exclude' into maint

diff --git a/builtin/reset.c b/builtin/reset.c
index d0014b625843b20cc3f7db827e326367e3e49a81..e8c57670304554ec0c91cca819e78b04af59b9c6 100644 (file)
--- a/builtin/reset.c
+++ b/builtin/reset.c
@@ -96,14 +96,14 @@ static void print_new_head_line(struct commit *commit)
        const char *hex, *body;
        const char *msg;
 
-       hex = find_unique_abbrev(get_object_hash(commit->object), DEFAULT_ABBREV);
+       hex = find_unique_abbrev(commit->object.oid.hash, DEFAULT_ABBREV);
        printf(_("HEAD is now at %s"), hex);
        msg = logmsg_reencode(commit, NULL, get_log_output_encoding());
        body = strstr(msg, "\n\n");
        if (body) {
                const char *eol;
                size_t len;
-               body += 2;
+               body = skip_blank_lines(body + 2);
                eol = strchr(body, '\n');
                len = eol ? eol - body : strlen(body);
                printf(" %.*s\n", (int) len, body);