kevin/ohmyzsh
1
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-11-15 09:58:47 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix(changelog): also display commits from merged branches

Browse Source
This commit is contained in:
Marc Cornellà 2021-08-14 22:41:48 +02:00
parent 0b809c8dc5
commit 7c5ab01a5f
No known key found for this signature in database
GPG Key ID: 0314585E776A9C1B
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/changelog.sh
View File

@ -391,9 +391,7 @@ function main {
# Get commit list from $until commit until $since commit, or until root # Get commit list from $until commit until $since commit, or until root
# commit if $since is unset, in short hash form. # commit if $since is unset, in short hash form.
# --first-parent is used when dealing with merges: it only prints the command git rev-list --abbrev-commit --abbrev=7 ${since:+$since..}$until | while read hash; do
# merge commit, not the commits of the merged branch.
command git rev-list --first-parent --abbrev-commit --abbrev=7 ${since:+$since..}$until | while read hash; do
# Truncate list on versions with a lot of commits # Truncate list on versions with a lot of commits
if [[ -z "$since" ]] && (( ++read_commits > 35 )); then if [[ -z "$since" ]] && (( ++read_commits > 35 )); then
truncate=1 truncate=1