diff options
| author | Marc Cornellà <hello@mcornella.com> | 2021-10-26 18:26:02 +0200 |
|---|---|---|
| committer | Marc Cornellà <hello@mcornella.com> | 2021-10-26 21:04:01 +0200 |
| commit | 140bfa84320d6f0a9c3b429c1c6be41878e60352 (patch) | |
| tree | a885b53395845f377b04c16929447005bb529eb3 /tools | |
| parent | 9c8131e417a15fccb15615e3b03ce44a53678fe0 (diff) | |
| download | zsh-140bfa84320d6f0a9c3b429c1c6be41878e60352.tar.gz zsh-140bfa84320d6f0a9c3b429c1c6be41878e60352.tar.bz2 zsh-140bfa84320d6f0a9c3b429c1c6be41878e60352.zip | |
fix(changelog): go back to ignoring commits from merged branches
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/changelog.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/changelog.sh b/tools/changelog.sh index 13cfb9530..5c3159732 100755 --- a/tools/changelog.sh +++ b/tools/changelog.sh @@ -401,17 +401,18 @@ function main { # --format: [7-char hash]<field sep>[ref names]<field sep>[subject]<field sep>[body] # --abbrev=7: force commit hashes to be 7 characters long # --no-merges: merge commits are omitted + # --first-parent: commits from merged branches are omitted local SEP="0mZmAgIcSeP" local -a raw_commits raw_commits=(${(0)"$(command git log -z \ --format="%h${SEP}%D${SEP}%s${SEP}%b" --abbrev=7 \ - --no-merges $range)"}) + --no-merges --first-parent $range)"}) local raw_commit local -a raw_fields for raw_commit in $raw_commits; do # Truncate list on versions with a lot of commits - if (( ++read_commits > 40 )); then + if [[ -z "$since" ]] && (( ++read_commits > 35 )); then truncate=1 break fi |