Merge branch 'jk/cached-commit-buffer' into HEAD

diff --git a/builtin/am.c b/builtin/am.c
index 5bdd2d75781076636f93800520e9ed161295724f..6661edc162b770d40c62f3a03b7c0e59cb47ca51 100644 (file)
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -1641,8 +1641,8 @@ static void do_commit(const struct am_state *state)
                setenv("GIT_COMMITTER_DATE",
                        state->ignore_date ? "" : state->author_date, 1);
 
-       if (commit_tree(state->msg, state->msg_len, tree.hash, parents, commit.hash,
-                               author, state->sign_commit))
+       if (commit_tree(state->msg, state->msg_len, &tree, parents, &commit,
+                       author, state->sign_commit))
                die(_("failed to write commit object"));
 
        reflog_msg = getenv("GIT_REFLOG_ACTION");