Merge branch 'maint'

diff --git a/builtin/replace.c b/builtin/replace.c
index 11b0a55ae7f6e3d1a04eeb4026b151144d0315ba..301b45ce6a453c472566278521bb51fcbd91ee10 100644 (file)
--- a/builtin/replace.c
+++ b/builtin/replace.c
@@ -105,7 +105,7 @@ static int replace_object(const char *object_ref, const char *replace_ref,
        else if (!force)
                die("replace ref '%s' already exists", ref);
 
-       lock = lock_any_ref_for_update(ref, prev, 0);
+       lock = lock_any_ref_for_update(ref, prev, 0, NULL);
        if (!lock)
                die("%s: cannot lock the ref", ref);
        if (write_ref_sha1(lock, repl, NULL) < 0)