aboutsummaryrefslogtreecommitdiffstats
path: root/deployment/mgagit
diff options
context:
space:
mode:
authorColin Guthrie <colin@mageia.org>2013-08-21 22:02:34 +0000
committerColin Guthrie <colin@mageia.org>2013-08-21 22:02:34 +0000
commitdd5f4738d6c105ce70e4908858ef3f1efcbead82 (patch)
treedaa4d9f6064b335d4ec9056ac058851b187bb4d2 /deployment/mgagit
parentdafd46ec4d97b1028f75be6bf7a46a0b8228a31b (diff)
downloadpuppet-dd5f4738d6c105ce70e4908858ef3f1efcbead82.tar
puppet-dd5f4738d6c105ce70e4908858ef3f1efcbead82.tar.gz
puppet-dd5f4738d6c105ce70e4908858ef3f1efcbead82.tar.bz2
puppet-dd5f4738d6c105ce70e4908858ef3f1efcbead82.tar.xz
puppet-dd5f4738d6c105ce70e4908858ef3f1efcbead82.zip
mgagit: Show diffs in commit messages and include a link to gitweb.
Diffstat (limited to 'deployment/mgagit')
-rw-r--r--deployment/mgagit/templates/gitolite.rc2
-rw-r--r--deployment/mgagit/templates/group_owned_repo.gl1
-rw-r--r--deployment/mgagit/templates/repodef_repo.gl1
3 files changed, 3 insertions, 1 deletions
diff --git a/deployment/mgagit/templates/gitolite.rc b/deployment/mgagit/templates/gitolite.rc
index 171b6662..e498cf6e 100644
--- a/deployment/mgagit/templates/gitolite.rc
+++ b/deployment/mgagit/templates/gitolite.rc
@@ -21,7 +21,7 @@
UMASK => 0022,
# look for "git-config" in the documentation
- GIT_CONFIG_KEYS => 'gitweb\.description gitweb\.owner hooks\.mailinglist hooks\.emailprefix hooks\.envelopesender',
+ GIT_CONFIG_KEYS => 'gitweb\.description gitweb\.owner hooks\.mailinglist hooks\.emailprefix hooks\.envelopesender hooks\.showrev',
# comment out if you don't need all the extra detail in the logfile
LOG_EXTRA => 1,
diff --git a/deployment/mgagit/templates/group_owned_repo.gl b/deployment/mgagit/templates/group_owned_repo.gl
index f7ec2324..b785b55c 100644
--- a/deployment/mgagit/templates/group_owned_repo.gl
+++ b/deployment/mgagit/templates/group_owned_repo.gl
@@ -23,6 +23,7 @@ repo [% repo %]
[% END -%]
config hooks.emailprefix = "[[% repo %]] "
config hooks.envelopesender = "root@mageia.org"
+ config hooks.showrev = "t=%s; echo '-----------------------------------------------------------------------';echo; printf 'http://gitweb.mageia.org/'$GL_REPO'/commit/?id=%%s' $t; echo;echo; git show -C $t; echo"
config gitweb.description = "[% r.repos.$repo.description %]"
[% IF r.users.$maintainer -%]
config gitweb.owner = "[% r.users.$maintainer.cn.0 %] [[% maintainer %]]"
diff --git a/deployment/mgagit/templates/repodef_repo.gl b/deployment/mgagit/templates/repodef_repo.gl
index ebc9d904..ceb523e0 100644
--- a/deployment/mgagit/templates/repodef_repo.gl
+++ b/deployment/mgagit/templates/repodef_repo.gl
@@ -5,4 +5,5 @@ repo [% repo %]
config hooks.mailinglist = "sysadmin-commits@ml.mageia.org"
config hooks.emailprefix = "[[% repo %]] "
config hooks.envelopesender = "root@mageia.org"
+ config hooks.showrev = "t=%s; echo '-----------------------------------------------------------------------';echo; printf 'http://gitweb.mageia.org/'$GL_REPO'/commit/?id=%%s' $t; echo;echo; git show -C $t; echo"
config gitweb.description = "[% r.repos.$repo.description %]"