prel: améliorer l'affichage du résumé
This commit is contained in:
parent
b8bf04b689
commit
18b25016ab
10
prel
10
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
|
||||
|
|
Loading…
Reference in New Issue