From 18b25016abca72e950f9ceadb7ba7e5c6f4b8580 Mon Sep 17 00:00:00 2001
From: Jephte Clain <Jephte.Clain@univ-reunion.fr>
Date: Fri, 10 Jun 2016 06:13:54 +0400
Subject: [PATCH] =?UTF-8?q?prel:=20am=C3=A9liorer=20l'affichage=20du=20r?=
 =?UTF-8?q?=C3=A9sum=C3=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 prel | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/prel b/prel
index dcb590f..0d32b09 100755
--- a/prel
+++ b/prel
@@ -117,6 +117,12 @@ OPTIONS
         release par rapport à develop, sous forme de diff."
 }
 
+function show_summary() {
+    git log --oneline --graph "$@" |
+        grep -vF '|\' | grep -vF '|/' | sed 's/\* //; s/^  /+ /' |
+        grep -v "Intégration de la branche release-"
+}
+
 projdir=
 origin=origin
 action=auto
@@ -314,7 +320,7 @@ Vous allez créer la nouvelle branche de release ${COULEUR_VERTE}$release${COULE
 
             changelog="## Version $version du $(date +%d/%m/%Y-%H:%M)"
             setx mergebase=git merge-base master "$release"
-            setxp modifs=git log --oneline "$mergebase..$release" // grep -v "Intégration de la branche release-"
+            setxp modifs=show_summary "$mergebase..$release"
             [ -n "$modifs" ] && changelog="$changelog
 
 $modifs"
@@ -486,7 +492,7 @@ fi
 
 if [ "$action" == summary ]; then
     setx mergebase=git merge-base master develop
-    git log --oneline "$mergebase..develop" | grep -v "Intégration de la branche release-"
+    show_summary "$mergebase..develop"
 
 elif [ "$action" == diff ]; then
     if [ -n "$log" ]; then