The branch, master on karma.git has been updated
  discards  7099d1791e0aa244b169dc03646d999574b47dd1 (commit)
       via  7c248f479715e02c72ea74942830b9643651be8c (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (7099d1791e0aa244b169dc03646d999574b47dd1)
            \
             N -- N -- N (7c248f479715e02c72ea74942830b9643651be8c)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

http://git.php.net/?p=karma.git;a=log;h=7c248f479715e02c72ea74942830b9643651be8c;hp=7099d1791e0aa244b169dc03646d999574b47dd1

Summary of changes:
 hooks/post-receive.mirror |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

-- Log ----------------------------------------
commit 7c248f479715e02c72ea74942830b9643651be8c
Author: David Soria Parra <d...@php.net>
Date:   Tue Jan 24 13:15:27 2012 +0100

    Calculate pathes based on the repodir

diff --git a/hooks/post-receive.mirror b/hooks/post-receive.mirror
index 450da6a..128c584 100755
--- a/hooks/post-receive.mirror
+++ b/hooks/post-receive.mirror
@@ -13,10 +13,7 @@ echo "Attempting to push to mirror"
 
 if $(echo $target | grep -q "REPO");
 then
-#      if [ -z "$GL_REPO" ];
-#      then
-           GL_REPO=$(pwd | perl -e '<> =~ /([^\/]+)\.git$/; print $1;');
-#        fi
+       GL_REPO=$(pwd | perl -e '<> =~ /\/git\/repositories\/(.*?)\.git$/; 
print $1;' | sed s,/,-,g)
        # Support a REPO variable for wildcard mirrors
        target=$(echo $target | sed -e "s,REPO,$GL_REPO,g")
 fi

Thank you for your contribution.

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to