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>

diff --git a/build/tools/make_release.sh b/build/tools/make_release.sh
index 67a926b..9b3bcfc 100755 (executable)
--- a/build/tools/make_release.sh
+++ b/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