summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Beyer <mail@beyermatthias.de>2018-04-24 11:25:21 +0200
committerGitHub <noreply@github.com>2018-04-24 11:25:21 +0200
commitcbdfb02423fb19ab5740e335e24a585d8937095d (patch)
tree9fec2f77b2f4d596bcfd361e5e71982fe4c36935
parent7d3224a258826132d015decee72e2c3dc76c402a (diff)
parent7e078108ba2aa3e7d9dcf1d15496a614aca3dc61 (diff)
downloadimag-cbdfb02423fb19ab5740e335e24a585d8937095d.zip
imag-cbdfb02423fb19ab5740e335e24a585d8937095d.tar.gz
Merge pull request #1441 from matthiasbeyer/fix-tmpcommit-detection-script
Fix checker script for travis
-rw-r--r--scripts/branch-contains-no-tmp-commits18
1 files changed, 7 insertions, 11 deletions
diff --git a/scripts/branch-contains-no-tmp-commits b/scripts/branch-contains-no-tmp-commits
index 6697330..1a8a389 100644
--- a/scripts/branch-contains-no-tmp-commits
+++ b/scripts/branch-contains-no-tmp-commits
@@ -1,16 +1,12 @@
#!/usr/bin/env bash
-COMMIT_RANGE=""
-
-if [[ $TRAVIS ]]; then
- if [[ -z "$TRAVIS_COMMIT_RANGE" ]]; then
- COMMIT_RANGE=HEAD^..HEAD
- else
- COMMIT_RANGE=$TRAVIS_COMMIT_RANGE
- fi
-else
- COMMIT_RANGE=$(git merge-base master HEAD)..HEAD
-fi
+# Because travis _SUCKS_ really hard, we cannot find the "master" commit or any
+# commit where the current branch is derived from (if this is not master).
+# So we simply use HEAD~49..HEAD as the range to check. This might break some
+# day, I don't know.
+# But as travis only clones 50 commits and does not provide ANY usable
+# information about the commits, this is the only thing we can do.
+COMMIT_RANGE="HEAD~49..HEAD"
logfreeof() {
git log --format="%s" $COMMIT_RANGE |\