diff options
| author | Tuowen Zhao <ztuowen@gmail.com> | 2021-07-11 19:58:51 -0600 |
|---|---|---|
| committer | Tuowen Zhao <ztuowen@gmail.com> | 2021-07-11 19:58:51 -0600 |
| commit | 617ed3bd9f3d9519fe2354941f3dbf15b0c712ee (patch) | |
| tree | caf617b35d3f5f7b5786483eedfcda9361dca108 /tools/changelog.sh | |
| parent | 0144641b7d8e4e6ff6ce153039b5a827f5347904 (diff) | |
| parent | 36f444ed7325720ec05f182781ec7d6c9a4d675c (diff) | |
| download | zsh-617ed3bd9f3d9519fe2354941f3dbf15b0c712ee.tar.gz zsh-617ed3bd9f3d9519fe2354941f3dbf15b0c712ee.tar.bz2 zsh-617ed3bd9f3d9519fe2354941f3dbf15b0c712ee.zip | |
Merge remote-tracking branch 'origin/master'
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)" |