From fe5717519cfe44ee048e91762b50e2a7ec340ba7 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Thu, 2 Apr 2020 09:00:25 +0100 Subject: [PATCH] update: make rebase quiet. I tested the workaround with the newest Git and the Catalina system Git and it wasn't needed in either case. We can re-add it if we get complaints with supported Git versions. Fixes https://github.com/Homebrew/brew/issues/7259 --- Library/Homebrew/cmd/update.sh | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/Library/Homebrew/cmd/update.sh b/Library/Homebrew/cmd/update.sh index f22ef9bb47..a5d2c3eaf9 100644 --- a/Library/Homebrew/cmd/update.sh +++ b/Library/Homebrew/cmd/update.sh @@ -250,13 +250,7 @@ EOS if [[ -z "$HOMEBREW_MERGE" ]] then - # Work around bug where git rebase --quiet is not quiet - if [[ -z "$HOMEBREW_VERBOSE" ]] - then - git rebase "$REMOTE_REF" >/dev/null - else - git rebase "${QUIET_ARGS[@]}" "$REMOTE_REF" - fi + git rebase "${QUIET_ARGS[@]}" "$REMOTE_REF" else git merge --no-edit --ff "${QUIET_ARGS[@]}" "$REMOTE_REF" \ --strategy=recursive \