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

update: make git rebase quiet on Mojave system Git.

Browse Source 
Fix regression from https://github.com/Homebrew/brew/pull/7260.

This code makes me sad.
This commit is contained in:
Mike McQuaid 2020-04-03 08:59:11 +01:00
parent bf0dc70295
commit 79bc4f1136
No known key found for this signature in database
GPG Key ID: 48A898132FD8EE70
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" ]] if [[ -z "$HOMEBREW_MERGE" ]]
then 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 else
git merge --no-edit --ff "${QUIET_ARGS[@]}" "$REMOTE_REF" \ git merge --no-edit --ff "${QUIET_ARGS[@]}" "$REMOTE_REF" \
--strategy=recursive \ --strategy=recursive \