X-Git-Url: http://geeqie.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=gen_changelog.sh;h=ec13daecb739bc80513ea6ee885ab09699fcdb49;hb=c6b7830011b3d98aae2c9e17d6e019b414872680;hp=2a6325cd4361b2fe6196b864ef8d21bb7adabe9b;hpb=4064414bb4ea9281dc1174669fe3f2cc15e06a2d;p=geeqie.git diff --git a/gen_changelog.sh b/gen_changelog.sh index 2a6325cd..ec13daec 100755 --- a/gen_changelog.sh +++ b/gen_changelog.sh @@ -3,28 +3,31 @@ # Script to update ChangeLog file, # it keeps "pre-svn" history and inserts git log at top, # it uses C locale for date format. -# It has to be run where ChangeLog is. -# Old ChangeLog is saved as ChangeLog.bak +# It has to be run where ChangeLog.gqview is. # # ChangeLog.html is also created -[ ! -e "ChangeLog" ] && exit 1 -[ ! -x "$(command -v git)" ] && exit 0 +exit 0 # Just drop it, we have it hardcoded in release +[ ! -e "ChangeLog.gqview" ] && exit 1 +[ ! -x "$(command -v git)" ] && exit 1 -tail -6614 ChangeLog > ChangeLog.$$.old && \ -LC_ALL=C git log --no-merges --no-notes --encoding=UTF-8 --no-follow 1b58572cf58e9d2d4a0305108395dab5c66d3a09..HEAD > ChangeLog.$$.new && \ -cat ChangeLog.$$.old >> ChangeLog.$$.new && \ -mv -f ChangeLog ChangeLog.bak && \ +LC_ALL=C git log --no-merges --no-notes --encoding=UTF-8 --no-follow --use-mailmap 1b58572cf58e9d2d4a0305108395dab5c66d3a09..HEAD > ChangeLog.$$.new && \ +cat ChangeLog.gqview >> ChangeLog.$$.new && \ 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