The branch, master on karma.git has been updated
via e8ea9bb51969db576a4a058ff3ab1d8d73433ec6 (commit)
via 96fb9e3bd581610cc5f3e4a2b56374741753d07a (commit)
via 268135ce2b9dfe64b3153ca133af9e9d82472ee0 (commit)
from ee5b0311950d47714cd46a6c63db5d5b97cf28d3 (commit)
http://git.php.net/?p=karma.git;a=log;h=e8ea9bb51969db576a4a058ff3ab1d8d73433ec6;hp=ee5b0311950d47714cd46a6c63db5d5b97cf28d3
Summary of changes:
http://git.php.net/?p=karma.git;a=log;h=e8ea9bb51969db576a4a058ff3ab1d8d73433ec6;hp=ee5b0311950d47714cd46a6c63db5d5b97cf28d3
hooks/post-receive | 49 +++++++++++++++++++++++++++----------------------
1 files changed, 27 insertions(+), 22 deletions(-)
-- Log ----------------------------------------
commit e8ea9bb51969db576a4a058ff3ab1d8d73433ec6
Author: David Soria Parra <d...@php.net>
Date: Sat Jan 21 19:02:01 2012 -0800
Add link to gitweb
diff --git a/hooks/post-receive b/hooks/post-receive
index e9a28c8..c7d5108 100755
--- a/hooks/post-receive
+++ b/hooks/post-receive
@@ -421,7 +421,9 @@ generate_update_branch_email()
# echo "not appeared on any other notification email; so we list
those"
# echo "revisions in full, below."
- echo "Summary of changes:"
+ echo "http://git.php.net/?p=$project;a=log;h=$newrev;hp=$oldrev";
+ echo ""
+ echo "Summary of changes:
http://git.php.net/?p=$project;a=log;h=$newrev;hp=$oldrev";
git diff-tree $diffopts $oldrev..$newrev
echo ""
@@ -707,7 +709,8 @@ if [ -z "$GIT_DIR" ]; then
fi
#projectdesc=$(sed -ne '1p' "$GIT_DIR/description" 2>/dev/null)
-projectdesc=$(pwd | sed -e "s,/git/repositories/,,g" )
+project=$(pwd | sed -e "s,/git/repositories/,,g" )
+projectdesc=$project
# Check if the description is unchanged from it's default, and shorten it to
# a more manageable length if it is
if expr "$projectdesc" : "Unnamed repository.*$" >/dev/null
commit 96fb9e3bd581610cc5f3e4a2b56374741753d07a
Author: David Soria Parra <d...@php.net>
Date: Sat Jan 21 17:16:44 2012 -0800
Use different email format
diff --git a/hooks/post-receive b/hooks/post-receive
index 8536bd2..e9a28c8 100755
--- a/hooks/post-receive
+++ b/hooks/post-receive
@@ -239,11 +239,7 @@ generate_email_header()
X-Git-Oldrev: $oldrev
X-Git-Newrev: $newrev
- This is an automated email from the git hooks/post-receive script. It
was
- generated because a ref change was pushed to the repository containing
- the project "$projectdesc".
-
- The $refname_type, $short_refname has been ${change_type}d
+ The $refname_type, $short_refname on $projectdesc has been
${change_type}d
EOF
}
@@ -251,11 +247,7 @@ generate_email_footer()
{
SPACE=" "
cat <<-EOF
-
-
- hooks/post-receive
- --${SPACE}
- $projectdesc
+Thank you for your contribution.
EOF
}
@@ -425,9 +417,12 @@ generate_update_branch_email()
echo ""
if [ -z "$rewind_only" ]; then
- echo "Those revisions listed above that are new to this
repository have"
- echo "not appeared on any other notification email; so we list
those"
- echo "revisions in full, below."
+# echo "Those revisions listed above that are new to this
repository have"
+# echo "not appeared on any other notification email; so we list
those"
+# echo "revisions in full, below."
+
+ echo "Summary of changes:"
+ git diff-tree $diffopts $oldrev..$newrev
echo ""
echo $LOGBEGIN
@@ -437,7 +432,7 @@ generate_update_branch_email()
# outputted anything, so that we can issue a "no new
# revisions added by this update" message
- echo $LOGEND
+# echo $LOGEND
else
echo "No new revisions were added by this update."
fi
@@ -449,9 +444,6 @@ generate_update_branch_email()
# point - the user will be interested in what this revision changed
# - including the undoing of previous revisions in the case of
# non-fast-forward updates.
- echo ""
- echo "Summary of changes:"
- git diff-tree $diffopts $oldrev..$newrev
}
#
@@ -702,8 +694,8 @@ send_mail()
# ---------------------------- main()
# --- Constants
-LOGBEGIN="- Log
-----------------------------------------------------------------"
-LOGEND="-----------------------------------------------------------------------"
+LOGBEGIN="-- Log ----------------------------------------"
+LOGEND=""
# --- Config
# Set GIT_DIR either from the working directory, or from the environment
@@ -714,7 +706,8 @@ if [ -z "$GIT_DIR" ]; then
exit 1
fi
-projectdesc=$(sed -ne '1p' "$GIT_DIR/description" 2>/dev/null)
+#projectdesc=$(sed -ne '1p' "$GIT_DIR/description" 2>/dev/null)
+projectdesc=$(pwd | sed -e "s,/git/repositories/,,g" )
# Check if the description is unchanged from it's default, and shorten it to
# a more manageable length if it is
if expr "$projectdesc" : "Unnamed repository.*$" >/dev/null
commit 268135ce2b9dfe64b3153ca133af9e9d82472ee0
Author: David Soria Parra <d...@php.net>
Date: Sat Jan 21 17:02:20 2012 -0800
Send mail from u...@php.net
diff --git a/hooks/post-receive b/hooks/post-receive
index 969b9b7..8536bd2 100755
--- a/hooks/post-receive
+++ b/hooks/post-receive
@@ -722,10 +722,19 @@ then
projectdesc="UNNAMED PROJECT"
fi
+if [ -n "$GL_USER" ];
+then
+ envelopesender="$gl_u...@php.net"
+elif [ -n "$REMOTE_USER" ];
+then
+ envelopesender="$remote_u...@php.net"
+else
+ envelopesender=$(git config hooks.envelopesender)
+fi
+
recipients=$(git config hooks.mailinglist)
announcerecipients=$(git config hooks.announcelist)
-envelopesender=$(git config hooks.envelopesender)
-emailprefix=$(git config hooks.emailprefix || echo '[SCM] ')
+emailprefix=$(git config hooks.emailprefix || echo '[git] ')
custom_showrev=$(git config hooks.showrev)
maxlines=$(git config hooks.emailmaxlines)
diffopts=$(git config hooks.diffopts)
Thank you for your contribution.
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
