From 79bc4f1136e8f56e212230e34bbfa0d36b401b1f Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Fri, 3 Apr 2020 08:59:11 +0100 Subject: [PATCH] update: make git rebase quiet on Mojave system Git. Fix regression from https://github.com/Homebrew/brew/pull/7260. This code makes me sad. --- Library/Homebrew/cmd/update.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Library/Homebrew/cmd/update.sh b/Library/Homebrew/cmd/update.sh index a5d2c3eaf9..3ccf7905d3 100644 --- a/Library/Homebrew/cmd/update.sh +++ b/Library/Homebrew/cmd/update.sh @@ -250,7 +250,13 @@ EOS if [[ -z "$HOMEBREW_MERGE" ]] then - git rebase "${QUIET_ARGS[@]}" "$REMOTE_REF" + # Work around bug where git rebase --quiet is not quiet + if [[ -z "$HOMEBREW_VERBOSE" ]] + then + git rebase "${QUIET_ARGS[@]}" "$REMOTE_REF" >/dev/null + else + git rebase "${QUIET_ARGS[@]}" "$REMOTE_REF" + fi else git merge --no-edit --ff "${QUIET_ARGS[@]}" "$REMOTE_REF" \ --strategy=recursive \