matplotlib
diff --git a/‎.circleci/config.yml
Copy file name to clipboardExpand all lines: .circleci/config.yml
+4-4Lines changed: 4 additions & 4 deletions b/‎.circleci/config.yml
Copy file name to clipboardExpand all lines: .circleci/config.yml
+4-4Lines changed: 4 additions & 4 deletions
@@ -31,10 +31,10 @@ commands:
               git remote add upstream git://github.com/matplotlib/matplotlib.git
             fi
             git fetch upstream
-            export merge=${CI_PULL_REQUEST//*pull\//}
-            if [[ "$merge" != "" ]]; then
-              echo "Merging ${merge}";
-              git pull --ff-only upstream "refs/pull/${merge}/merge";
+            if [[ "$CIRCLE_BRANCH" != "master" ]] && \
+               [[ "$CIRCLE_PR_NUMBER" != "" ]]; then
+              echo "Merging ${CIRCLE_PR_NUMBER}"
+              git pull --ff-only upstream "refs/pull/${CIRCLE_PR_NUMBER}/merge"
             fi
 
   apt-install: