From f5417b7b99d6ac72fc4ce6bfccb9ea4a17e5bbde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 10 Jun 2020 22:54:08 +0700 Subject: [PATCH] travis/changed_templates: correct left tree-ish 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. --- common/travis/changed_templates.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/common/travis/changed_templates.sh b/common/travis/changed_templates.sh index d6a66107bf..6b27ad8227 100755 --- a/common/travis/changed_templates.sh +++ b/common/travis/changed_templates.sh @@ -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