From e6e098ef2a0b2caf3c662058d2620fde21520119 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Han?= Date: Tue, 3 Jul 2018 12:18:30 +0200 Subject: [PATCH] ceph-ansible-pr-syntax-check: remove merge commit from count MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit When counting the number of commit you must remove the merge commit so we get the right number of commits. Signed-off-by: Sébastien Han --- ceph-ansible-pr-syntax-check/build/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ceph-ansible-pr-syntax-check/build/build b/ceph-ansible-pr-syntax-check/build/build index 2be7439a..4f1e71ee 100644 --- a/ceph-ansible-pr-syntax-check/build/build +++ b/ceph-ansible-pr-syntax-check/build/build @@ -50,7 +50,7 @@ function group_vars_check { function test_sign_off { git fetch # shellcheck disable=SC2154 - test "$(git log --oneline origin/"${ghprbTargetBranch}"..HEAD | wc -l)" -ne "$(git log origin/"${ghprbTargetBranch}"..HEAD | grep -c Signed-off-by)" && echo "One or more commits is/are missing a Signed-off-by. Add it with 'git commit -s'." + test "$(git log --oneline --no-merges origin/"${ghprbTargetBranch}"..HEAD | wc -l)" -ne "$(git log --no-merges origin/"${ghprbTargetBranch}"..HEAD | grep -c Signed-off-by)" && echo "One or more commits is/are missing a Signed-off-by. Add it with 'git commit -s'." return 1 } -- 2.39.5