Updating branch refs/heads/master to 92dc706b4429c7121e599ab57635e0aedb898ee4 (commit) from a06f7ac3cf3396ba88d1ffa8973bc5fe3d9ff6b4 (commit)
commit 92dc706b4429c7121e599ab57635e0aedb898ee4 Author: Jannis Pohlmann <jan...@xfce.org> Date: Thu Aug 20 00:02:17 2009 +0200 Fix detection of the previous tag in commit mails. Add Brian to AUTHORS. AUTHORS | 1 + hooks/update-03-send-commit-mails | 11 ++++++++++- 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/AUTHORS b/AUTHORS index c40ddc1..f66397c 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1 +1,2 @@ +Brian Tarricone <kel...@xfce.org> Jannis Pohlmann <jan...@xfce.org> diff --git a/hooks/update-03-send-commit-mails b/hooks/update-03-send-commit-mails index 2ec1164..a19b26f 100755 --- a/hooks/update-03-send-commit-mails +++ b/hooks/update-03-send-commit-mails @@ -28,6 +28,7 @@ fi DATEFORMAT="%F %R %z" MAIL_QUEUE_DIR=/var/spool/git-mail +PROJECT=`echo $REPO | cut -d/ -f2` repository=`basename $PWD | cut -d. -f1` mailinglist=`git repo-config xfce-hooks.mailinglist` @@ -244,7 +245,15 @@ EOF fi # If this tag succeeds another, show which tag it replaces - prevtag=`git describe $rev^ 2>/dev/null | sed 's/-.*//'` + prevtag=`git describe $rev^ 2>/dev/null` + if echo "$prevtag" | grep "^Xfce-" >/dev/null; then # Xfce releases > 4.6.1 + prevtag=`echo "$prevtag" | sed "s/^\(Xfce-[0-9]\+\.[0-9]\+\(pre[123]\)\?\).*$/\1/"` + elif echo "$prevtag" | grep "^$PROJECT" >/dev/null; then # Individual releases + prevtag=`echo "$prevtag" | sed "s/^\($PROJECT-[0-9]\.[0-9]\+\(\.[0-9]\+\)\{1,2\}\).*$/\1/"` + elif echo "$prevtag" | grep "^xfce-" >/dev/null; then # This one is for Xfce releases <= 4.6.1 + prevtag=`echo "$prevtag" | sed "s/^\(xfce-[0-9]\.[0-9]\.[0-9]\).*$/\1/"` + fi + if [[ -n "$prevtag" ]]; then echo " succeeds $prevtag" fi _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits