summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-12-14 15:36:10 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-12-14 15:36:10 (GMT)
commit6b090e1710dbdf3f2c9f46c7f089ce34399b35c5 (patch)
tree5103919c6668e99e22db598c0f57299e14c6393b /Makefile
parent5b57076e5863602984ad089bab882730047e0fc3 (diff)
parent6f5185bd2d87dff587e4900aa022f6f9bd088f20 (diff)
downloadgit-6b090e1710dbdf3f2c9f46c7f089ce34399b35c5.zip
git-6b090e1710dbdf3f2c9f46c7f089ce34399b35c5.tar.gz
git-6b090e1710dbdf3f2c9f46c7f089ce34399b35c5.tar.bz2
Merge branch 'tc/http-urls-ends-with-slash' into maint
* tc/http-urls-ends-with-slash: http-fetch: rework url handling http-push: add trailing slash at arg-parse time, instead of later on http-push: check path length before using it http-push: Normalise directory names when pushing to some WebDAV servers http-backend: use end_url_with_slash() url: add str wrapper for end_url_with_slash() shift end_url_with_slash() from http.[ch] to url.[ch] t5550-http-fetch: add test for http-fetch t5550-http-fetch: add missing '&&'
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index cd0f648..f2de401 100644
--- a/Makefile
+++ b/Makefile
@@ -1879,7 +1879,7 @@ builtin/tar-tree.o archive-tar.o: tar.h
builtin/pack-objects.o: thread-utils.h
connect.o transport.o http-backend.o: url.h
http-fetch.o http-walker.o remote-curl.o transport.o walker.o: walker.h
-http.o http-walker.o http-push.o http-fetch.o remote-curl.o: http.h
+http.o http-walker.o http-push.o http-fetch.o remote-curl.o: http.h url.h
xdiff-interface.o $(XDIFF_OBJS): \
xdiff/xinclude.h xdiff/xmacros.h xdiff/xdiff.h xdiff/xtypes.h \