modules
/
nutools
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

prel: améliorer l'affichage du résumé

This commit is contained in:
Jephté Clain 2016-06-10 06:13:54 +04:00
parent b8bf04b689
commit 18b25016ab
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
prel
View File

@ -117,6 +117,12 @@ OPTIONS
release par rapport à develop, sous forme de diff." 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= projdir=
origin=origin origin=origin
action=auto 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)" changelog="## Version $version du $(date +%d/%m/%Y-%H:%M)"
setx mergebase=git merge-base master "$release" 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 [ -n "$modifs" ] && changelog="$changelog
$modifs" $modifs"
@ -486,7 +492,7 @@ fi
if [ "$action" == summary ]; then if [ "$action" == summary ]; then
setx mergebase=git merge-base master develop 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 elif [ "$action" == diff ]; then
if [ -n "$log" ]; then if [ -n "$log" ]; then