Permalink
Browse files

git2cl mangles the changelog; let's just use git's log

git2cl does bizarre things to line wrapping. The log it generates looks
deranged. Let's just use what git gives us; it's clean and easy to
parse, even if it doesn't adhere to the GNU changelog standards
(www.gnu.org/prep/standards/html_node/Style-of-Change-Logs.html).

Signed-off-by: Dan Scott <dan@coffeecode.net>
Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
  • Loading branch information...
1 parent 6f64d38 commit 3501b65ad2be61a31bd9b4af9488bdcadc2629f0 @dbs dbs committed Jun 3, 2012
Showing with 1 addition and 4 deletions.
  1. +1 −4 build/tools/make_release.sh
@@ -246,10 +246,7 @@ if [ $PREV_BRANCH != "PACKAGE" ]; then
grep -i -m 1 Signed-off-by ChangeLog &> /dev/null
if [ $? -ne 0 ]; then
echo "Building ChangeLog"
- # git2cl doesn't seem to play nice with piping from git log. So write to a file, then push that into git2cl.
- git log --cherry-pick --right-only --no-merges --pretty --summary --numstat $PREV_BRANCH..HEAD > ChangeLog.temp
- git2cl < ChangeLog.temp > $GIT_ABS/ChangeLog
- rm ChangeLog.temp
+ git log --cherry-pick --right-only --no-merges --pretty --summary --numstat $PREV_BRANCH..HEAD > $GIT_ABS/ChangeLog
else
echo "Not overwriting existing ChangeLog!"
fi

0 comments on commit 3501b65

Please sign in to comment.