global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-19 15:09:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'js/merge-base' into next

Browse Source 
* js/merge-base:
  Makefile: tighten git-http-{fetch,push} dependencies
This commit is contained in:
Junio C Hamano
2006-07-03 03:17:00 -07:00
parent 0356749cac f23c75a8ec
commit bcf1a77a73
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@@ -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)

6
object.c
View File

@@ -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;
}