X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=builtin%2Ffmt-merge-msg.c;h=b69f7d3be2bd4585a6233d0f8361c55a76ae0a5d;hb=0f2dc722dd01097d1e1c1dac43b2f57924594457;hp=e99b5ddbf9a51be17bc0d976c942c29afe6563cd;hpb=6ccac9eed56280f035d84605b4451ae1721a3100;p=thirdparty%2Fgit.git diff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c index e99b5ddbf9..b69f7d3be2 100644 --- a/builtin/fmt-merge-msg.c +++ b/builtin/fmt-merge-msg.c @@ -603,7 +603,7 @@ int fmt_merge_msg(struct strbuf *in, struct strbuf *out, /* get current branch */ current_branch = current_branch_to_free = - resolve_refdup("HEAD", RESOLVE_REF_READING, head_oid.hash, NULL); + resolve_refdup("HEAD", RESOLVE_REF_READING, &head_oid, NULL); if (!current_branch) die("No current branch"); if (starts_with(current_branch, "refs/heads/"))