Merge branch 'jc/fetchupload' into next

diff --git a/refs.c b/refs.c
index 9d37a028c3aabeefe06095e03be72a071ff66740..eeb1196ec40a64e9ab1d865fbfc42b207fed98ed 100644 (file)
--- a/refs.c
+++ b/refs.c
@@ -142,6 +142,8 @@ static int do_for_each_ref(const char *base, int (*fn)(const char *path, const u
                        namelen = strlen(de->d_name);
                        if (namelen > 255)
                                continue;
+                       if (namelen>5 && !strcmp(de->d_name+namelen-5,".lock"))
+                               continue;
                        memcpy(path + baselen, de->d_name, namelen+1);
                        if (stat(git_path("%s", path), &st) < 0)
                                continue;
@@ -288,6 +290,7 @@ static struct ref_lock* lock_ref_sha1_basic(const char *path,
        const unsigned char *old_sha1, int mustexist)
 {
        struct ref_lock *lock;
+       struct stat st;
 
        lock = xcalloc(1, sizeof(struct ref_lock));
        lock->lock_fd = -1;
@@ -295,7 +298,6 @@ static struct ref_lock* lock_ref_sha1_basic(const char *path,
        plen = strlen(path) - plen;
        path = resolve_ref(path, lock->old_sha1, mustexist);
        if (!path) {
-               error("Can't read ref %s", path);
                unlock_ref(lock);
                return NULL;
        }
@@ -303,6 +305,7 @@ static struct ref_lock* lock_ref_sha1_basic(const char *path,
        lock->ref_file = strdup(path);
        lock->lock_file = strdup(mkpath("%s.lock", lock->ref_file));
        lock->log_file = strdup(git_path("logs/%s", lock->ref_file + plen));
+       lock->force_write = lstat(lock->ref_file, &st) && errno == ENOENT;
 
        if (safe_create_leading_directories(lock->lock_file))
                die("unable to create directory for %s", lock->lock_file);
@@ -324,7 +327,7 @@ struct ref_lock* lock_ref_sha1(const char *ref,
        if (check_ref_format(ref))
                return NULL;
        return lock_ref_sha1_basic(git_path("refs/%s", ref),
-               strlen(ref), old_sha1, mustexist);
+               5 + strlen(ref), old_sha1, mustexist);
 }
 
 struct ref_lock* lock_any_ref_for_update(const char *ref,
@@ -405,7 +408,7 @@ int write_ref_sha1(struct ref_lock *lock,
 
        if (!lock)
                return -1;
-       if (!memcmp(lock->old_sha1, sha1, 20)) {
+       if (!lock->force_write && !memcmp(lock->old_sha1, sha1, 20)) {
                unlock_ref(lock);
                return 0;
        }