[Libreoffice-commits] dev-tools.git: 2 commits - git-hooks/cppunit.git prettyprint/prettyprint

[Miklos Vajna]

 git-hooks/cppunit.git/hooks/update |    9 +++++----
 prettyprint/prettyprint            |    2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit aedf13f8c17f367bc6592f90145b8f5cf0d94db3
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Tue Dec 17 09:28:49 2013 +0100

    prettyprint: handle svg
    
    Change-Id: Ia9dc80205da2ac633dc750747be01826c1796ab3

diff --git a/prettyprint/prettyprint b/prettyprint/prettyprint
index 0f3e698..6cd7ddb 100755
--- a/prettyprint/prettyprint
+++ b/prettyprint/prettyprint
@@ -9,7 +9,7 @@ mydir=$(dirname $0)
 
 if [ "$kind" == "text/rtf" ]; then
 	$mydir/formatrtf $file
-elif [ "$kind" == "application/xml" ]; then
+elif [ "$kind" == "application/xml" -o "$kind" == "image/svg+xml" ]; then
 	#xmllint --format --recover $file 2>/dev/null
 	$mydir/formatxml $file
 else
commit 5acec380d97ab596f6d579cf39a2a4e4e68fa339
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Tue Dec 17 09:28:37 2013 +0100

    git-hooks: sync cppunit hook with core
    
    Change-Id: I192e06f1be9d0542a755ae03efc97b792c04a38b

diff --git a/git-hooks/cppunit.git/hooks/update b/git-hooks/cppunit.git/hooks/update
index 736b3cd..1079e87 100755
--- a/git-hooks/cppunit.git/hooks/update
+++ b/git-hooks/cppunit.git/hooks/update
@@ -14,6 +14,7 @@ if [ "$(id -u -n )" != "logerrit" ] ; then
        echo "*** The reference for this repo is gerrit. do not push directly to fdo" >&2
        exit 1
 fi
+from="$(git show -s --pretty=format:'%an <%ae>' $3^{})"
 
 project=$(cat $GIT_DIR/description)
 recipients="libreoffice-commits at lists.freedesktop.org"
@@ -54,8 +55,9 @@ date_format="%F %R %z"
 num_path_components=2
 
 # Set subject
+repo=$(basename $(cd $GIT_DIR ; pwd))
 if expr "$2" : '0*$' >/dev/null ; then
-	subject="Changes to '${1##refs/heads/}'"
+	subject="$repo: Changes to '${1##refs/heads/}'"
 else
 	base=$(git-merge-base "$2" "$3")
 	subject=$(git-diff-tree -r --name-only "$base" "$3" |
@@ -68,7 +70,6 @@ else
 	if [ "$branch" != "master" ] ; then
 		subject="Branch '$branch' - $subject"
 	fi
-	repo=$(basename $GIT_DIR)
 	subject="$repo: $subject"
 fi
 
@@ -120,7 +121,7 @@ else
 	esac
 	bytes=0
 	IFS="$(echo)"
-	git-rev-list "$3" "^$base" | while read rev; do git-show $rev; done | sed 's#\\#\\\\#g' |
+	git-rev-list "$3" "^$base" | while read rev; do git-show -M $rev; done | sed 's#\\#\\\\#g' |
 		while read line
 		do
 			if [ "$bytes" -ge "0" ] ; then
@@ -135,5 +136,5 @@ else
 		done
 fi |
 mail -s "$subject" -a "X-Git-Repository: git://anongit.freedesktop.org/git/libreoffice/cppunit.git" \
-     -a "List-Post: <mailto:libreoffice at lists.freedesktop.org>" $recipients
+     -a "List-Post: <mailto:libreoffice at lists.freedesktop.org>" -a "From: $from" $recipients
 exit 0