Merge branch 'maint'

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

diff --git a/Makefile b/Makefile
index 9bc5e403650d171f1b5e5a6868fdd66009739b7d..4ad6fbd64e5cea1ff833f142ec0072566039bc49 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -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

diff --git a/builtin/remote.c b/builtin/remote.c
index a5a4b232310a27c1d67dd6a1bce252cd62cfa52d..937484d7c77c448995481f246c1afe2dedd4c561 100644 (file)
--- a/builtin/remote.c
+++ b/builtin/remote.c
@@ -39,7 +39,7 @@ static const char * const builtin_remote_rm_usage[] = {
 };
 
 static const char * const builtin_remote_sethead_usage[] = {
-       N_("git remote set-head <name> (-a | -d | <branch>])"),
+       N_("git remote set-head <name> (-a | -d | <branch>)"),
        NULL
 };