diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-02-07 06:05:28 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-02-07 06:05:28 (GMT) |
| commit | d219b7f3f97ddbea883af228b9f2d845c9c1d390 (patch) | |
| tree | 633238da453de2ccc219659a0ecf7c38519a662c /ci | |
| parent | 7a15479286f4384df24dd34c38606a3d0625bff8 (diff) | |
| parent | a1ccaedd62f7c23a8ec213afb691639f074be4de (diff) | |
| download | git-d219b7f3f97ddbea883af228b9f2d845c9c1d390.zip git-d219b7f3f97ddbea883af228b9f2d845c9c1d390.tar.gz git-d219b7f3f97ddbea883af228b9f2d845c9c1d390.tar.bz2 | |
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
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/install-dependencies.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh index 608ff96..d64667f 100755 --- a/ci/install-dependencies.sh +++ b/ci/install-dependencies.sh @@ -34,7 +34,7 @@ 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 test -z "$BREW_INSTALL_PACKAGES" || |