Merge branch 'nh/http'

* nh/http:
  Fix compile with expat, but an old curl version
  http-fetch: add optional DAV-based pack list

diff --combined Makefile
index fe40b65,1641519..6b10eaa
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -114,7 -114,7 +114,7 @@@ SPARSE_FLAGS = -D__BIG_ENDIAN__ -D__pow
  
  SCRIPT_SH = \
        git-add.sh git-bisect.sh git-branch.sh git-checkout.sh \
 -      git-cherry.sh git-clone.sh git-commit.sh \
 +      git-cherry.sh git-clean.sh git-clone.sh git-commit.sh \
        git-count-objects.sh git-diff.sh git-fetch.sh \
        git-format-patch.sh git-log.sh git-ls-remote.sh \
        git-merge-one-file.sh git-parse-remote.sh \
@@@ -208,7 -208,7 +208,7 @@@ LIB_OBJS = 
        quote.o read-cache.o refs.o run-command.o \
        server-info.o setup.o sha1_file.o sha1_name.o strbuf.o \
        tag.o tree.o usage.o config.o environment.o ctype.o copy.o \
 -      fetch-clone.o revision.o pager.o tree-walk.o \
 +      fetch-clone.o revision.o pager.o tree-walk.o xdiff-interface.o \
        $(DIFF_OBJS)
  
  GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
@@@ -324,10 -324,12 +324,12 @@@ ifndef NO_CUR
        curl_check := $(shell (echo 070908; curl-config --vernum) | sort -r | sed -ne 2p)
        ifeq "$(curl_check)" "070908"
                ifndef NO_EXPAT
-                       EXPAT_LIBEXPAT = -lexpat
                        PROGRAMS += git-http-push$X
                endif
        endif
+       ifndef NO_EXPAT
+               EXPAT_LIBEXPAT = -lexpat
+       endif
  endif
  
  ifndef NO_OPENSSL
@@@ -513,6 -515,11 +515,11 @@@ exec_cmd.o: exec_cmd.
  http.o: http.c
        $(CC) -o $*.o -c $(ALL_CFLAGS) -DGIT_USER_AGENT='"git/$(GIT_VERSION)"' $<
  
+ ifdef NO_EXPAT
+ http-fetch.o: http-fetch.c
+       $(CC) -o $*.o -c $(ALL_CFLAGS) -DNO_EXPAT $<
+ endif
+ 
  git-%$X: %.o $(GITLIBS)
        $(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS)
  
@@@ -535,7 -542,7 +542,7 @@@ git-imap-send$X: imap-send.o $(LIB_FILE
  
  git-http-fetch$X: fetch.o http.o http-fetch.o $(LIB_FILE)
        $(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
-               $(LIBS) $(CURL_LIBCURL)
+               $(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT)
  
  git-http-push$X: revision.o http.o http-push.o $(LIB_FILE)
        $(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \