Skip to content

Commit

Permalink
Commit ChangeLog during releaseprep if changed
Browse files Browse the repository at this point in the history
  • Loading branch information
vanosg committed Nov 2, 2016
1 parent c390daa commit d469046
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions misc/releaseprep
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,13 @@ show_usage() {
}

git_log() {
git log $(git rev-list -n 1 $1)..HEAD --name-only --no-merges --pretty=format:"- - - - - - - - - - - - - - - %n%w(75)Commit %h (%ai) by %aN %n %s %n %b" > ChangeLog
DIFF=$(git log -1 --pretty="%s")
if [ "$DIFF" != "Update ChangeLog" ]; then
git log $(git rev-list -n 1 $1)..HEAD --name-only --no-merges --pretty=format:"- - - - - - - - - - - - - - -%n%w(75)Commit %h (%ai) by %aN%n %s %n %b" > ChangeLog
git add ChangeLog
git commit -m "Update ChangeLog"
git push origin develop
fi
}

regenerate_changelog() {
Expand Down Expand Up @@ -132,12 +138,6 @@ echo "Regenerating ChangeLog file..."
regenerate_changelog $LASTVER
echo ""

# Commit ChangeLog to develop branch before proceeding
# (otherwise it never gets done!)
git add ChangeLog
git commit -m "Update ChangeLog"
git push origin develop

# Change default make from "debug" to "eggdrop"...
echo -n "Changing default make..."
change_default_make
Expand Down

0 comments on commit d469046

Please sign in to comment.