kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'sp/reflog' into next 

* sp/reflog:
  fetch.c: do not pass uninitialized lock to unlock_ref().
maint
Junio C Hamano 2006-05-31 15:23:54 -07:00
parent a25963bb3f 99bd0f5558
commit b0a7ca5ee0
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fetch.c
View File

@ -209,7 +209,7 @@ static int mark_complete(const char *path, const unsigned char *sha1)

int pull(char *target)
{
struct ref_lock *lock;
struct ref_lock *lock = NULL;
unsigned char sha1[20];
char *msg;
int ret;
@ -229,15 +229,18 @@ int pull(char *target)

if (interpret_target(target, sha1)) {
error("Could not interpret %s as something to pull", target);
unlock_ref(lock);
if (lock)
unlock_ref(lock);
return -1;
}
if (process(lookup_unknown_object(sha1))) {
unlock_ref(lock);
if (lock)
unlock_ref(lock);
return -1;
}
if (loop()) {
unlock_ref(lock);
if (lock)
unlock_ref(lock);
return -1;
}