From: Junio C Hamano <junkio@cox.net>
Date: Wed, 31 May 2006 22:23:54 +0000 (-0700)
Subject: Merge branch 'sp/reflog' into next
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=b0a7ca5ee07c1962c4ed8a3c65eb3317fe6e6184;hp=a25963bb3fcd312b7eff97d042072c1b452cc39c;p=git.git

Merge branch 'sp/reflog' into next

* sp/reflog:
  fetch.c: do not pass uninitialized lock to unlock_ref().
---

diff --git a/fetch.c b/fetch.c
index e9347baf..1291bbac 100644
--- a/fetch.c
+++ b/fetch.c
@@ -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;
 	}