diff options
| author | Mike McQuaid | 2016-08-11 13:47:13 +0100 |
|---|---|---|
| committer | Mike McQuaid | 2016-08-11 13:47:13 +0100 |
| commit | 24b5db53672843647da29073060bff3f81b05b90 (patch) | |
| tree | d71185457192ee991d47168156537640a3a074e6 /Library | |
| parent | b9d5b11f321a359b462aa2c353c2bdb483930fb3 (diff) | |
| download | brew-24b5db53672843647da29073060bff3f81b05b90.tar.bz2 | |
update.sh: further tweak update fix.
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/cmd/update.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Library/Homebrew/cmd/update.sh b/Library/Homebrew/cmd/update.sh index b32302cc0..8078578a3 100644 --- a/Library/Homebrew/cmd/update.sh +++ b/Library/Homebrew/cmd/update.sh @@ -479,11 +479,13 @@ EOS PREFETCH_REVISION_VAR="PREFETCH_REVISION$TAP_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" ]] then 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 export HOMEBREW_UPDATE_BEFORE"$TAP_VAR"="$CURRENT_REVISION" export HOMEBREW_UPDATE_AFTER"$TAP_VAR"="$CURRENT_REVISION" |