diff --git a/Makefile b/Makefile index c093f96..ced94ca 100644 --- a/Makefile +++ b/Makefile @@ -471,19 +471,15 @@ authors: AUTHORS.md @echo "Makefile: $@ done." # Make sure the AUTHORS.md file is up to date but has the old date when it did -# not change to prevent redoing dependent targets. In GitHub Actions, the -# 'git shortlog' command does not return authors anymore since around 8/2024. -# This is tolerated by leaving the file unchanged. +# not change to prevent redoing dependent targets. AUTHORS.md: _always echo "# Authors of this project" >AUTHORS.md.tmp echo "" >>AUTHORS.md.tmp echo "Sorted list of authors derived from git commit history:" >>AUTHORS.md.tmp echo '```' >>AUTHORS.md.tmp - sh -c "git shortlog --summary --email | cut -f 2 | sort >log.tmp" - sh -c "cat log.tmp >>AUTHORS.md.tmp" + sh -c "git shortlog --summary --email HEAD | cut -f 2 | sort >>AUTHORS.md.tmp" echo '```' >>AUTHORS.md.tmp - sh -c "if ! grep -q '[^[:space:]]' log.tmp; then echo 'Warning - git shortlog does not display any authors - leaving AUTHORS.md file unchanged'; else if ! diff -q AUTHORS.md.tmp AUTHORS.md; then echo 'Updating AUTHORS.md as follows:'; diff AUTHORS.md.tmp AUTHORS.md; mv AUTHORS.md.tmp AUTHORS.md; else echo 'AUTHORS.md was already up to date'; fi; fi" - sh -c "rm -f log.tmp AUTHORS.md.tmp" + sh -c "if ! diff -q AUTHORS.md.tmp AUTHORS.md; then echo 'Updating AUTHORS.md as follows:'; diff AUTHORS.md.tmp AUTHORS.md; mv AUTHORS.md.tmp AUTHORS.md; else echo 'AUTHORS.md was already up to date'; rm AUTHORS.md.tmp; fi" .PHONY: clean clean: diff --git a/changes/noissue.2.fix.rst b/changes/noissue.2.fix.rst new file mode 100644 index 0000000..617edad --- /dev/null +++ b/changes/noissue.2.fix.rst @@ -0,0 +1,3 @@ +Dev: In the make commands to create/update AUTHORS.md, added a reftag to the +'git shortlog' command to fix the issue that without a terminal (e.g. in GitHub +Actions), the command did not display any authors.