Merge branch 'dw/signoff-doc'

diff --git a/builtin/am.c b/builtin/am.c
index f1a25ab6ad881fc903a533595792b1a46b40ea91..9fb42fdd714a7785f6d75486db0d48fecceaacd6 100644 (file)
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -1441,7 +1441,7 @@ static void get_commit_info(struct am_state *state, struct commit *commit)
        assert(!state->msg);
        msg = strstr(buffer, "\n\n");
        if (!msg)
-               die(_("unable to parse commit %s"), sha1_to_hex(commit->object.sha1));
+               die(_("unable to parse commit %s"), oid_to_hex(&commit->object.oid));
        state->msg = xstrdup(msg + 2);
        state->msg_len = strlen(state->msg);
 }