X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fcollectd%2Fcollectd_apply_pull_request.sh;fp=src%2Fcollectd%2Fcollectd_apply_pull_request.sh;h=403d78ddbbf3d236f4288fd4c48cb4dc04f1b427;hb=d6865dee56b4648727943b9528ea86ddc4485310;hp=35af2981b225196b8c98a4ec2106f5d9794f0e61;hpb=e21e1e13a29189b024801cb344093688f772890a;p=barometer.git

diff --git a/src/collectd/collectd_apply_pull_request.sh b/src/collectd/collectd_apply_pull_request.sh
index 35af2981..403d78dd 100755
--- a/src/collectd/collectd_apply_pull_request.sh
+++ b/src/collectd/collectd_apply_pull_request.sh
@@ -35,8 +35,16 @@ IFS=', ' read -a PULL_REQUESTS <<< "$COLLECTD_PULL_REQUESTS"
 git config user.email "barometer-experimental@container"
 git config user.name "BarometerExperimental"
 
-for PR_ID in "${PULL_REQUESTS[@]}"
-do
-    echo "Applying pull request $PR_ID"
-    git pull --rebase origin pull/$PR_ID/head
-done
+# If there's a single PR listed, just check it out
+if [ "${#PULL_REQUESTS[@]}" -eq "1" ];
+then
+	echo "Checking out pull request $COLLECTD_PULL_REQUESTS"
+	git fetch origin pull/$COLLECTD_PULL_REQUESTS/head && git checkout FETCH_HEAD
+else
+# if there are multiple PRs, rebase them on top of the checked out branch
+	for PR_ID in "${PULL_REQUESTS[@]}"
+	do
+		echo "Applying pull request $PR_ID"
+		git pull --rebase origin pull/$PR_ID/head
+	done
+fi