Fix DCO checking

Signed-off-by: Doug Davis <[email protected]>

Author: Doug Davis

.validateDCO

@@ -14,18 +14,29 @@ fi
 echo Commits: $(git rev-list ${TRAVIS_COMMIT_RANGE})
 
 for commit in $(git rev-list ${TRAVIS_COMMIT_RANGE}); do
+  echo
   echo Looking at commit: $commit
+  parents=$(git log -n 1 --format="%P" $commit)
+  if [[ "$parents" == *" "* ]]; then
+    echo "Skipping a merge commit"
+	continue
+  fi
+
   set +e
   git log --format="%B" -n 1 $commit | \
-    grep -E '^Signed-off-by: ' # ([^<]+) <([^<>@]+@[^<>]+)>$' > /dev/null
+    grep -E '^Signed-off-by: ' # ([^<]+) <([^<>@]+@[^<>]+)>$' > /dev/null 2>&1
   if test ${PIPESTATUS[1]} -ne 0; then
     set -e
-    echo "Commit $commit is missing a DCO"
-    echo "***** Commit msg:"
+    echo "Commit msg:"
+	echo "------------------------------------"
     git log --format="%B" -n 1 $commit
+	echo "------------------------------------"
+    echo "**** Commit $commit is missing a DCO"
     exit 1
   fi
   set -e
 
 done
+echo
+echo "**** All commits are signed!"
 exit 0