Merge branch 'maint'

diff --git a/update-ref.c b/update-ref.c
index d79dc52fd7d1eb1117e37c6b400c5f99bc8e4fcd..ba4bf5153efb38914f66658c59784b58d8b69a0a 100644 (file)
--- a/update-ref.c
+++ b/update-ref.c
@@ -19,11 +19,13 @@ static int re_verify(const char *path, unsigned char *oldsha1, unsigned char *cu
 int main(int argc, char **argv)
 {
        char *hex;
-       const char *refname, *value, *oldval, *path, *lockpath;
+       const char *refname, *value, *oldval, *path;
+       char *lockpath;
        unsigned char sha1[20], oldsha1[20], currsha1[20];
        int fd, written;
 
        setup_git_directory();
+       git_config(git_default_config);
        if (argc < 3 || argc > 4)
                usage(git_update_ref_usage);
 
@@ -49,6 +51,8 @@ int main(int argc, char **argv)
        }
        path = strdup(path);
        lockpath = mkpath("%s.lock", path);
+       if (safe_create_leading_directories(lockpath) < 0)
+               die("Unable to create all of %s", lockpath);
 
        fd = open(lockpath, O_CREAT | O_EXCL | O_WRONLY, 0666);
        if (fd < 0)