[Fusionforge-commits] FusionForge branch Branch_5_3 updated. d734af8fa88e22623eba730b7cc360835aea6af2

Roland Mas lolando at fusionforge.org
Wed Mar 26 13:15:52 CET 2014


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, Branch_5_3 has been updated
       via  d734af8fa88e22623eba730b7cc360835aea6af2 (commit)
      from  5e26bc1f9e129e0b22748dab4c1adb0118d18d76 (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 d734af8fa88e22623eba730b7cc360835aea6af2
Author: Roland Mas <lolando at debian.org>
Date:   Wed Mar 26 13:14:59 2014 +0100

    Use --quiet for git commands

diff --git a/src/plugins/scmgit/common/GitPlugin.class.php b/src/plugins/scmgit/common/GitPlugin.class.php
index 06a16f1..8911bda 100644
--- a/src/plugins/scmgit/common/GitPlugin.class.php
+++ b/src/plugins/scmgit/common/GitPlugin.class.php
@@ -398,7 +398,7 @@ class GitPlugin extends SCMPlugin {
 			chmod($repodir, 02750);
 		}
 		if (!is_file("$repodir/HEAD") && !is_dir("$repodir/objects") && !is_dir("$repodir/refs")) {
-			system("git clone --bare $main_repo $repodir");
+			system("git clone --bare --quiet $main_repo $repodir");
 			system("chown -R $user_name $repodir");
 			system("GIT_DIR=\"$repodir\" git update-server-info");
 			if (is_file("$repodir/hooks/post-update.sample")) {
@@ -526,9 +526,9 @@ class GitPlugin extends SCMPlugin {
 			$repodir = $root . '/' .  $repo_name . '.git';
 			if (!is_file("$repodir/HEAD") && !is_dir("$repodir/objects") && !is_dir("$repodir/refs")) {
 				if ($clone_url != '') {
-					system("cd $root;git clone --bare $clone_url $repodir");
+					system("cd $root;git clone --quiet --bare $clone_url $repodir");
 				} else {
-					system("GIT_DIR=\"$repodir\" git init --bare --shared=group");
+					system("GIT_DIR=\"$repodir\" git init --quiet --bare --shared=group");
 				}
 				system("GIT_DIR=\"$repodir\" git update-server-info");
 				if (is_file("$repodir/hooks/post-update.sample")) {
diff --git a/tests/func/PluginsScmGit/gitTest.php b/tests/func/PluginsScmGit/gitTest.php
index 0dbda00..ec189f2 100644
--- a/tests/func/PluginsScmGit/gitTest.php
+++ b/tests/func/PluginsScmGit/gitTest.php
@@ -92,16 +92,16 @@ class ScmGitTest extends FForge_SeleniumTestCase
 
 		// Create a local clone, add stuff, push it to the repo
 		$t = exec("mktemp -d /tmp/gitTest.XXXXXX");
-		system("cd $t && git clone $p", $ret);
+		system("cd $t && git clone --quiet $p", $ret);
 		$this->assertEquals($ret, 0);
 
 		system("echo 'this is a simple text' > $t/projecta/mytext.txt");
-		system("cd $t/projecta && git add mytext.txt && git commit -a -m'Adding file'", $ret);
+		system("cd $t/projecta && git add mytext.txt && git commit --quiet -a -m'Adding file'", $ret);
 		system("echo 'another simple text' >> $t/projecta/mytext.txt");
-		system("cd $t/projecta && git commit -a -m'Modifying file'", $ret);
+		system("cd $t/projecta && git commit --quiet -a -m'Modifying file'", $ret);
 		$this->assertEquals($ret, 0);
 
-		system("cd $t/projecta && git push", $ret);
+		system("cd $t/projecta && git push --quiet", $ret);
 		$this->assertEquals($ret, 0);
 
 		// Check that the changes appear in gitweb

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

Summary of changes:
 src/plugins/scmgit/common/GitPlugin.class.php |    6 +++---
 tests/func/PluginsScmGit/gitTest.php          |    8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list