X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin%2Ffmt-merge-msg.c;h=7e2f22589dcb14d5ba95ce1331ef816a458533d0;hb=5b5d92aae910243ba12a737bbe117f0ae6ecf5c6;hp=75816329d6153c35e0763b35f70cfaf165f2a4b8;hpb=347231f7352a4caac8bd95924c20afde4455c89c;p=git.git diff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c index 75816329d..7e2f22589 100644 --- a/builtin/fmt-merge-msg.c +++ b/builtin/fmt-merge-msg.c @@ -293,7 +293,7 @@ static int do_fmt_merge_msg(int merge_title, struct strbuf *in, struct commit *head; struct rev_info rev; - head = lookup_commit(head_sha1); + head = lookup_commit_or_die(head_sha1, "HEAD"); init_revisions(&rev, NULL); rev.commit_format = CMIT_FMT_ONELINE; rev.ignore_merges = 1;