[Fusionforge-commits] FusionForge branch 6.0 updated. v6.0.3-23-g647b5d7

Sylvain Beucler beuc-inria at libremir.placard.fr.eu.org
Thu Nov 5 11:13:35 CET 2015

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, 6.0 has been updated
       via  647b5d783f3c73baee6a5c12831aca6c27a067a7 (commit)
      from  e2995cf70b7c74f8e18a7748017da47fe1920e42 (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 647b5d783f3c73baee6a5c12831aca6c27a067a7
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Thu Nov 5 11:13:25 2015 +0100

    stats: use git .mailmap file (thanks again Matthieu Imbert)

diff --git a/src/CHANGES b/src/CHANGES
index eda1794..831669f 100644
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -1,8 +1,8 @@
 FusionForge 6.0.4:
 * Accounts: do not accept digits-only user and group names, to avoid confusion with UID/GID in system commands (Inria)
 * MTA-Exim4: restart exim4 on install
-* Plugin SCM: improve user matching when computing stats (Inria)
 * Plugin SCM: fix another race condition when creating project with SCM selected (Inria)
+* Plugin SCM Git: improve user matching when computing stats, support git .mailmap (Inria)
 * Plugin scmhook: fix non-editable mailing list name in some configurations (Inria)
 * Plugin MediaWiki: fix permission error when upgrading suspended projects database (Inria & TrivialDev)
 * Plugin Projects Hierarchy: don't display a project as possible child if there's no read access to it (Inria)
diff --git a/src/plugins/scmgit/common/GitPlugin.class.php b/src/plugins/scmgit/common/GitPlugin.class.php
index 8ef6b88..fe46655 100644
--- a/src/plugins/scmgit/common/GitPlugin.class.php
+++ b/src/plugins/scmgit/common/GitPlugin.class.php
@@ -697,7 +697,9 @@ control over it to the project's administrator.");
 				return false;
-			$pipe = popen("GIT_DIR=\"$repo\" git log --since=@$start_time --until=@$end_time --all --pretty='format:%n%an <%ae>' --name-status 2>/dev/null", 'r' );
+			# For each commit, get committer full name and e-mail (respecting git .mailmap file),
+			# and a list of files prefixed by their status (A/M/D)
+			$pipe = popen("GIT_DIR=\"$repo\" git log --since=@$start_time --until=@$end_time --all --pretty='format:%n%aN <%aE>' --name-status 2>/dev/null", 'r' );


Summary of changes:
 src/CHANGES                                   | 2 +-
 src/plugins/scmgit/common/GitPlugin.class.php | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)


More information about the Fusionforge-commits mailing list