Permalink
Browse files

Merge branch 'maint'

* maint:
  Fix typo in remote set-head usage
  Makefile: hide stderr of curl-config test
  • Loading branch information...
2 parents f7d8e3d + d1eded4 commit 77b598b438e51d45229fe945e2139a7789a150bc @gitster gitster committed Nov 26, 2012
Showing with 2 additions and 2 deletions.
  1. +1 −1 Makefile
  2. +1 −1 builtin/remote.c
View
@@ -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
View
@@ -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
};

0 comments on commit 77b598b

Please sign in to comment.