Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maint

diff --git a/builtin-fetch--tool.c b/builtin-fetch--tool.c
index 12adb3833cd60771f8e63b2ebaecff3769fa74e2..e2f8ede9ae4507ed1e431f9d14fc649f6475627d 100644 (file)
--- a/builtin-fetch--tool.c
+++ b/builtin-fetch--tool.c
@@ -1,3 +1,4 @@
+#include "builtin.h"
 #include "cache.h"
 #include "refs.h"
 #include "commit.h"
@@ -42,7 +43,7 @@ static int update_ref(const char *action,
        if (!rla)
                rla = "(reflog update)";
        snprintf(msg, sizeof(msg), "%s: %s", rla, action);
-       lock = lock_any_ref_for_update(refname, oldval);
+       lock = lock_any_ref_for_update(refname, oldval, 0);
        if (!lock)
                return 1;
        if (write_ref_sha1(lock, sha1, msg) < 0)