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

diff --combined Makefile
index ab2890d,1c555da..8e2a496
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -190,7 -190,7 +190,7 @@@ PYMODULES = 
  LIB_FILE=libgit.a
  
  LIB_H = \
 -      blob.h cache.h commit.h count-delta.h csum-file.h delta.h \
 +      blob.h cache.h commit.h csum-file.h delta.h \
        diff.h object.h pack.h pkt-line.h quote.h refs.h \
        run-command.h strbuf.h tag.h tree.h git-compat-util.h revision.h
  
@@@ -200,7 -200,7 +200,7 @@@ DIFF_OBJS = 
        diffcore-delta.o
  
  LIB_OBJS = \
 -      blob.o commit.o connect.o count-delta.o csum-file.o \
 +      blob.o commit.o connect.o csum-file.o \
        date.o diff-delta.o entry.o exec_cmd.o ident.o index.o \
        object.o pack-check.o patch-delta.o path.o pkt-line.o \
        quote.o read-cache.o refs.o run-command.o \
@@@ -526,7 -526,7 +526,7 @@@ git-http-fetch$X: fetch.o http.o http-f
        $(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)