summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Herlant <aerostitch@debian.org>2019-10-29 10:52:18 -0700
committerJoseph Herlant <aerostitch@debian.org>2019-10-29 10:52:18 -0700
commite584667af6280f566d86fffcab270ddc411c6c56 (patch)
treee3b162ebdd50b697c30de5972975d6630d580adf
parent91c085e7f9e0e31eaedd9926b3682d980587333c (diff)
downloadnavit-e584667af6280f566d86fffcab270ddc411c6c56.tar.gz
cleanup:ci:Simplify the listing of files for sanity check
-rwxr-xr-xscripts/ci_sanity_checks.sh7
1 files changed, 1 insertions, 6 deletions
diff --git a/scripts/ci_sanity_checks.sh b/scripts/ci_sanity_checks.sh
index 33d05263c..de46d5f15 100755
--- a/scripts/ci_sanity_checks.sh
+++ b/scripts/ci_sanity_checks.sh
@@ -24,12 +24,7 @@ check_diff(){
}
# List the files that are different from the trunk
-from=$(git rev-parse refs/remotes/origin/trunk)
-to=$(git rev-parse HEAD)
-interval=${from}..${to}
-[[ "${from}" == "${to}" ]] && interval=${to}
-
-for f in $(git diff --name-only ${interval} | sort -u); do
+for f in $(git diff --name-only refs/remotes/origin/trunk | sort -u); do
if [[ "${f}" =~ navit/support/ ]] || [[ "${f}" =~ navit/fib-1\.1/ ]] || [[ "${f}" =~ navit/traffic/permanentrestrictions/ ]] ; then
echo "[DEBUG] Skipping file ${f} ..."
continue