diff options
Diffstat (limited to 'refs.c')
| -rw-r--r-- | refs.c | 40 |
1 files changed, 21 insertions, 19 deletions
@@ -259,7 +259,7 @@ int check_ref_format(const char *ref) } } -static struct ref_lock* verify_lock(struct ref_lock *lock, +static struct ref_lock *verify_lock(struct ref_lock *lock, const unsigned char *old_sha1, int mustexist) { char buf[40]; @@ -285,7 +285,7 @@ static struct ref_lock* verify_lock(struct ref_lock *lock, return lock; } -static struct ref_lock* lock_ref_sha1_basic(const char *path, +static struct ref_lock *lock_ref_sha1_basic(const char *path, int plen, const unsigned char *old_sha1, int mustexist) { @@ -301,19 +301,18 @@ static struct ref_lock* lock_ref_sha1_basic(const char *path, unlock_ref(lock); return NULL; } + lock->lk = xcalloc(1, sizeof(struct lock_file)); 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); - lock->lock_fd = open(lock->lock_file, - O_WRONLY | O_CREAT | O_EXCL, 0666); + if (safe_create_leading_directories(lock->ref_file)) + die("unable to create directory for %s", lock->ref_file); + lock->lock_fd = hold_lock_file_for_update(lock->lk, lock->ref_file); if (lock->lock_fd < 0) { error("Couldn't open lock file %s: %s", - lock->lock_file, strerror(errno)); + lock->lk->filename, strerror(errno)); unlock_ref(lock); return NULL; } @@ -321,7 +320,7 @@ static struct ref_lock* lock_ref_sha1_basic(const char *path, return old_sha1 ? verify_lock(lock, old_sha1, mustexist) : lock; } -struct ref_lock* lock_ref_sha1(const char *ref, +struct ref_lock *lock_ref_sha1(const char *ref, const unsigned char *old_sha1, int mustexist) { if (check_ref_format(ref)) @@ -330,23 +329,23 @@ struct ref_lock* lock_ref_sha1(const char *ref, 5 + strlen(ref), old_sha1, mustexist); } -struct ref_lock* lock_any_ref_for_update(const char *ref, +struct ref_lock *lock_any_ref_for_update(const char *ref, const unsigned char *old_sha1, int mustexist) { return lock_ref_sha1_basic(git_path("%s", ref), strlen(ref), old_sha1, mustexist); } -void unlock_ref (struct ref_lock *lock) +void unlock_ref(struct ref_lock *lock) { if (lock->lock_fd >= 0) { close(lock->lock_fd); - unlink(lock->lock_file); + /* Do not free lock->lk -- atexit() still looks at them */ + if (lock->lk) + rollback_lock_file(lock->lk); } if (lock->ref_file) free(lock->ref_file); - if (lock->lock_file) - free(lock->lock_file); if (lock->log_file) free(lock->log_file); free(lock); @@ -385,7 +384,8 @@ static int log_ref_write(struct ref_lock *lock, sha1_to_hex(sha1), comitter, msg); - } else { + } + else { maxlen = strlen(comitter) + 2*40 + 4; logrec = xmalloc(maxlen); len = snprintf(logrec, maxlen, "%s %s %s\n", @@ -415,7 +415,7 @@ int write_ref_sha1(struct ref_lock *lock, if (write(lock->lock_fd, sha1_to_hex(sha1), 40) != 40 || write(lock->lock_fd, &term, 1) != 1 || close(lock->lock_fd) < 0) { - error("Couldn't write %s", lock->lock_file); + error("Couldn't write %s", lock->lk->filename); unlock_ref(lock); return -1; } @@ -423,7 +423,7 @@ int write_ref_sha1(struct ref_lock *lock, unlock_ref(lock); return -1; } - if (rename(lock->lock_file, lock->ref_file) < 0) { + if (commit_lock_file(lock->lk)) { error("Couldn't set %s", lock->ref_file); unlock_ref(lock); return -1; @@ -478,10 +478,12 @@ int read_ref_at(const char *ref, unsigned long at_time, unsigned char *sha1) "warning: Log %s has gap after %s.\n", logfile, show_rfc2822_date(date, tz)); } - } else if (date == at_time) { + } + else if (date == at_time) { if (get_sha1_hex(rec + 41, sha1)) die("Log %s is corrupt.", logfile); - } else { + } + else { if (get_sha1_hex(rec + 41, logged_sha1)) die("Log %s is corrupt.", logfile); if (memcmp(logged_sha1, sha1, 20)) { |