diff --git a/Makefile b/Makefile index fe6f1030ea..a62e8a3f4b 100644 --- a/Makefile +++ b/Makefile @@ -632,11 +632,11 @@ git-ssh-push$X: rsh.o git-imap-send$X: imap-send.o $(LIB_FILE) http.o http-fetch.o http-push.o: http.h -git-http-fetch$X: fetch.o http.o http-fetch.o $(LIB_FILE) +git-http-fetch$X: fetch.o http.o http-fetch.o $(GITLIBS) $(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \ $(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT) -git-http-push$X: revision.o http.o http-push.o $(LIB_FILE) +git-http-push$X: revision.o http.o http-push.o $(GITLIBS) $(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \ $(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT) diff --git a/object.c b/object.c index 24c967d5f2..1c36759715 100644 --- a/object.c +++ b/object.c @@ -240,7 +240,7 @@ void clear_object_marks(unsigned mark) { int i; - for (i = 0; i < obj_allocs; i++) - if (objs[i]) - objs[i]->flags &= ~mark; + for (i = 0; i < obj_hash_size; i++) + if (obj_hash[i]) + obj_hash[i]->flags &= ~mark; }