diff options
author | Đoàn Trần Công Danh <congdanhqx@gmail.com> | 2021-06-01 01:07:59 +0000 |
---|---|---|
committer | Đoàn Trần Công Danh <congdanhqx@gmail.com> | 2021-06-01 01:31:00 +0000 |
commit | 987dfd294f6c802091eae4a5612b19a50bb59741 (patch) | |
tree | 9692dce6ffca1ceb7f9e6a5345b918548104a253 /common/travis | |
parent | 9e707e34d47619737027979958e1618bfa9e3852 (diff) | |
download | void-packages-987dfd294f6c802091eae4a5612b19a50bb59741.tar void-packages-987dfd294f6c802091eae4a5612b19a50bb59741.tar.gz void-packages-987dfd294f6c802091eae4a5612b19a50bb59741.tar.bz2 void-packages-987dfd294f6c802091eae4a5612b19a50bb59741.tar.lz void-packages-987dfd294f6c802091eae4a5612b19a50bb59741.tar.xz void-packages-987dfd294f6c802091eae4a5612b19a50bb59741.tar.zst void-packages-987dfd294f6c802091eae4a5612b19a50bb59741.zip |
changed_templates: use current tip for non-merge commit
Some people uses this scripts to detect changes locally.
Let's not break their script.
Diffstat (limited to 'common/travis')
-rwxr-xr-x | common/travis/changed_templates.sh | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/common/travis/changed_templates.sh b/common/travis/changed_templates.sh index a6e5fb74327..215c3161c0f 100755 --- a/common/travis/changed_templates.sh +++ b/common/travis/changed_templates.sh @@ -8,13 +8,19 @@ elif command -v git >/dev/null 2>&1; then GIT_CMD=$(command -v git) fi -printf '%s %s\n' \ - "$(git merge-base FETCH_HEAD HEAD^2)" \ - "$(git rev-parse --verify HEAD^2)" > /tmp/revisions +tip="$(git rev-list -1 --parents HEAD)" +case "$tip" in + *" "*" "*) tip="${tip##* }" ;; + *) tip="${tip%% *}" ;; +esac + +base="$(git merge-base FETCH_HEAD "$tip")" + +echo "$base $tip" >/tmp/revisions /bin/echo -e '\x1b[32mChanged packages:\x1b[0m' $GIT_CMD diff-tree -r --no-renames --name-only --diff-filter=AM \ - $(cat /tmp/revisions) \ + "$base" "$tip" \ -- 'srcpkgs/*/template' | cut -d/ -f 2 | tee /tmp/templates | |