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

Merge pull request #5526 from MikeMcQuaid/quiet-git-rebase

Browse Source 
update: make git rebase be quiet.
This commit is contained in:
Mike McQuaid 2019-01-12 12:23:07 +00:00 committed by GitHub
commit f36c8e169c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 "$REMOTE_REF" >/dev/null
else
git rebase "${QUIET_ARGS[@]}" "$REMOTE_REF"
fi
else
git merge --no-edit --ff "${QUIET_ARGS[@]}" "$REMOTE_REF" \
--strategy=recursive \