From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 13 Dec 2010 05:49:52 +0000 (-0800)
Subject: Merge branch 'tc/http-urls-ends-with-slash'
X-Git-Tag: v1.7.4-rc0~56
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a0078dee90e9b6baf17fa22cdeaadd8bec49e725;p=git.git

Merge branch 'tc/http-urls-ends-with-slash'

* 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 '&&'
---

a0078dee90e9b6baf17fa22cdeaadd8bec49e725
diff --cc Makefile
index 6439c7bd3,90aaa30e7..49c41f175
--- a/Makefile
+++ b/Makefile
@@@ -1946,9 -1876,10 +1946,9 @@@ builtin/log.o builtin/shortlog.o: short
  builtin/prune.o builtin/reflog.o reachable.o: reachable.h
  builtin/commit.o builtin/revert.o wt-status.o: wt-status.h
  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 \