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

update.sh: further tweak update fix.

Browse Source
This commit is contained in:
Mike McQuaid 2016-08-11 13:47:13 +01:00
parent b9d5b11f32
commit 24b5db5367
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -479,11 +479,13 @@ EOS
PREFETCH_REVISION_VAR="PREFETCH_REVISION$TAP_VAR" PREFETCH_REVISION_VAR="PREFETCH_REVISION$TAP_VAR"
PREFETCH_REVISION="${!PREFETCH_REVISION_VAR}" PREFETCH_REVISION="${!PREFETCH_REVISION_VAR}"
POSTFETCH_REVISION="$(git rev-parse -q --verify refs/remotes/origin/"$UPSTREAM_BRANCH")"
if [[ -n "$HOMEBREW_SIMULATE_FROM_CURRENT_BRANCH" ]] if [[ -n "$HOMEBREW_SIMULATE_FROM_CURRENT_BRANCH" ]]
then then
simulate_from_current_branch "$DIR" "$TAP_VAR" "$UPSTREAM_BRANCH" "$CURRENT_REVISION" simulate_from_current_branch "$DIR" "$TAP_VAR" "$UPSTREAM_BRANCH" "$CURRENT_REVISION"
elif [[ "$PREFETCH_REVISION" = "$CURRENT_REVISION" ]] elif [[ "$PREFETCH_REVISION" = "$POSTFETCH_REVISION" ]] &&
[[ "$CURRENT_REVISION" = "$POSTFETCH_REVISION" ]]
then then
export HOMEBREW_UPDATE_BEFORE"$TAP_VAR"="$CURRENT_REVISION" export HOMEBREW_UPDATE_BEFORE"$TAP_VAR"="$CURRENT_REVISION"
export HOMEBREW_UPDATE_AFTER"$TAP_VAR"="$CURRENT_REVISION" export HOMEBREW_UPDATE_AFTER"$TAP_VAR"="$CURRENT_REVISION"