Code

fetch.c: remove an unused variable and dead code.
authorJunio C Hamano <junkio@cox.net>
Wed, 24 May 2006 23:42:38 +0000 (16:42 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 24 May 2006 23:42:38 +0000 (16:42 -0700)
Funnily enough, this variable was never assigned ever since it
was introduced, and has been protecting some code that has never
been executed.

Signed-off-by: Junio C Hamano <junkio@cox.net>
fetch.c
fetch.h

diff --git a/fetch.c b/fetch.c
index 73bde07aeaeea67e44aef7aec1b79d5806e80a1b..f7f8902580f0f5e4eb7a63000f9987e63715cd09 100644 (file)
--- 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;
 }
diff --git a/fetch.h b/fetch.h
index 9837a3d03527ed648370f62b706978ad14fd20e5..001a6b8e2dccc02a64266ae804227674ee71338c 100644 (file)
--- a/fetch.h
+++ b/fetch.h
@@ -25,9 +25,6 @@ extern int fetch_ref(char *ref, unsigned char *sha1);
 /* If set, the ref filename to write the target value to. */
 extern const char *write_ref;
 
-/* If set, the hash that the current value of write_ref must be. */
-extern const unsigned char *current_ref;
-
 /* Set to fetch the target tree. */
 extern int get_tree;