Merge branch 'js/merge-recursive'

diff --git a/builtin-update-ref.c b/builtin-update-ref.c
index e90737c350402fec8937a9e343485e1c71411f55..93c127196d272d99d8af24a5fbc7ac89efdbb3d4 100644 (file)
--- a/builtin-update-ref.c
+++ b/builtin-update-ref.c
@@ -22,7 +22,7 @@ int cmd_update_ref(int argc, const char **argv, const char *prefix)
                OPT_END(),
        };
 
-       git_config(git_default_config);
+       git_config(git_default_config, NULL);
        argc = parse_options(argc, argv, options, git_update_ref_usage, 0);
        if (msg && !*msg)
                die("Refusing to perform update with empty message.");