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

Merge pull request #7758 from sjackman/origin-head

Browse Source 
update: Fetch the symbolic reference origin/HEAD
This commit is contained in:
Shaun Jackman 2020-06-17 17:09:23 -07:00 committed by GitHub
commit aeafbd1c8f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Library/Homebrew/cmd/update-reset.sh
View File

@ -38,6 +38,7 @@ homebrew-update-reset() {
cd "$DIR" || continue cd "$DIR" || continue
ohai "Fetching $DIR..." ohai "Fetching $DIR..."
git fetch --force --tags origin git fetch --force --tags origin
git remote set-head origin --auto >/dev/null
echo echo
ohai "Resetting $DIR..." ohai "Resetting $DIR..."

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

@ -38,6 +38,7 @@ git_init_if_necessary() {
git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*" git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
latest_tag="$(git ls-remote --tags --refs -q origin | tail -n1 | cut -f2)" latest_tag="$(git ls-remote --tags --refs -q origin | tail -n1 | cut -f2)"
git fetch --force origin --shallow-since="$latest_tag" git fetch --force origin --shallow-since="$latest_tag"
git remote set-head origin --auto >/dev/null
git reset --hard origin/master git reset --hard origin/master
SKIP_FETCH_BREW_REPOSITORY=1 SKIP_FETCH_BREW_REPOSITORY=1
set +e set +e
@ -59,6 +60,7 @@ git_init_if_necessary() {
git config remote.origin.url "$HOMEBREW_CORE_GIT_REMOTE" git config remote.origin.url "$HOMEBREW_CORE_GIT_REMOTE"
git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*" git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
git fetch --force --depth=1 origin refs/heads/master:refs/remotes/origin/master git fetch --force --depth=1 origin refs/heads/master:refs/remotes/origin/master
git remote set-head origin --auto >/dev/null
git reset --hard origin/master git reset --hard origin/master
SKIP_FETCH_CORE_REPOSITORY=1 SKIP_FETCH_CORE_REPOSITORY=1
set +e set +e
@ -84,6 +86,11 @@ upstream_branch() {
local upstream_branch local upstream_branch
upstream_branch="$(git symbolic-ref refs/remotes/origin/HEAD 2>/dev/null)" upstream_branch="$(git symbolic-ref refs/remotes/origin/HEAD 2>/dev/null)"
if [[ -z "$upstream_branch" ]]
then
git remote set-head origin --auto >/dev/null
upstream_branch="$(git symbolic-ref refs/remotes/origin/HEAD 2>/dev/null)"
fi
upstream_branch="${upstream_branch#refs/remotes/origin/}" upstream_branch="${upstream_branch#refs/remotes/origin/}"
[[ -z "$upstream_branch" ]] && upstream_branch="master" [[ -z "$upstream_branch" ]] && upstream_branch="master"
echo "$upstream_branch" echo "$upstream_branch"