From 28c485ecfc669eab8a6b4c38e11a60c95d76f0ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 16 Sep 2022 09:18:27 +0700 Subject: [PATCH] changed_templates: explain what has been done --- common/travis/changed_templates.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/common/travis/changed_templates.sh b/common/travis/changed_templates.sh index 3c8acf78763..534cd97a12b 100755 --- a/common/travis/changed_templates.sh +++ b/common/travis/changed_templates.sh @@ -6,7 +6,9 @@ PATH="/usr/libexec/chroot-git:$PATH" tip="$(git rev-list -1 --parents HEAD)" case "$tip" in + # This is a merge commit, pick last parent *" "*" "*) tip="${tip##* }" ;; + # This is a non-merge commit, pick itself *) tip="${tip%% *}" ;; esac