Merge branch 'nd/rebase-show-current-patch'

diff --git a/builtin/commit.c b/builtin/commit.c
index 5dd766af2842dddb80d30cd73b8be8ccb4956eac..e8e8d13be4016e94014e98bcbe3489fad373d204 100644 (file)
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -1579,8 +1579,9 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
                append_merge_tag_headers(parents, &tail);
        }
 
-       if (commit_tree_extended(sb.buf, sb.len, active_cache_tree->oid.hash,
-                        parents, oid.hash, author_ident.buf, sign_commit, extra)) {
+       if (commit_tree_extended(sb.buf, sb.len, &active_cache_tree->oid,
+                                parents, &oid, author_ident.buf, sign_commit,
+                                extra)) {
                rollback_index_files();
                die(_("failed to write commit object"));
        }