add changes to git commit type (#81)

hygieia · Jun 23, 2022 · 31dc0b8 · 31dc0b8
1 parent 16eaf74
commit 31dc0b8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
  </description>
  <url>https://github.com/Hygieia/${repository.name}</url>
  <packaging>jar</packaging>
- <version>3.3.12-SNAPSHOT</version>
+ <version>3.3.13-SNAPSHOT</version>
 
 
  <parent>

diff --git a/src/main/java/com/capitalone/dashboard/collector/DefaultGitHubClient.java b/src/main/java/com/capitalone/dashboard/collector/DefaultGitHubClient.java
@@ -1101,7 +1101,7 @@ private static String getMergeEventSha(GitRequest pr, JSONObject timelineObject)
  }
 
  private CommitType getCommitType(int parentSize, String commitMessage) {
- if (parentSize > 1) return CommitType.Merge;
+ if (parentSize >= 1) return CommitType.Merge;
  if (settings.getNotBuiltCommits() == null) return CommitType.New;
  if (!CollectionUtils.isEmpty(commitExclusionPatterns)) {
  for (Pattern pattern : commitExclusionPatterns) {