X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=scripts%2Fpost-receive-email-with-diffs;h=7723e58dc3bf0cdee6f13e795f1eafa432398be0;hb=a8aa1baef6f4d1df60f44d1d542912acff913226;hp=66a7bd204efd48d61cfeb9029cfa0128daedb98a;hpb=00e6b066e5dc5f57e12a3c8dc241c34c5a060c9c;p=infrastructure.git

diff --git a/scripts/post-receive-email-with-diffs b/scripts/post-receive-email-with-diffs
index 66a7bd2..7723e58 100755
--- a/scripts/post-receive-email-with-diffs
+++ b/scripts/post-receive-email-with-diffs
@@ -193,8 +193,15 @@ generate_email_header()
     else
 	details="$refname_type, $short_refname,"
     fi
+    # trying to improve the layout of $describe
+    # in some cases we get a plain hash, some other times we're getting a composite like
+    # TagName-NumOfCommitsAfterTag-Hash
+    # simple first idea: if it looks like a plain hash, truncate it, 
+    # otherwise preserve as-is for now
     local shortrev
-    is_hash $describe && shortrev="$(cut -b1-8 <<< $describe).." || shortrev=$describe
+#    shortrev=$(awk -F - '{print $NF;}' <<< $describe)
+    shortrev=$describe
+    is_hash $shortrev && shortrev="$(cut -b1-8 <<< $shortrev).." 
     # Generate header
     cat <<-EOF
 	To: $recipients