From cad2a5620fbd847bca78c6b17ea97c877224b724 Mon Sep 17 00:00:00 2001
From: Xu Cheng
Date: Tue, 8 Mar 2016 18:20:45 +0800
Subject: update: passing --force to git fetch

Per document:
> -f, --force
>    When git fetch is used with <rbranch>:<lbranch> refspec, it refuses
>    to update the local branch <lbranch> unless the remote branch
>    <rbranch> it fetches is a descendant of <lbranch>. This option
>    overrides that check.
---
 Library/Homebrew/cmd/update.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Library')

diff --git a/Library/Homebrew/cmd/update.sh b/Library/Homebrew/cmd/update.sh
index 8c2107a83..07847a0ba 100644
--- a/Library/Homebrew/cmd/update.sh
+++ b/Library/Homebrew/cmd/update.sh
@@ -349,7 +349,7 @@ EOS
         [[ "$UPSTREAM_SHA_HTTP_CODE" = "304" ]] && exit
       fi
 
-      git fetch "${QUIET_ARGS[@]}" origin \
+      git fetch --force "${QUIET_ARGS[@]}" origin \
         "refs/heads/$UPSTREAM_BRANCH:refs/remotes/origin/$UPSTREAM_BRANCH" || \
           odie "Fetching $DIR failed!"
     ) &
-- 
cgit v1.2.3