From: Sébastien Han <seb@redhat.com>
Date: Tue, 3 Jul 2018 10:18:30 +0000 (+0200)
Subject: ceph-ansible-pr-syntax-check: remove merge commit from count
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=e6e098ef2a0b2caf3c662058d2620fde21520119;p=ceph-build.git

ceph-ansible-pr-syntax-check: remove merge commit from count

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 <seb@redhat.com>
---

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
 }