Skip to content

Commit 4cbf71f

Browse files
authored
Merge pull request #990 from Homebrew/brew_main
install.sh: Homebrew/brew uses `main` default branch.
2 parents 5585534 + 45ad233 commit 4cbf71f

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

install.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ else
154154
fi
155155

156156
# Required installation paths. To install elsewhere (which is unsupported)
157-
# you can untar https://github.com/Homebrew/brew/tarball/master
157+
# you can untar https://github.com/Homebrew/brew/tarball/main
158158
# anywhere you like.
159159
if [[ -n "${HOMEBREW_ON_MACOS-}" ]]
160160
then
@@ -620,7 +620,7 @@ echo "${HOMEBREW_PREFIX}/etc/bash_completion.d/brew"
620620
echo "${HOMEBREW_REPOSITORY}"
621621

622622
# Keep relatively in sync with
623-
# https://github.com/Homebrew/brew/blob/master/Library/Homebrew/keg.rb
623+
# https://github.com/Homebrew/brew/blob/HEAD/Library/Homebrew/keg.rb
624624
directories=(
625625
bin etc include lib sbin share opt var
626626
Frameworks
@@ -943,11 +943,12 @@ ohai "Downloading and installing Homebrew..."
943943
cd "${HOMEBREW_REPOSITORY}" >/dev/null || return
944944

945945
# we do it in four steps to avoid merge errors when reinstalling
946-
execute "${USABLE_GIT}" "-c" "init.defaultBranch=master" "init" "--quiet"
946+
execute "${USABLE_GIT}" "init" "--quiet"
947947

948948
# "git remote add" will fail if the remote is defined in the global config
949949
execute "${USABLE_GIT}" "config" "remote.origin.url" "${HOMEBREW_BREW_GIT_REMOTE}"
950950
execute "${USABLE_GIT}" "config" "remote.origin.fetch" "+refs/heads/*:refs/remotes/origin/*"
951+
execute "${USABLE_GIT}" "config" "--bool" "fetch.prune" "true"
951952

952953
# ensure we don't munge line endings on checkout
953954
execute "${USABLE_GIT}" "config" "--bool" "core.autocrlf" "false"

0 commit comments

Comments
 (0)