Merge branch 'jx/clean-interactive'

diff --git a/fast-import.c b/fast-import.c
index 45c87648677a90b293c633b02232f9a490be6833..f4d9969e5c81f9c1415f0908f090bf62b156e179 100644 (file)
--- a/fast-import.c
+++ b/fast-import.c
@@ -1694,7 +1694,7 @@ static int update_branch(struct branch *b)
                return 0;
        if (read_ref(b->name, old_sha1))
                hashclr(old_sha1);
-       lock = lock_any_ref_for_update(b->name, old_sha1, 0);
+       lock = lock_any_ref_for_update(b->name, old_sha1, 0, NULL);
        if (!lock)
                return error("Unable to lock %s", b->name);
        if (!force_update && !is_null_sha1(old_sha1)) {