summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-03-08 01:07:40 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-03-08 01:07:40 (GMT)
commit2acc35b08706234f3762992d431db301ead5797e (patch)
treea1de0806e9be091287c42e4181b70530014e24f0 /Makefile
parente4a0e2aac0e667a3a9b4449c5be4e084c4a9c44e (diff)
parentf067a13745fbeae1aa357876348a00e5edd0a629 (diff)
downloadgit-2acc35b08706234f3762992d431db301ead5797e.zip
git-2acc35b08706234f3762992d431db301ead5797e.tar.gz
git-2acc35b08706234f3762992d431db301ead5797e.tar.bz2
Merge branch 'master' into next
* master: repo-config: give value_ a sane default so regexec won't segfault Update http-push functionality cvsimport: Remove master-updating code
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index ab2890d..8e2a496 100644
--- a/Makefile
+++ b/Makefile
@@ -526,7 +526,7 @@ git-http-fetch$X: fetch.o http.o http-fetch.o $(LIB_FILE)
$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
$(LIBS) $(CURL_LIBCURL)
-git-http-push$X: http.o http-push.o $(LIB_FILE)
+git-http-push$X: revision.o http.o http-push.o $(LIB_FILE)
$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
$(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT)