diff options
| author | Marc Cornellà <hello@mcornella.com> | 2021-08-14 22:41:48 +0200 |
|---|---|---|
| committer | Marc Cornellà <hello@mcornella.com> | 2021-08-14 22:41:48 +0200 |
| commit | 7c5ab01a5f7b07481182108117db070b8cabb2e6 (patch) | |
| tree | 7397a2b3415ef50e98fe79cfffd4cbb9699267e1 /tools/changelog.sh | |
| parent | 0b809c8dc5dd23a1720f9135516f0f9e7c98b5f1 (diff) | |
| download | zsh-7c5ab01a5f7b07481182108117db070b8cabb2e6.tar.gz zsh-7c5ab01a5f7b07481182108117db070b8cabb2e6.tar.bz2 zsh-7c5ab01a5f7b07481182108117db070b8cabb2e6.zip | |
fix(changelog): also display commits from merged branches
Diffstat (limited to 'tools/changelog.sh')
| -rwxr-xr-x | tools/changelog.sh | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/tools/changelog.sh b/tools/changelog.sh index 56ea42cb1..6913ae49a 100755 --- a/tools/changelog.sh +++ b/tools/changelog.sh @@ -391,9 +391,7 @@ function main { # Get commit list from $until commit until $since commit, or until root # commit if $since is unset, in short hash form. - # --first-parent is used when dealing with merges: it only prints the - # 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 + command git rev-list --abbrev-commit --abbrev=7 ${since:+$since..}$until | while read hash; do # Truncate list on versions with a lot of commits if [[ -z "$since" ]] && (( ++read_commits > 35 )); then truncate=1 |