update: make git rebase quiet on Mojave system Git.
Fix regression from https://github.com/Homebrew/brew/pull/7260. This code makes me sad.
This commit is contained in:
parent
bf0dc70295
commit
79bc4f1136
@ -250,7 +250,13 @@ EOS
|
||||
|
||||
if [[ -z "$HOMEBREW_MERGE" ]]
|
||||
then
|
||||
# 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
|
||||
git merge --no-edit --ff "${QUIET_ARGS[@]}" "$REMOTE_REF" \
|
||||
--strategy=recursive \
|
||||
|
Loading…
x
Reference in New Issue
Block a user