From fe92025c8ff14d6bf8afbbaed05fa1895fb5875e Mon Sep 17 00:00:00 2001
From: Nicolas Sebrecht <nicolas.s-dev@laposte.net>
Date: Sat, 21 Mar 2015 14:15:42 +0100
Subject: [PATCH] release.sh: git_shortlog() -> get_git_history()

Use 'log --oneline' rather than 'shortlog'.

Signed-off-by: Nicolas Sebrecht <nicolas.s-dev@laposte.net>
---
 contrib/release.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/contrib/release.sh b/contrib/release.sh
index af098cd..e2e482b 100755
--- a/contrib/release.sh
+++ b/contrib/release.sh
@@ -156,12 +156,13 @@ function update_offlineimap_version () {
 #
 # $1: previous version
 #
-function get_shortlog () {
-  debug 'in get_shortlog'
-  git shortlog "${1}.." | grep -v '^[^ ]' | sed -r -e 's,^[ ]*,\- ,'
+function get_git_history () {
+  debug 'in get_git_history'
+  git log --oneline "${1}.." | sed -r -e 's,^(.),\- \1,'
 }
 
 
+
 #
 # $1: new version
 # $2: shortlog
@@ -215,7 +216,7 @@ function update_changelog () {
   if test ! -f "$TMP_CHANGELOG_EXCERPT"
   then
     changelog_template "$1" > "$TMP_CHANGELOG_EXCERPT"
-    get_shortlog "$2" >> "$TMP_CHANGELOG_EXCERPT"
+    get_git_history "$2" >> "$TMP_CHANGELOG_EXCERPT"
     edit_file "the Changelog excerpt" $TMP_CHANGELOG_EXCERPT
 
     # Remove comments.