diff options
| author | Tuowen Zhao <ztuowen@gmail.com> | 2021-08-16 19:36:49 -0600 |
|---|---|---|
| committer | Tuowen Zhao <ztuowen@gmail.com> | 2021-08-16 19:36:49 -0600 |
| commit | f8b7b6584bf1ca7e836ba9cc13fcce573047fb07 (patch) | |
| tree | 3a49f51b1c5632a7d89bdea855ce873ff7b1060b /tools/changelog.sh | |
| parent | 617ed3bd9f3d9519fe2354941f3dbf15b0c712ee (diff) | |
| parent | 11e22ed0b5c1aebd6e990ea7a885bdf03ab6555a (diff) | |
| download | zsh-f8b7b6584bf1ca7e836ba9cc13fcce573047fb07.tar.gz zsh-f8b7b6584bf1ca7e836ba9cc13fcce573047fb07.tar.bz2 zsh-f8b7b6584bf1ca7e836ba9cc13fcce573047fb07.zip | |
Merge remote-tracking branch 'origin/master'
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 |