diff options
| author | Shawn Pearce <spearce@spearce.org> | 2006-05-19 03:29:05 -0400 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-19 15:02:43 -0700 |
| commit | 732232a123e1e61e38babb1c572722bb8a189ba3 (patch) | |
| tree | 55a57e1e2c532d3724b32b81e40aa1c818b80458 | |
| parent | c22a7f0fb96d5c742581422452d3d68139b79ad6 (diff) | |
| download | git-732232a123e1e61e38babb1c572722bb8a189ba3.tar.gz | |
Force writing ref if it doesn't exist.
Normally we try to skip writing a ref if its value hasn't changed
but in the special case that the ref doesn't exist but the new
value is going to be 0{40} then force writing the ref anyway.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rw-r--r-- | refs.c | 4 | ||||
| -rw-r--r-- | refs.h | 1 |
2 files changed, 4 insertions, 1 deletions
@@ -288,6 +288,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; @@ -303,6 +304,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); @@ -405,7 +407,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; } @@ -7,6 +7,7 @@ struct ref_lock { char *log_file; unsigned char old_sha1[20]; int lock_fd; + int force_write; }; /* |