build-changelog now auto-commits changelog
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/5d9c469b Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/5d9c469b Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/5d9c469b Branch: refs/heads/wicket-7.x Commit: 5d9c469b54d1f34567d6b79508eb5c738911a8fe Parents: c7efd93 Author: Martijn Dashorst <[email protected]> Authored: Mon Apr 25 11:38:27 2016 +0200 Committer: Martijn Dashorst <[email protected]> Committed: Mon Apr 25 11:38:27 2016 +0200 ---------------------------------------------------------------------- build-changelog.sh | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/5d9c469b/build-changelog.sh ---------------------------------------------------------------------- diff --git a/build-changelog.sh b/build-changelog.sh index 2c9c3d9..cb3dfbf 100755 --- a/build-changelog.sh +++ b/build-changelog.sh @@ -117,7 +117,7 @@ echo "done" echo " - merging release notes into changelog: \c" -echo "This file contains all changes done in releases for Apache Wicket 7.x. +echo "This file contains all changes done in releases for Apache Wicket $major_version.x. ======================================================================= $(cat /tmp/release-notes-$version.txt) @@ -127,21 +127,21 @@ $(tail -n +4 CHANGELOG-$major_version.x) " > /tmp/changelog-$version.txt cp /tmp/changelog-$version.txt CHANGELOG-$major_version.x -echo "done" +echo "done +" +git diff -echo " -The CHANGELOG-$major_version.x file has been updated. Please check the contents -and commit the changes. +echo "" -To see the status: +git add CHANGELOG-$major_version.x +git commit -m "Added CHANGELOG for release $version" - git status - git diff +echo " +The CHANGELOG-$major_version.x file has been updated and committed. -To add and commit the CHANGELOG: +To revert the changes to the CHANGELOG: - git add CHANGELOG-$major_version.x - git commit -m \"Added CHANGELOG for release $version + git reset HEAD^ --hard Have fun! "
