Browse Source

feat(changelog): ignore merge commits

Marc Cornellà 2 years ago
parent
commit
0e7d7b87f3
1 changed files with 5 additions and 0 deletions
  1. 5 0
      tools/changelog.sh

+ 5 - 0
tools/changelog.sh

@@ -114,6 +114,11 @@ function parse-commit {
     fi
   }
 
+  # Ignore commit if it is a merge commit
+  if [[ $(command git show -s --format=%p $1 | wc -w) -gt 1 ]]; then
+    return
+  fi
+
   # Parse commit with hash $1
   local hash="$1" subject body warning rhash
   subject="$(command git show -s --format=%s $hash)"