From 14c21aa54acb74f6a07c243fbae6fdf9f2652069 Mon Sep 17 00:00:00 2001
From: Enno Boland <eb@s01.de>
Date: Wed, 12 Nov 2014 13:25:04 +0100
Subject: [PATCH] .travis.yml: make testing more robust against complex commit
 trees

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 12b406347c1..5027117bb50 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,8 +11,8 @@ before_script:
     - git clone --depth 1 git://github.com/chneukirchen/xtools.git xtools
 
 script:
-    - git fetch --depth 1 git://github.com/voidlinux/void-packages.git master
-    - git diff --name-status FETCH_HEAD | grep "^[AM].*srcpkgs/[^/]*/template$" | awk '{print $2}' | tee __changed_templates
+    - git remote add __upstream git://github.com/voidlinux/void-packages.git; git fetch --depth 200 __upstream master
+    - git diff --name-status `git merge-base __upstream/master HEAD` | grep "^[AM].*srcpkgs/[^/]*/template$" | awk '{print $2}' | tee __changed_templates
     - xlint `cat __changed_templates`
 
 notifications: