From 3a4f2c1aeaa65527ff7d10684db9d262f1892de5 Mon Sep 17 00:00:00 2001
From: Xu Cheng <xucheng@me.com>
Date: Tue, 8 Mar 2016 19:13:38 +0800
Subject: [PATCH] update: checkout branch unconditionally

---
 Library/Homebrew/cmd/update.sh | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/Library/Homebrew/cmd/update.sh b/Library/Homebrew/cmd/update.sh
index 07847a0ba9..0c2faf4483 100644
--- a/Library/Homebrew/cmd/update.sh
+++ b/Library/Homebrew/cmd/update.sh
@@ -211,16 +211,13 @@ pull() {
     STASHED="1"
   fi
 
-  if [[ "$INITIAL_BRANCH" != "$UPSTREAM_BRANCH" && -n "$INITIAL_BRANCH" ]]
+  # Recreate and check out `#{upstream_branch}` if unable to fast-forward
+  # it to `origin/#{@upstream_branch}`. Otherwise, just check it out.
+  if git merge-base --is-ancestor "$UPSTREAM_BRANCH" "origin/$UPSTREAM_BRANCH" &>/dev/null
   then
-    # Recreate and check out `#{upstream_branch}` if unable to fast-forward
-    # it to `origin/#{@upstream_branch}`. Otherwise, just check it out.
-    if git merge-base --is-ancestor "$UPSTREAM_BRANCH" "origin/$UPSTREAM_BRANCH" &>/dev/null
-    then
-      git checkout --force "$UPSTREAM_BRANCH" "${QUIET_ARGS[@]}"
-    else
-      git checkout --force -B "$UPSTREAM_BRANCH" "origin/$UPSTREAM_BRANCH" "${QUIET_ARGS[@]}"
-    fi
+    git checkout --force "$UPSTREAM_BRANCH" "${QUIET_ARGS[@]}"
+  else
+    git checkout --force -B "$UPSTREAM_BRANCH" "origin/$UPSTREAM_BRANCH" "${QUIET_ARGS[@]}"
   fi
 
   INITIAL_REVISION="$(read_current_revision)"