admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

update: make rebase quiet.

Browse Source 
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
This commit is contained in:
Mike McQuaid 2020-04-02 09:00:25 +01:00
parent 91223b3011
commit fe5717519c
No known key found for this signature in database
GPG Key ID: 48A898132FD8EE70
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Library/Homebrew/cmd/update.sh
View File

@ -250,13 +250,7 @@ EOS
if [[ -z "$HOMEBREW_MERGE" ]] if [[ -z "$HOMEBREW_MERGE" ]]
then then
# Work around bug where git rebase --quiet is not quiet git rebase "${QUIET_ARGS[@]}" "$REMOTE_REF"
if [[ -z "$HOMEBREW_VERBOSE" ]]
then
git rebase "$REMOTE_REF" >/dev/null
else
git rebase "${QUIET_ARGS[@]}" "$REMOTE_REF"
fi
else else
git merge --no-edit --ff "${QUIET_ARGS[@]}" "$REMOTE_REF" \ git merge --no-edit --ff "${QUIET_ARGS[@]}" "$REMOTE_REF" \
--strategy=recursive \ --strategy=recursive \