summaryrefslogtreecommitdiff
path: root/fetch.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-09-23 18:51:02 -0700
committerJunio C Hamano <junkio@cox.net>2005-09-23 18:51:02 -0700
commita61399b5fb7f4b04d60f42b253cb0f684bcdd286 (patch)
tree1df99e7bb47996ec765328a5adedc62f6340e8fe /fetch.c
parent990f856a62a24bfd56bac1f5e4581381369e4ede (diff)
parentdc56bc034176d76ce95e9ba7636e3551d51dc897 (diff)
downloadgit-a61399b5fb7f4b04d60f42b253cb0f684bcdd286.tar.gz
Merge 'fixes' branch
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'fetch.c')
-rw-r--r--fetch.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fetch.c b/fetch.c
index e6fd624c12..1a33ae984f 100644
--- a/fetch.c
+++ b/fetch.c
@@ -48,6 +48,7 @@ static int process_tree(struct tree *tree)
struct tree_entry_list *next = entry->next;
if (process(entry->item.any))
return -1;
+ free(entry->name);
free(entry);
entry = next;
}
@@ -206,6 +207,7 @@ int pull(char *target)
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)