Sync with 'maint'

diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
index b7e71a04f61798ed72282f683a6fcd3c156007ab..67ce1ef105d1494e7905e66750b14676e082e11c 100644 (file)
--- a/builtin/receive-pack.c
+++ b/builtin/receive-pack.c
@@ -526,7 +526,8 @@ static const char *update(struct command *cmd)
                return NULL; /* good */
        }
        else {
-               lock = lock_any_ref_for_update(namespaced_name, old_sha1, 0);
+               lock = lock_any_ref_for_update(namespaced_name, old_sha1,
+                                              0, NULL);
                if (!lock) {
                        rp_error("failed to lock %s", name);
                        return "failed to lock";