diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-11-26 14:12:07 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-11-26 14:12:07 -0800 |
| commit | 77b598b438e51d45229fe945e2139a7789a150bc (patch) | |
| tree | 258fc8e1e307d9e4e54741823f382246d3ca1103 /Makefile | |
| parent | emacs: make 'git-status' work with separate git dirs (diff) | |
| parent | Fix typo in remote set-head usage (diff) | |
| download | tgif-77b598b438e51d45229fe945e2139a7789a150bc.tar.xz | |
Merge branch 'maint'
* maint:
Fix typo in remote set-head usage
Makefile: hide stderr of curl-config test
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1573,7 +1573,7 @@ else 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 |