From: Klaus Ethgen Date: Sun, 29 Oct 2017 12:39:18 +0000 (+0100) Subject: Fixing changelog generation X-Git-Tag: v1.4~41 X-Git-Url: http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commitdiff_plain;h=cbe2074d6b330b9077444448a788b1ab1f309dfe Fixing changelog generation --- diff --git a/.gitignore b/.gitignore index 8654fd26..c1231093 100644 --- a/.gitignore +++ b/.gitignore @@ -84,3 +84,5 @@ Makefile.in # That two files are autocreated(!) /src/gq-marshal.[ch] +ChangeLog.html +README.html diff --git a/.mailmap b/.mailmap index c6eb36e9..5dadf809 100644 --- a/.mailmap +++ b/.mailmap @@ -1,6 +1,6 @@ - -Colin Clark + +Colin Clark John Ellis Laurent Monin diff --git a/gen_changelog.sh b/gen_changelog.sh index 2a6325cd..fdb415c3 100755 --- a/gen_changelog.sh +++ b/gen_changelog.sh @@ -12,7 +12,7 @@ [ ! -x "$(command -v git)" ] && exit 0 tail -6614 ChangeLog > ChangeLog.$$.old && \ -LC_ALL=C git log --no-merges --no-notes --encoding=UTF-8 --no-follow 1b58572cf58e9d2d4a0305108395dab5c66d3a09..HEAD > ChangeLog.$$.new && \ +LC_ALL=C git log --no-merges --no-notes --encoding=UTF-8 --no-follow --use-mailmap 1b58572cf58e9d2d4a0305108395dab5c66d3a09..HEAD > ChangeLog.$$.new && \ cat ChangeLog.$$.old >> ChangeLog.$$.new && \ mv -f ChangeLog ChangeLog.bak && \ mv -f ChangeLog.$$.new ChangeLog @@ -20,11 +20,18 @@ mv -f ChangeLog.$$.new ChangeLog rm -f ChangeLog.$$.old -echo "

" > ChangeLog.$$.new.html && \ -cat ChangeLog.$$.old.html >> ChangeLog.$$.new.html +echo "" >>ChangeLog.$$.old.html && \ +echo "" > ChangeLog.$$.new.html && \ +echo "" >> ChangeLog.$$.new.html && \ +echo "

view commit

Author: %aN
Date: %ad
%s %n%n%b

" >> ChangeLog.$$.new.html && \ +echo "" >> ChangeLog.$$.new.html && \ +echo "" >> ChangeLog.$$.new.html [ -e ChangeLog.html ] && mv -f ChangeLog.html ChangeLog.html.bak mv -f ChangeLog.$$.new.html ChangeLog.html