Merge branch 'maint'

* maint:
Fix typo in remote set-head usage
Makefile: hide stderr of curl-config test

diff --combined Makefile
index 9bc5e403650d171f1b5e5a6868fdd66009739b7d,6b73c14aa0f2e09d4968e26385dc5668c3524428..4ad6fbd64e5cea1ff833f142ec0072566039bc49
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -495,7 -495,6 +495,7 @@@ PROGRAM_OBJS += sh-i18n--envsubst.
  PROGRAM_OBJS += shell.o
  PROGRAM_OBJS += show-index.o
  PROGRAM_OBJS += upload-pack.o
 +PROGRAM_OBJS += remote-testsvn.o
  
  # Binary suffix, set to .exe for Windows builds
  X =
@@@ -746,7 -745,6 +746,7 @@@ LIB_OBJS += editor.
  LIB_OBJS += entry.o
  LIB_OBJS += environment.o
  LIB_OBJS += exec_cmd.o
 +LIB_OBJS += fetch-pack.o
  LIB_OBJS += fsck.o
  LIB_OBJS += gettext.o
  LIB_OBJS += gpg-interface.o
@@@ -764,7 -762,6 +764,7 @@@ LIB_OBJS += lockfile.
  LIB_OBJS += log-tree.o
  LIB_OBJS += mailmap.o
  LIB_OBJS += match-trees.o
 +LIB_OBJS += merge.o
  LIB_OBJS += merge-file.o
  LIB_OBJS += merge-recursive.o
  LIB_OBJS += mergesort.o
@@@ -799,7 -796,6 +799,7 @@@ LIB_OBJS += rerere.
  LIB_OBJS += resolve-undo.o
  LIB_OBJS += revision.o
  LIB_OBJS += run-command.o
 +LIB_OBJS += send-pack.o
  LIB_OBJS += sequencer.o
  LIB_OBJS += server-info.o
  LIB_OBJS += setup.o
@@@ -1086,7 -1082,6 +1086,7 @@@ ifeq ($(uname_O),Cygwin
                NO_SYMLINK_HEAD = YesPlease
                NO_IPV6 = YesPlease
                OLD_ICONV = UnfortunatelyYes
 +              CYGWIN_V15_WIN32API = YesPlease
        endif
        NO_THREAD_SAFE_PREAD = YesPlease
        NEEDS_LIBICONV = YesPlease
@@@ -1386,10 -1381,6 +1386,10 @@@ ifeq ($(uname_S),NONSTOP_KERNEL
        MKDIR_WO_TRAILING_SLASH = YesPlease
        # RFE 10-120912-4693 submitted to HP NonStop development.
        NO_SETITIMER = UnfortunatelyYes
 +      SANE_TOOL_PATH=/usr/coreutils/bin:/usr/local/bin
 +      SHELL_PATH=/usr/local/bin/bash
 +      # as of H06.25/J06.14, we might better use this
 +      #SHELL_PATH=/usr/coreutils/bin/bash
  endif
  ifneq (,$(findstring MINGW,$(uname_S)))
        pathsep = ;
@@@ -1573,7 -1564,7 +1573,7 @@@ els
        REMOTE_CURL_NAMES = $(REMOTE_CURL_PRIMARY) $(REMOTE_CURL_ALIASES)
        PROGRAM_OBJS += http-fetch.o
        PROGRAMS += $(REMOTE_CURL_NAMES)
-       curl_check := $(shell (echo 070908; curl-config --vernum) | sort -r | sed -ne 2p)
+       curl_check := $(shell (echo 070908; curl-config --vernum) 2>/dev/null | sort -r | sed -ne 2p)
        ifeq "$(curl_check)" "070908"
                ifndef NO_EXPAT
                        PROGRAM_OBJS += http-push.o
@@@ -1898,9 -1889,6 +1898,9 @@@ ifdef NO_REGE
        COMPAT_CFLAGS += -Icompat/regex
        COMPAT_OBJS += compat/regex/regex.o
  endif
 +ifdef CYGWIN_V15_WIN32API
 +      COMPAT_CFLAGS += -DCYGWIN_V15_WIN32API
 +endif
  
  ifdef USE_NED_ALLOCATOR
         COMPAT_CFLAGS += -Icompat/nedmalloc
@@@ -2461,10 -2449,6 +2461,10 @@@ git-http-push$X: revision.o http.o http
        $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
                $(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT)
  
 +git-remote-testsvn$X: remote-testsvn.o GIT-LDFLAGS $(GITLIBS) $(VCSSVN_LIB)
 +      $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS) \
 +      $(VCSSVN_LIB)
 +
  $(REMOTE_CURL_ALIASES): $(REMOTE_CURL_PRIMARY)
        $(QUIET_LNCP)$(RM) $@ && \
        ln $< $@ 2>/dev/null || \