jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

travis/changed_templates: correct left tree-ish

Browse source 
From b881f32687 (travis/changed_templates: filter by git itself,
2020-05-23), we replaced git-diff(1) with git-diff-tree(1).

The change wasn't equivalence, though.
We used to compare between merge-base of FETCH_HEAD and HEAD.
From that commit, we started to compare FETCH_HEAD and HEAD instead.

Fix them by changing left tree-ish to the merge-base.
This commit is contained in:
Đoàn Trần Công Danh 2020-06-10 22:54:08 +07:00 committed by Danh Doan
parent b6b94d4aa4
commit f5417b7b99
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/travis/changed_templates.sh
View file

@ -9,7 +9,9 @@ elif command -v git >/dev/null 2>&1; then
fi
/bin/echo -e '\x1b[32mChanged packages:\x1b[0m'
$GIT_CMD diff-tree -r --no-renames --name-only --diff-filter=AM FETCH_HEAD HEAD -- 'srcpkgs/*/template' |
$GIT_CMD diff-tree -r --no-renames --name-only --diff-filter=AM \
"$(git merge-base FETCH_HEAD HEAD)" HEAD \
-- 'srcpkgs/*/template' |
cut -d/ -f 2 |
tee /tmp/templates |
sed "s/^/ /" >&2