aboutsummaryrefslogtreecommitdiff
path: root/fetch.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-05-24 16:42:38 -0700
committerJunio C Hamano <junkio@cox.net>2006-05-24 16:42:38 -0700
commit84c667ff97da2a3864ef7952b9f438d133ce35ef (patch)
tree6e4860856d7f1494303658fb2e5e4b96007604e9 /fetch.c
parent4d548150ace0816dd5fe678cdbde75b13d5e5249 (diff)
downloadgit-84c667ff97da2a3864ef7952b9f438d133ce35ef.tar.gz
git-84c667ff97da2a3864ef7952b9f438d133ce35ef.tar.xz
fetch.c: remove an unused variable and dead code.
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>
Diffstat (limited to 'fetch.c')
-rw-r--r--fetch.c20
1 files changed, 3 insertions, 17 deletions
diff --git a/fetch.c b/fetch.c
index 73bde07ae..f7f890258 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;
}