Skip to content

O
oh-my-zsh
Unverified Commit 140bfa84 authored by Marc Cornellà's avatar Marc Cornellà
Browse files
Options

fix(changelog): go back to ignoring commits from merged branches

parent 9c8131e4
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
tools/changelog.sh
View file @ 140bfa84
...@@ -401,17 +401,18 @@ function main { ...@@ -401,17 +401,18 @@ function main {
# --format: [7-char hash]<field sep>[ref names]<field sep>[subject]<field sep>[body] # --format: [7-char hash]<field sep>[ref names]<field sep>[subject]<field sep>[body]
# --abbrev=7: force commit hashes to be 7 characters long # --abbrev=7: force commit hashes to be 7 characters long
# --no-merges: merge commits are omitted # --no-merges: merge commits are omitted
# --first-parent: commits from merged branches are omitted
local SEP="0mZmAgIcSeP" local SEP="0mZmAgIcSeP"
local -a raw_commits local -a raw_commits
raw_commits=(${(0)"$(command git log -z \ raw_commits=(${(0)"$(command git log -z \
--format="%h${SEP}%D${SEP}%s${SEP}%b" --abbrev=7 \ --format="%h${SEP}%D${SEP}%s${SEP}%b" --abbrev=7 \
--no-merges $range)"}) --no-merges --first-parent $range)"})
local raw_commit local raw_commit
local -a raw_fields local -a raw_fields
for raw_commit in $raw_commits; do for raw_commit in $raw_commits; do
# Truncate list on versions with a lot of commits # Truncate list on versions with a lot of commits
if (( ++read_commits > 40 )); then if [[ -z "$since" ]] && (( ++read_commits > 35 )); then
truncate=1 truncate=1
break break
fi fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment