From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 7 Feb 2019 06:05:28 +0000 (-0800)
Subject: Merge branch 'sg/travis-osx-brew-breakage-workaround'
X-Git-Tag: v2.21.0-rc0~7
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d219b7f3f97ddbea883af228b9f2d845c9c1d390?ds=inline;hp=--cc

Merge branch 'sg/travis-osx-brew-breakage-workaround'

The way the OSX build jobs updates its build environment used the
"--quiet" option to "brew update" command, but it wasn't all that
quiet to be useful.  The use of the option has been replaced with
an explicit redirection to the /dev/null (which incidentally would
have worked around a breakage by recent updates to homebrew, which
has fixed itself already).

* sg/travis-osx-brew-breakage-workaround:
travis-ci: make the OSX build jobs' 'brew update' more quiet
---

d219b7f3f97ddbea883af228b9f2d845c9c1d390
diff --cc ci/install-dependencies.sh
index 608ff964de,5968efdbbe..d64667fcbf
--- a/ci/install-dependencies.sh
+++ b/ci/install-dependencies.sh
@@@ -34,18 -34,12 +34,18 @@@ linux-clang|linux-gcc
  	popd
  	;;
  osx-clang|osx-gcc)
- 	brew update --quiet
+ 	brew update >/dev/null
  	# Uncomment this if you want to run perf tests:
  	# brew install gnu-time
 -	brew install git-lfs gettext
 +	test -z "$BREW_INSTALL_PACKAGES" ||
 +	brew install $BREW_INSTALL_PACKAGES
  	brew link --force gettext
  	brew install caskroom/cask/perforce
 +	case "$jobname" in
 +	osx-gcc)
 +		brew link gcc@8
 +		;;
 +	esac
  	;;
  StaticAnalysis)
  	sudo apt-get -q update