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 c1427ec3c9e90a2afbe038dc0b9110d25e06b35d (commit)
from 96c305e49e80515861cdae3bfd27f498b031bf27 (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 -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=c1427ec3c9e90a2afbe038dc0b9110d25e06b35d
commit c1427ec3c9e90a2afbe038dc0b9110d25e06b35d
Author: Sylvain Beucler <[email protected]>
Date: Tue Sep 29 17:49:48 2015 +0200
scmhook: git: committracker: fix groupname detection on multi-server setup
diff --git a/src/CHANGES b/src/CHANGES
index 84ec678..02d005d 100644
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -6,6 +6,7 @@ Fusionforge 6.0.3:
* Plugin SCM: fix race condition when creating project with SCM selected
(Inria)
* Plugin SCM SVN: fix repo access to RO group (Inria)
* Plugin SCM Git: work-around for iframe access to private projects' gitweb
from Firefox 40 (Inria)
+* Plugin scmhook: git committracker: fix groupname detection on multi-server
setup (Inria)
* Plugin Taskboard: remove in-progress French translation (Inria)
* Plugin Taskboard: block dropping item on columns with resolution "closed"
[#781] (TrivialDev)
diff --git a/src/plugins/scmhook/www/committracker/newcommitgit.php
b/src/plugins/scmhook/www/committracker/newcommitgit.php
index 88125d8..77604e0 100644
--- a/src/plugins/scmhook/www/committracker/newcommitgit.php
+++ b/src/plugins/scmhook/www/committracker/newcommitgit.php
@@ -85,8 +85,10 @@ function parseConfig(&$Config)
$repos_path.='/';
}
$repo_root = substr($Repository,0,strrpos($Repository,"/") + 1); //we
get the directory of the repository root (with trailing slash)
- if(fileinode($repos_path) == fileinode($repo_root)) { // since the
$repos_path is usually $sys_gitroot, and that one is a symlink, we check that
the inode is the same for both
+ if (fileinode($repos_path) !== false
+ && fileinode($repos_path) == fileinode($repo_root)) { // since
the $repos_path is usually $sys_gitroot, and that one is a symlink, we check
that the inode is the same for both
$GroupName = substr($Repository, strrpos($Repository,"/") + 1);
+ $GroupName = preg_replace('/.git$/', '', $GroupName);
$Config['FileName'] =
substr($Config['FileName'],strlen($Repository)); //get only the filename
relative to the repo
} else {
$GroupName = trim(str_replace($repos_path,'',$repo_root),"/");
-----------------------------------------------------------------------
Summary of changes:
src/CHANGES | 1 +
src/plugins/scmhook/www/committracker/newcommitgit.php | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
