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.1 has been updated
via d994e1fd1683b54dad04ad32d3c92a60b6b8d29a (commit)
from 735e926bd420327ca831851157328fe69487fa7a (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=d994e1fd1683b54dad04ad32d3c92a60b6b8d29a
commit d994e1fd1683b54dad04ad32d3c92a60b6b8d29a
Author: Franck Villaume <[email protected]>
Date: Sat Jan 20 13:56:51 2018 +0100
use_shell_limited: support scmgit plugin
diff --git a/src/bin/limited_ssh.sh b/src/bin/limited_ssh.sh
index 6be2d0f..5e0f339 100644
--- a/src/bin/limited_ssh.sh
+++ b/src/bin/limited_ssh.sh
@@ -97,8 +97,11 @@ case "$COMMAND" in
EXEC="$HG -R $HG_BASE_DIR/$hpath serve --stdio"
;;
git)
- #TODO
- fail "not yet implemented".$SSH_ORIGINAL_COMMAND
+ # do git ssh
+ gpath=`echo "$SSH_ORIGINAL_COMMAND" | cut -d' ' -f2 | sed -e "s/'//g"`
+ $LOG "command: $COMMAND"
+ EXEC="$COMMAND $GIT_BASE_DIR/$gpath"
+
;;
*)
fail "operation not permitted"
diff --git a/src/plugins/scmgit/common/GitPlugin.class.php
b/src/plugins/scmgit/common/GitPlugin.class.php
index 482645a..b48cfbb 100644
--- a/src/plugins/scmgit/common/GitPlugin.class.php
+++ b/src/plugins/scmgit/common/GitPlugin.class.php
@@ -181,7 +181,11 @@ control over it to the project's administrator.");
$b .= html_e('p', array(), _('SSH must be
installed on your client machine.'));
$htmlRepo = '';
foreach ($repo_list as $repo_name) {
- $htmlRepo .= html_e('kbd', array(),
'git clone
git+ssh://'.$d.'@'.$this->getBoxForProject($project).$ssh_port.forge_get_config('repos_path',
'scmgit').'/'.$project->getUnixName().'/'.$repo_name.'.git').html_e('br');
+ if
(forge_get_config('use_shell_limited')) {
+ $htmlRepo .= html_e('kbd',
array(), 'git clone
'.$d.'@'.$this->getBoxForProject($project).$ssh_port.':'.$project->getUnixName().'/'.$repo_name.'.git').html_e('br');
+ } else {
+ $htmlRepo .= html_e('kbd',
array(), 'git clone
git+ssh://'.$d.'@'.$this->getBoxForProject($project).$ssh_port.forge_get_config('repos_path',
'scmgit').'/'.$project->getUnixName().'/'.$repo_name.'.git').html_e('br');
+ }
}
$b .= html_e('p', array(), $htmlRepo);
$b .= '</div>';
@@ -208,7 +212,11 @@ control over it to the project's administrator.");
' '. _('Substitute
<em>developername</em> with the proper value.'));
$htmlRepo = '';
foreach ($repo_list as $repo_name) {
- $htmlRepo .= html_e('kbd', array(),
'git clone git+ssh://'.html_e('i', array(), _('developername'), true,
false).'@'.$this->getBoxForProject($project).$ssh_port.forge_get_config('repos_path',
'scmgit').'/'.$project->getUnixName().'/'.$repo_name.'.git').html_e('br');
+ if
(forge_get_config('use_shell_limited')) {
+ $htmlRepo .= html_e('kbd',
array(), 'git clone '.html_e('i', array(), _('developername'), true,
false).'@'.$this->getBoxForProject($project).$ssh_port.':'.$project->getUnixName().'/'.$repo_name.'.git').html_e('br');
+ } else {
+ $htmlRepo .= html_e('kbd',
array(), 'git clone git+ssh://'.html_e('i', array(), _('developername'), true,
false).'@'.$this->getBoxForProject($project).$ssh_port.forge_get_config('repos_path',
'scmgit').'/'.$project->getUnixName().'/'.$repo_name.'.git').html_e('br');
+ }
}
$b .= html_e('p', array(), $htmlRepo);
$b .= '</div>';
-----------------------------------------------------------------------
Summary of changes:
src/bin/limited_ssh.sh | 7 +++++--
src/plugins/scmgit/common/GitPlugin.class.php | 12 ++++++++++--
2 files changed, 15 insertions(+), 4 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
