new message format

Signed-off-by: martin f. krafft <madduck@madduck.net>

diff --git a/fbi-announce.sh b/fbi-announce.sh
index 577deada06259575dad04bbbf00fdf618615db0e..c9ee6dbe2aea5d316afe9f27d6ee43dd6c2ce20c 100755 (executable)
--- a/fbi-announce.sh
+++ b/fbi-announce.sh
@@ -21,8 +21,8 @@
 #   hooks.fbi-refwidth        the width of references to show (default 7)
 #   hooks.fbi-noisy           include the entire log message in the announcement
 #   hooks.fbi-msg-template    the template for the message to be sent (default:
-#                               [@@component@@/]@@project@@: @@author@@: \
-#                               @@logmessage@@ [@@ref@@] @@url@@)
+#                               {@@component@@/}@@project@@[@@ref@@]: @@author@@: \
+#                               @@logmessage@@ [@@url@@])
 #
 # The hook is meant ot be run from the Git post-receive hook.
 #
@@ -79,7 +79,7 @@ ts=$(date -d "@${ts}")
 
 msg=$(git config hooks.fbi-msg-template 2>/dev/null ||:)
 if [ -z "${msg}" ]; then
-  msg="${component:+$component/}${refname}: ${author}: ${logmessage} [${ref}] ${url}"
+  msg="${component:+$component/}${refname}[${ref}]: ${author}: ${logmessage} [${url}]"
 else
   msg=$(echo "$msg" | sed -re 's,@@([^@]+)@@,${\1},g')
   eval "msg=\"$msg\""