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

Merge pull request #7260 from MikeMcQuaid/update-rebase-quiet

Browse Source 
update: make rebase quiet.
This commit is contained in:
Mike McQuaid 2020-04-02 09:33:54 +01:00 committed by GitHub
commit 2b3d7304e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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" ]]
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 \