From 4baaa42525feb31a6d1fc79475f60d63b61269bb Mon Sep 17 00:00:00 2001
From: Matt Farina <matt@mattfarina.com>
Date: Thu, 12 Oct 2017 05:15:23 -0400
Subject: [PATCH] Fixing broken tests caused by #2428 (#2461)

The changed.sh script tried to find the merge base but the merge
base branch was not available. This change provides it so that
a common ancestor can be found.
---
 test/changed.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/test/changed.sh b/test/changed.sh
index 4b186e588b..67022c705f 100755
--- a/test/changed.sh
+++ b/test/changed.sh
@@ -18,10 +18,11 @@ set -o nounset
 set -o pipefail
 set -o xtrace
 
-git fetch --tags https://github.com/kubernetes/charts master
+git remote add k8s https://github.com/kubernetes/charts
+git fetch k8s master
 
 NAMESPACE="pr-${PULL_NUMBER}-${BUILD_NUMBER}"
-CHANGED_FOLDERS=`git diff --find-renames --name-only $(git merge-base master HEAD) stable/ incubator/ | awk -F/ '{print $1"/"$2}' | uniq`
+CHANGED_FOLDERS=`git diff --find-renames --name-only $(git merge-base k8s/master HEAD) stable/ incubator/ | awk -F/ '{print $1"/"$2}' | uniq`
 CURRENT_RELEASE=""
 
 # Exit early if no charts have changed