diff options
| author | jkoan <jkoan@users.noreply.github.com> | 2019-10-30 09:55:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-30 09:55:18 +0100 |
| commit | 29fcaf011a5246cc9eb6c6f8c9569ef77ea8e771 (patch) | |
| tree | bd3d82d4cec4018cee51426d2c303cceccaf77b2 | |
| parent | 6ec160182c9523de009f4173ee280ea3ba1d16f3 (diff) | |
| parent | 893ff758f15525945743c45e3e28abe210d19e70 (diff) | |
| download | navit-i18n/da.tar.gz | |
Merge branch 'trunk' into i18n/dai18n/da
| -rwxr-xr-x | scripts/ci_sanity_checks.sh | 7 |
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 |