From 3eb0681273b74d281be428323560bbb3420b624a Mon Sep 17 00:00:00 2001 From: Almir Okato Date: Fri, 27 Jan 2023 16:15:30 -0300 Subject: [PATCH] ci: add single parent commit case on check-signed-off-by script Signed-off-by: Almir Okato --- ci/check-signed-off-by.sh | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/ci/check-signed-off-by.sh b/ci/check-signed-off-by.sh index c52a3397..25368cc4 100755 --- a/ci/check-signed-off-by.sh +++ b/ci/check-signed-off-by.sh @@ -12,18 +12,21 @@ # See the License for the specific language governing permissions and # limitations under the License. -# this retrieves the merge commit created by GH parents=(`git log -n 1 --format=%p HEAD`) -if [[ "${#parents[@]}" -ne 2 ]]; then - echo "This PR's merge commit is missing a parent!" +if [[ "${#parents[@]}" -eq 1 ]]; then + # CI doesn't use a merge commit + commits=$(git show -s --format=%h ${parents}) +elif [[ "${#parents[@]}" -eq 2 ]]; then + # CI uses a merge commit, eg GH / Travis + from="${parents[0]}" + into="${parents[1]}" + commits=$(git show -s --format=%h ${from}..${into}) +else + echo "Unexpected behavior, cannot verify more than 2 parent commits!" exit 1 fi -from="${parents[0]}" -into="${parents[1]}" -commits=$(git show -s --format=%h ${from}..${into}) - has_commits=false for sha in $commits; do author="Signed-off-by: $(git show -s --format="%an <%ae>" ${sha})"