[X2Go-Commits] [maintenancescripts] 01/01: git/hooks/common.sh: add new SHORT_GIT_REPO_NAME variable and use as irkerhook's repo option.

git-admin at x2go.org git-admin at x2go.org
Thu Mar 26 12:32:03 CET 2015


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository maintenancescripts.

commit f6ac1867949d5caf371f96924239c3e6d5b53cb9
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Thu Mar 26 12:31:39 2015 +0100

    git/hooks/common.sh: add new SHORT_GIT_REPO_NAME variable and use as irkerhook's repo option.
---
 git/hooks/common.sh    |    3 +++
 git/hooks/update       |    2 +-
 git/hooks/update-merge |    2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/git/hooks/common.sh b/git/hooks/common.sh
index 9079bf3..6ddcc61 100755
--- a/git/hooks/common.sh
+++ b/git/hooks/common.sh
@@ -10,6 +10,9 @@ else
   OUTSIDE_REPO="/../../"
 fi
 
+# Strip off .git for condensed output.
+SHORT_GIT_REPO_NAME="${GIT_REPO_NAME%.git}"
+
 # GIT_DIR will always be the current repository's .git dir.
 GIT_DIR="$(pwd)"
 
diff --git a/git/hooks/update b/git/hooks/update
index 604c129..5a61063 100755
--- a/git/hooks/update
+++ b/git/hooks/update
@@ -12,5 +12,5 @@ NEW="${3}"
 . "${GIT_DIR}/${OUTSIDE_REPO}/_hooks_/update-script._check_"
 #. "${GIT_DIR}/${OUTSIDE_REPO}/_hooks_/update-script._branches+tags_"
 #. "${GIT_DIR}/${OUTSIDE_REPO}/_hooks_/update-script._acl_"
-"${GIT_DIR}/${OUTSIDE_REPO}/_hooks_/update-script._irkerhook.py_" --refname="${REFNAME}" "$(git rev-list --reverse ${OLD}..${NEW})" --repo="${GIT_REPO_NAME}"
+"${GIT_DIR}/${OUTSIDE_REPO}/_hooks_/update-script._irkerhook.py_" --refname="${REFNAME}" "$(git rev-list --reverse ${OLD}..${NEW})" --repo="${SHORT_GIT_REPO_NAME}"
 . "${GIT_DIR}/${OUTSIDE_REPO}/_hooks_/update-script._grant_"
diff --git a/git/hooks/update-merge b/git/hooks/update-merge
index f521aec..963ff20 100755
--- a/git/hooks/update-merge
+++ b/git/hooks/update-merge
@@ -12,5 +12,5 @@ NEW="${3}"
 . "${GIT_DIR}/${OUTSIDE_REPO}/_hooks_/update-script._check+allow-merges_"
 #. "${GIT_DIR}/${OUTSIDE_REPO}/_hooks_/update-script._branches+tags_"
 #. "${GIT_DIR}/${OUTSIDE_REPO}/_hooks_/update-script._acl_"
-"${GIT_DIR}/${OUTSIDE_REPO}/_hooks_/update-script._irkerhook.py_" --refname="${REFNAME}" "$(git rev-list --reverse ${OLD}..${NEW})" --repo="${GIT_REPO_NAME}"
+"${GIT_DIR}/${OUTSIDE_REPO}/_hooks_/update-script._irkerhook.py_" --refname="${REFNAME}" "$(git rev-list --reverse ${OLD}..${NEW})" --repo="${SHORT_GIT_REPO_NAME}"
 . "${GIT_DIR}/${OUTSIDE_REPO}/_hooks_/update-script._grant_"

--
Alioth's /srv/git/code.x2go.org/maintenancescripts.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/maintenancescripts.git


More information about the x2go-commits mailing list