From 2f73e4f94d9d57c522a67a4d2b61d852b244df36 Mon Sep 17 00:00:00 2001
From: Sebastian Wilzbach <seb@wilzba.ch>
Date: Sun, 26 Feb 2017 10:35:06 +0100
Subject: [PATCH] Don't merge with upstream/master on CircleCi due to CodeCov
 issues

---
 circleci.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/circleci.sh b/circleci.sh
index ac75de18a52..164bc90e92c 100755
--- a/circleci.sh
+++ b/circleci.sh
@@ -74,6 +74,11 @@ setup_repos()
         git fetch upstream
         git checkout -f upstream/$base_branch
         git merge -m "Automatic merge" $current_branch
+        # CodeCov doesn't handle a changed parent_ref well.
+        # It will assume all merged changes as part of this commit.
+        # Hence we temporarily revert the merge for .d files (we keep the updated configs)
+        # https://github.com/codecov/support/issues/360
+        git checkout $current_branch etc std
     fi
 
     for proj in dmd druntime ; do