another commit to verify

Author: njhale

Makefile

@@ -149,7 +149,7 @@ verify-nested-vendor:
 
 .PHONY: verify-commits
 verify-commits:
-	./scripts/verify_commits.sh $(PULL_BASE_REF) # see https://github.com/kubernetes/test-infra/blob/master/prow/jobs.md#job-environment-variables
+	./scripts/verify_commits.sh $(PULL_BASE_SHA) # see https://github.com/kubernetes/test-infra/blob/master/prow/jobs.md#job-environment-variables
 
 .PHONY: verify
 verify:

scripts/verify_commits.sh

@@ -85,17 +85,21 @@ function fetch_remotes() {
 }
 
 function main() {
+    git remote -v show
+
     fetch_remotes || { err "failed to fetch remotes" &&  exit 1; }
 
     local target_branch="${1:-master}"
 
     # get all commits we're introducing into the target branch
     local -a new_commits
-    mapfile -t new_commits < <(git rev-list HEAD "^${target_branch}")
+    mapfile -t new_commits < <(git rev-list --no-merges HEAD "^${target_branch}")
+    info "detected ${#new_commits[@]} commits to verify"
+    git log -n 3 HEAD
 
     local -a sr
     for commit in "${new_commits[@]}"; do
-        info "verifying ${commit:0:7}"
+        info "verifying ${commit:0:7}..."
 
         mapfile -t sr < <(upstream_ref "${commit}" || exit 1)
         if (( ${#sr[@]} < 2 )); then # the ref contains a tuple if the values were properly parsed from the commit message