Merge part of js/portable into next

diff --git a/refs.c b/refs.c
index ac2619851d63e45a5f0d97b780e59af60fcc182b..d01fc3984a56e288e175f8201783f18dfe978c10 100644 (file)
--- a/refs.c
+++ b/refs.c
@@ -6,10 +6,6 @@
 /* We allow "recursive" symbolic refs. Only within reason, though */
 #define MAXDEPTH 5
 
-#ifndef USE_SYMLINK_HEAD
-#define USE_SYMLINK_HEAD 1
-#endif
-
 const char *resolve_ref(const char *path, unsigned char *sha1, int reading)
 {
        int depth = MAXDEPTH, len;
@@ -80,7 +76,7 @@ int create_symref(const char *git_HEAD, const char *refs_heads_master)
        char ref[1000];
        int fd, len, written;
 
-#if USE_SYMLINK_HEAD
+#ifdef USE_SYMLINK_HEAD
        if (!only_use_symrefs) {
                unlink(git_HEAD);
                if (!symlink(refs_heads_master, git_HEAD))
@@ -292,6 +288,8 @@ int write_ref_sha1(const char *ref, int fd, const unsigned char *sha1)
                return -1;
        filename = ref_file_name(ref);
        lock_filename = ref_lock_file_name(ref);
+       if (safe_create_leading_directories(filename))
+               die("unable to create leading directory for %s", filename);
        retval = write_ref_file(filename, lock_filename, fd, sha1);
        free(filename);
        free(lock_filename);
@@ -311,7 +309,9 @@ int write_ref_sha1(const char *ref, int fd, const unsigned char *sha1)
 static inline int bad_ref_char(int ch)
 {
        return (((unsigned) ch) <= ' ' ||
-               ch == '~' || ch == '^' || ch == ':');
+               ch == '~' || ch == '^' || ch == ':' ||
+               /* 2.13 Pattern Matching Notation */
+               ch == '?' || ch == '*' || ch == '[');
 }
 
 int check_ref_format(const char *ref)
@@ -358,6 +358,8 @@ int write_ref_sha1_unlocked(const char *ref, const unsigned char *sha1)
                return -1;
        filename = ref_file_name(ref);
        lock_filename = ref_lock_file_name(ref);
+       if (safe_create_leading_directories(filename))
+               die("unable to create leading directory for %s", filename);
        fd = open(lock_filename, O_WRONLY | O_CREAT | O_EXCL, 0666);
        if (fd < 0) {
                error("Writing %s", lock_filename);