X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=sequencer.c;h=06e52b4c83ffc0ce2b9414afe3fb1b4ee91d4335;hb=583736c0bcf09adaa5621b142d8e43c22354041b;hp=351548f57db61e62b47584020464aee877b48d8d;hpb=968792eeeb51be4ff3218c89af00a987cdea8a9a;p=~andy%2Fgit diff --git a/sequencer.c b/sequencer.c index 351548f57..06e52b4c8 100644 --- a/sequencer.c +++ b/sequencer.c @@ -279,7 +279,8 @@ static int fast_forward_to(const unsigned char *to, const unsigned char *from, read_cache(); if (checkout_fast_forward(from, to, 1)) exit(1); /* the callee should have complained already */ - ref_lock = lock_any_ref_for_update("HEAD", unborn ? null_sha1 : from, 0); + ref_lock = lock_any_ref_for_update("HEAD", unborn ? null_sha1 : from, + 0, NULL); strbuf_addf(&sb, "%s: fast-forward", action_name(opts)); ret = write_ref_sha1(ref_lock, to, sb.buf); strbuf_release(&sb);