diff options
author | Sean Paul <seanpaul@chromium.org> | 2019-03-15 15:18:46 -0400 |
---|---|---|
committer | Sean Paul <seanpaul@chromium.org> | 2019-03-15 15:20:17 -0400 |
commit | 890988f3f60e8d8367e9613270af20ff46bf8e93 (patch) | |
tree | 742c58accf7318f671c5ad20a1664fb37744d3c4 | |
parent | 112903781ca34a39320d99bc68bd9f971182aa27 (diff) | |
download | drm_hwcomposer-890988f3f60e8d8367e9613270af20ff46bf8e93.tar.gz |
drm_hwcomposer: Use proper commit for author/committer check
The script uses the author/committer of HEAD instead of the commit it is
inspecting. This fails when a patch set has different authors/committers
(such as https://gitlab.freedesktop.org/drm-hwcomposer/drm-hwcomposer/merge_requests/46)
Change-Id: I0fcd724cf372fad435c7614777f13e015c204c3d
Signed-off-by: Sean Paul <seanpaul@chromium.org>
-rwxr-xr-x | .gitlab-ci-checkcommit.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci-checkcommit.sh b/.gitlab-ci-checkcommit.sh index d76baf7..c1c524d 100755 --- a/.gitlab-ci-checkcommit.sh +++ b/.gitlab-ci-checkcommit.sh @@ -38,13 +38,13 @@ git log --pretty='%h' FETCH_HEAD..HEAD | while read h; do commit_body=$(git show -s --pretty=%b "$h") - author=$(git show -s --format='%an <%ae>') + author=$(git show -s --format='%an <%ae>' "$h") if findtag "$commit_body" "Signed-off-by" "$author"; then echoerr "Author SoB tag is missing from commit $h" exit 1 fi - committer=$(git show -s --format='%cn <%ce>') + committer=$(git show -s --format='%cn <%ce>' "$h") if findtag "$commit_body" "Signed-off-by" "$committer"; then echoerr "Committer SoB tag is missing from commit $h" exit 1 |