[Fusionforge-commits] FusionForge branch master updated. 9d412c4fb097bab3185807db0bc9e311f0d763ef

Roland Mas lolando at fusionforge.org
Mon Dec 2 11:09:03 CET 2013


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 "FusionForge".

The branch, master has been updated
       via  9d412c4fb097bab3185807db0bc9e311f0d763ef (commit)
       via  86aed97c4b2f04eb323a02956135863e36fbddc5 (commit)
       via  165f6a46b93759c1e9065e3e9081c24931546ca7 (commit)
       via  f08a4edee2175303bf04462c2f187fa0f9e51af3 (commit)
      from  aeec040cdd09654d82bd106dc5cc7764bca36d07 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9d412c4fb097bab3185807db0bc9e311f0d763ef
Merge: aeec040 86aed97
Author: Roland Mas <lolando at debian.org>
Date:   Mon Dec 2 11:08:51 2013 +0100

    Merged from 5.2: Fixed warning in Git's stats gathering

diff --cc src/plugins/scmgit/common/GitPlugin.class.php
index c1637a7,7a44cdb..883ebd8
--- a/src/plugins/scmgit/common/GitPlugin.class.php
+++ b/src/plugins/scmgit/common/GitPlugin.class.php
@@@ -728,14 -546,10 +728,15 @@@ class GitPlugin extends SCMPlugin 
  						// Author line
  						$last_user = $matches['name'];
  						$user2email[$last_user] = strtolower($matches['mail']);
 +						if (!isset($usr_adds[$last_user])) {
 +							$usr_adds[$last_user] = 0;
 +							$usr_updates[$last_user] = 0;
 +							$usr_deletes[$last_user] = 0;
 +						}
  					} else {
  						// Short-commit stats line
- 						preg_match("/^(?P<mode>[AMD])\s+(?P<file>.+)$/", $line, $matches);
+ 						$result = preg_match("/^(?P<mode>[AMD])\s+(?P<file>.+)$/", $line, $matches);
+ 						if (!$result) continue;
  						if ($last_user == "") continue;
  						if (!isset ($usr_adds[$last_user])) $usr_adds[$last_user] = 0;
  						if (!isset ($usr_updates[$last_user])) $usr_updates[$last_user] = 0;

-----------------------------------------------------------------------

Summary of changes:
 src/plugins/scmgit/common/GitPlugin.class.php |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list