mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve abstraction of ref lock/write.

Browse Source 
Created 'struct ref_lock' to contain the data necessary to perform
a ref update.  This change improves writing a ref as the file names
are generated only once (rather than twice) and supports following
symrefs (up to the maximum depth).  Further the ref_lock structure
provides room to extend the update API with ref logging.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Shawn Pearce
2006-05-17 05:55:02 -04:00
committed by Junio C Hamano
parent 70e1a880a3
commit 4bd18c43d9
3 changed files with 146 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
fetch.c
View File

@ -204,14 +204,14 @@ static int mark_complete(const char *path, const unsigned char *sha1)
int pull(char *target)
{
struct ref_lock *lock;
unsigned char sha1[20];
int fd = -1;
save_commit_buffer = 0;
track_object_refs = 0;
if (write_ref && current_ref) {
fd = lock_ref_sha1(write_ref, current_ref);
if (fd < 0)
if (write_ref) {
lock = lock_ref_sha1(write_ref, current_ref, 1);
if (!lock)
return -1;
}
@ -219,20 +219,22 @@ int pull(char *target)
for_each_ref(mark_complete);
}
if (interpret_target(target, sha1))
return error("Could not interpret %s as something to pull",
target);
if (process(lookup_unknown_object(sha1)))
if (interpret_target(target, sha1)) {
error("Could not interpret %s as something to pull", target);
unlock_ref(lock);
return -1;
if (loop())
}
if (process(lookup_unknown_object(sha1))) {
unlock_ref(lock);
return -1;
}
if (loop()) {
unlock_ref(lock);
return -1;
}
if (write_ref) {
if (current_ref) {
write_ref_sha1(write_ref, fd, sha1);
} else {
write_ref_sha1_unlocked(write_ref, sha1);
}
return write_ref_sha1(lock, sha1, "git fetch");
}
return 0;
}