linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-12-12 20:21:02 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(changelog): ignore merge commits

Browse source
This commit is contained in:
Marc Cornellà 2021-07-07 10:40:05 +02:00
parent e32d4b1e19
commit 0e7d7b87f3
No known key found for this signature in database
GPG key ID: 0314585E776A9C1B
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
tools/changelog.sh
View file

@ -114,6 +114,11 @@ function parse-commit {
fi 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 # Parse commit with hash $1
local hash="$1" subject body warning rhash local hash="$1" subject body warning rhash
subject="$(command git show -s --format=%s $hash)" subject="$(command git show -s --format=%s $hash)"