X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=fetch.c;h=f7f8902580f0f5e4eb7a63000f9987e63715cd09;hb=fa0f02dfa15d0d95f8b6d27688bbf8ac940e3354;hp=73bde07aeaeea67e44aef7aec1b79d5806e80a1b;hpb=d9ad59e7636d98daa6131e9fd2cb2b4f5745a853;p=git.git

diff --git a/fetch.c b/fetch.c
index 73bde07a..f7f89025 100644
--- a/fetch.c
+++ b/fetch.c
@@ -9,8 +9,6 @@
 
 const char *write_ref = NULL;
 
-const unsigned char *current_ref = NULL;
-
 int get_tree = 0;
 int get_history = 0;
 int get_all = 0;
@@ -205,19 +203,12 @@ static int mark_complete(const char *path, const unsigned char *sha1)
 int pull(char *target)
 {
 	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)
-			return -1;
-	}
 
-	if (!get_recover) {
+	if (!get_recover)
 		for_each_ref(mark_complete);
-	}
 
 	if (interpret_target(target, sha1))
 		return error("Could not interpret %s as something to pull",
@@ -227,12 +218,7 @@ int pull(char *target)
 	if (loop())
 		return -1;
 	
-	if (write_ref) {
-		if (current_ref) {
-			write_ref_sha1(write_ref, fd, sha1);
-		} else {
-			write_ref_sha1_unlocked(write_ref, sha1);
-		}
-	}
+	if (write_ref)
+		write_ref_sha1_unlocked(write_ref, sha1);
 	return 0;
 }