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

update.sh: check upstream SHA prefetch not local.

Browse Source 
Otherwise this can prevent taps from being updated as expected.
This commit is contained in:
Mike McQuaid 2016-08-11 10:57:08 +01:00
parent 080c4de957
commit 985c672bac
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -383,8 +383,15 @@ EOS
[[ -d "$DIR/.git" ]] || continue [[ -d "$DIR/.git" ]] || continue
cd "$DIR" || continue cd "$DIR" || continue
if [[ -n "$HOMEBREW_VERBOSE" ]]
then
echo "Checking if we need to fetch $DIR..."
fi
TAP_VAR="$(repo_var "$DIR")" TAP_VAR="$(repo_var "$DIR")"
declare PREFETCH_REVISION"$TAP_VAR"="$(read_current_revision)" UPSTREAM_BRANCH="$(upstream_branch)"
declare UPSTREAM_BRANCH"$TAP_VAR"="$UPSTREAM_BRANCH"
declare PREFETCH_REVISION"$TAP_VAR"="$(git rev-parse -q --verify refs/remotes/origin/"$UPSTREAM_BRANCH")"
[[ -n "$SKIP_FETCH_BREW_REPOSITORY" && "$DIR" = "$HOMEBREW_REPOSITORY" ]] && continue [[ -n "$SKIP_FETCH_BREW_REPOSITORY" && "$DIR" = "$HOMEBREW_REPOSITORY" ]] && continue
[[ -n "$SKIP_FETCH_CORE_REPOSITORY" && "$DIR" = "$HOMEBREW_LIBRARY/Taps/homebrew/homebrew-core" ]] && continue [[ -n "$SKIP_FETCH_CORE_REPOSITORY" && "$DIR" = "$HOMEBREW_LIBRARY/Taps/homebrew/homebrew-core" ]] && continue
@ -392,9 +399,6 @@ EOS
# The upstream repository's default branch may not be master; # The upstream repository's default branch may not be master;
# check refs/remotes/origin/HEAD to see what the default # check refs/remotes/origin/HEAD to see what the default
# origin branch name is, and use that. If not set, fall back to "master". # origin branch name is, and use that. If not set, fall back to "master".
UPSTREAM_BRANCH="$(upstream_branch)"
declare UPSTREAM_BRANCH"$TAP_VAR"="$UPSTREAM_BRANCH"
# the refspec ensures that the default upstream branch gets updated # the refspec ensures that the default upstream branch gets updated
( (
if [[ -n "$HOMEBREW_UPDATE_PREINSTALL" ]] if [[ -n "$HOMEBREW_UPDATE_PREINSTALL" ]]
@ -485,9 +489,8 @@ EOS
export HOMEBREW_UPDATE_AFTER"$TAP_VAR"="$CURRENT_REVISION" export HOMEBREW_UPDATE_AFTER"$TAP_VAR"="$CURRENT_REVISION"
else else
merge_or_rebase "$DIR" "$TAP_VAR" "$UPSTREAM_BRANCH" merge_or_rebase "$DIR" "$TAP_VAR" "$UPSTREAM_BRANCH"
[[ -n "$HOMEBREW_VERBOSE" ]] && echo
fi fi
[[ -n "$HOMEBREW_VERBOSE" ]] && echo
done done
safe_cd "$HOMEBREW_REPOSITORY" safe_cd "$HOMEBREW_REPOSITORY"