diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-06-06 14:31:29 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-06 14:31:29 -0700 |
| commit | 68a40e5096add9a4d8f2dc0fecce19e9438eaba1 (patch) | |
| tree | ee8b10943b4f5275903f0b18a6b01090fe5bd60c /refs.h | |
| parent | Merge branch 'vb/sendemail' into next (diff) | |
| parent | ref-log: style fixes. (diff) | |
| download | tgif-68a40e5096add9a4d8f2dc0fecce19e9438eaba1.tar.xz | |
Merge branch 'jc/lockfile' into next
* jc/lockfile:
ref-log: style fixes.
refs.c: convert it to use lockfile interface.
Make index file locking code reusable to others.
HTTP cleanup
HTTP cleanup
git-format-patch: add --output-directory long option again
Diffstat (limited to 'refs.h')
| -rw-r--r-- | refs.h | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -3,8 +3,8 @@ struct ref_lock { char *ref_file; - char *lock_file; char *log_file; + struct lock_file *lk; unsigned char old_sha1[20]; int lock_fd; int force_write; @@ -24,13 +24,13 @@ extern int for_each_remote_ref(int (*fn)(const char *path, const unsigned char * extern int get_ref_sha1(const char *ref, unsigned char *sha1); /** Locks a "refs/" ref returning the lock on success and NULL on failure. **/ -extern struct ref_lock* lock_ref_sha1(const char *ref, const unsigned char *old_sha1, int mustexist); +extern struct ref_lock *lock_ref_sha1(const char *ref, const unsigned char *old_sha1, int mustexist); /** Locks any ref (for 'HEAD' type refs). */ -extern struct ref_lock* lock_any_ref_for_update(const char *ref, const unsigned char *old_sha1, int mustexist); +extern struct ref_lock *lock_any_ref_for_update(const char *ref, const unsigned char *old_sha1, int mustexist); /** Release any lock taken but not written. **/ -extern void unlock_ref (struct ref_lock *lock); +extern void unlock_ref(struct ref_lock *lock); /** Writes sha1 into the ref specified by the lock. **/ extern int write_ref_sha1(struct ref_lock *lock, const unsigned char *sha1, const char *msg); |