From 77bf5277f6580e856aab2b688c8ae089e3f6b460 Mon Sep 17 00:00:00 2001
From: Martine Lenders <mail@martine-lenders.eu>
Date: Tue, 1 Mar 2016 13:54:04 +0100
Subject: [PATCH] dist: Recall build_and_test.sh after rebase if it was changed

---
 dist/tools/travis-scripts/build_and_test.sh | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/dist/tools/travis-scripts/build_and_test.sh b/dist/tools/travis-scripts/build_and_test.sh
index d09a471caa..6ba3d75f28 100755
--- a/dist/tools/travis-scripts/build_and_test.sh
+++ b/dist/tools/travis-scripts/build_and_test.sh
@@ -27,6 +27,7 @@ then
     if [ "$BUILDTEST_MCU_GROUP" == "static-tests" ]
     then
         RESULT=0
+        RECALL="$1"
 
         if git diff master HEAD -- .travis.yml &> /dev/null; then
             # check if .travis.yml was changed in the current PR and skip if so
@@ -43,6 +44,15 @@ then
             fi
         fi
 
+        if [ "$RECALL" != "recall" ]; then
+            if git diff master HEAD -- "$0" &> /dev/null; then
+                git rebase master || git rebase --abort
+
+                "$0" "recall"
+                exit $?
+            fi
+        fi
+
         git rebase master || git rebase --abort
         RESULT=$(set_result $? $RESULT)