From 3501b65ad2be61a31bd9b4af9488bdcadc2629f0 Mon Sep 17 00:00:00 2001 From: Dan Scott Date: Sat, 2 Jun 2012 23:25:53 -0400 Subject: [PATCH] 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 Signed-off-by: Thomas Berezansky --- build/tools/make_release.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/build/tools/make_release.sh b/build/tools/make_release.sh index 67a926b9c0..9b3bcfca6d 100755 --- 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 -- 2.11.0