diff --git a/common/travis/changed_templates.sh b/common/travis/changed_templates.sh index 215c3161c0f..8c5d8a880a6 100755 --- a/common/travis/changed_templates.sh +++ b/common/travis/changed_templates.sh @@ -14,7 +14,11 @@ case "$tip" in *) tip="${tip%% *}" ;; esac -base="$(git merge-base FETCH_HEAD "$tip")" +base="$(git merge-base FETCH_HEAD "$tip")" || { + echo "Your branches is based on too old copy." + echo "Please rebase to newest copy." + exit 1 +} echo "$base $tip" >/tmp/revisions