diff options
| author | Marc Cornellà <hello@mcornella.com> | 2021-07-07 10:40:05 +0200 |
|---|---|---|
| committer | Marc Cornellà <hello@mcornella.com> | 2021-07-07 10:40:05 +0200 |
| commit | 0e7d7b87f33b5ec8c75a3a0a9b16fae082d06348 (patch) | |
| tree | b846ea6013c2bcb75c1249249a7d4be4654515b8 /tools/changelog.sh | |
| parent | e32d4b1e195f4c7777844beea97af42bd93434eb (diff) | |
| download | zsh-0e7d7b87f33b5ec8c75a3a0a9b16fae082d06348.tar.gz zsh-0e7d7b87f33b5ec8c75a3a0a9b16fae082d06348.tar.bz2 zsh-0e7d7b87f33b5ec8c75a3a0a9b16fae082d06348.zip | |
feat(changelog): ignore merge commits
Diffstat (limited to 'tools/changelog.sh')
| -rwxr-xr-x | tools/changelog.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tools/changelog.sh b/tools/changelog.sh index 836afef14..56ea42cb1 100755 --- a/tools/changelog.sh +++ b/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)" |