Merge branch 'sp/reflog' into next

* sp/reflog:
  fetch.c: remove an unused variable and dead code.

diff --git a/fetch.c b/fetch.c
index fd57684..ae92d52 100644 (file)
--- a/fetch.c
+++ b/fetch.c
@@ -10,8 +10,6 @@
 const char *write_ref = NULL;
 const char *write_ref_log_details = NULL;
 
-const unsigned char *current_ref = NULL;
-
 int get_tree = 0;
 int get_history = 0;
 int get_all = 0;
@@ -213,16 +211,15 @@ int pull(char *target)
        save_commit_buffer = 0;
        track_object_refs = 0;
        if (write_ref) {
-               lock = lock_ref_sha1(write_ref, current_ref, 1);
+               lock = lock_ref_sha1(write_ref, NULL, 0);
                if (!lock) {
                        error("Can't lock ref %s", write_ref);
                        return -1;
                }
        }
 
-       if (!get_recover) {
+       if (!get_recover)
                for_each_ref(mark_complete);
-       }
 
        if (interpret_target(target, sha1)) {
                error("Could not interpret %s as something to pull", target);

diff --git a/fetch.h b/fetch.h
index 0011548..841bb1a 100644 (file)
--- a/fetch.h
+++ b/fetch.h
@@ -28,9 +28,6 @@ extern const char *write_ref;
 /* If set additional text will appear in the ref log. */
 extern const char *write_ref_log_details;
 
-/* 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;