diff options
author | 2024-01-20 10:16:33 -0800 | |
---|---|---|
committer | 2024-01-20 10:16:45 -0800 | |
commit | f0160195965fc33f4a7ef5c649ef0dc882c84c9a (patch) | |
tree | ed61dadf7c10f45f8ea47c2fd1fcf07f3d6a155b | |
parent | Merge remote-tracking branch 'upstream/master' (diff) | |
parent | v3.6.13 (diff) | |
download | gitolite-gentoo-f0160195965fc33f4a7ef5c649ef0dc882c84c9a.tar.gz gitolite-gentoo-f0160195965fc33f4a7ef5c649ef0dc882c84c9a.tar.bz2 gitolite-gentoo-f0160195965fc33f4a7ef5c649ef0dc882c84c9a.zip |
Merge tag 'v3.6.13'
v3.6.13
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-rw-r--r-- | CHANGELOG | 8 | ||||
-rw-r--r-- | CONTRIBUTING | 2 | ||||
-rwxr-xr-x | contrib/commands/ukm | 4 | ||||
-rwxr-xr-x | contrib/hooks/repo-specific/save-push-signatures | 6 | ||||
-rw-r--r-- | contrib/lib/Gitolite/Triggers/RedmineUserAlias.pm | 2 | ||||
-rwxr-xr-x | contrib/triggers/IP-check | 4 | ||||
-rwxr-xr-x | contrib/utils/ad_groups.sh | 2 | ||||
-rwxr-xr-x | contrib/utils/ldap_groups.sh | 2 | ||||
-rwxr-xr-x | src/commands/option | 2 | ||||
-rwxr-xr-x | src/commands/sskm | 2 | ||||
-rw-r--r-- | src/lib/Gitolite/Conf/Load.pm | 2 | ||||
-rw-r--r-- | src/lib/Gitolite/Conf/Store.pm | 1 | ||||
-rw-r--r-- | src/lib/Gitolite/Rc.pm | 2 | ||||
-rw-r--r-- | t/README | 2 |
14 files changed, 24 insertions, 17 deletions
@@ -1,4 +1,10 @@ -2020-08-04 v3.6.12 mirroring terminoligy changes +2023-07-14 v3.6.13 only one important fix: + + remove the "description" file on new repos, to fix a bug + created by an optimisation made 6 years ago in 3.6.8 (and + was caught only in 2022 or so!) + +2020-08-04 v3.6.12 mirroring terminology changes install script can now modify #! lines when using a custom perl executable diff --git a/CONTRIBUTING b/CONTRIBUTING index 11009ba..57ff86b 100644 --- a/CONTRIBUTING +++ b/CONTRIBUTING @@ -1,4 +1,4 @@ -Go to http://gitolite.com/gitolite/index.html#contact for information on +Go to http://gitolite.com/gitolite/index.html#contactsupport for information on contacting me, the mailing list, and IRC channel. *Unless you are reporting what you think is a security issue, I prefer you send to the mailing list, not to me directly.* diff --git a/contrib/commands/ukm b/contrib/commands/ukm index 4bb4f3e..8482538 100755 --- a/contrib/commands/ukm +++ b/contrib/commands/ukm @@ -10,8 +10,8 @@ use Gitolite::Easy; =for usage Usage for this command is not that simple. Please read the full documentation in -https://github.com/sitaramc/gitolite-doc/blob/master/contrib/ukm.mkd -or online at http://gitolite.com/gitolite/ukm.html. +https://github.com/sitaramc/gitolite-doc/blob/master/docs/contrib/ukm.mkd +or online at http://gitolite.com/gitolite/contrib/ukm.html. =cut usage() if @ARGV and $ARGV[0] eq '-h'; diff --git a/contrib/hooks/repo-specific/save-push-signatures b/contrib/hooks/repo-specific/save-push-signatures index b541a68..664f5aa 100755 --- a/contrib/hooks/repo-specific/save-push-signatures +++ b/contrib/hooks/repo-specific/save-push-signatures @@ -25,10 +25,10 @@ # Relevant gitolite doc links: # repo-specific environment variables -# http://gitolite.com/gitolite/dev-notes.html#rsev +# http://gitolite.com/gitolite/dev-notes.html#appendix-1-repo-specific-environment-variables # repo-specific hooks -# http://gitolite.com/gitolite/non-core.html#rsh -# http://gitolite.com/gitolite/cookbook.html#v3.6-variation-repo-specific-hooks +# http://gitolite.com/gitolite/non-core.html#repo-specific-hooks +# http://gitolite.com/gitolite/cookbook.html#v36-variation-repo-specific-hooks # Environment: # GIT_PUSH_CERT_NONCE_STATUS should be "OK" (as mentioned above) diff --git a/contrib/lib/Gitolite/Triggers/RedmineUserAlias.pm b/contrib/lib/Gitolite/Triggers/RedmineUserAlias.pm index 8fde513..ae5ce93 100644 --- a/contrib/lib/Gitolite/Triggers/RedmineUserAlias.pm +++ b/contrib/lib/Gitolite/Triggers/RedmineUserAlias.pm @@ -27,7 +27,7 @@ How: * add this code as lib/Gitolite/Triggers/RedmineUserAlias.pm to your site-local code directory; see this link for how: - http://gitolite.com/gitolite/non-core.html#ncloc + http://gitolite.com/gitolite/non-core.html#locations * add the following to the rc file, just before the ENABLE section (don't forget the trailing comma): diff --git a/contrib/triggers/IP-check b/contrib/triggers/IP-check index 9a4fda1..a1a7985 100755 --- a/contrib/triggers/IP-check +++ b/contrib/triggers/IP-check @@ -8,12 +8,12 @@ # Notice how repo-specific information is being passed to this code (bullet 3 # below). For more on that, see: -# https://gitolite.com/gitolite/dev-notes/#appendix-1-repo-specific-environment-variables +# https://gitolite.com/gitolite/dev-notes#appendix-1-repo-specific-environment-variables # Instructions: # 1. put this in an appropriate triggers directory (read about non-core -# code at http://gitolite.com/gitolite/non-core/ for more on this; the +# code at http://gitolite.com/gitolite/non-core for more on this; the # cookbook may also help here). # 2. add a line: diff --git a/contrib/utils/ad_groups.sh b/contrib/utils/ad_groups.sh index cc86692..1ebf058 100755 --- a/contrib/utils/ad_groups.sh +++ b/contrib/utils/ad_groups.sh @@ -6,7 +6,7 @@ # Given a username, # Provides a space-separated list of groups that the user is a member of. # -# see http://gitolite.com/gitolite/conf.html#ldap +# see http://gitolite.com/gitolite/conf.html#getting-user-group-info-from-ldap # GROUPLIST_PGM => /path/to/ldap_groups.sh # Be sure to add your domain CA to the trusted certificates in /etc/openldap/ldap.conf using the TLS_CACERT option or you'll get certificate validation errors diff --git a/contrib/utils/ldap_groups.sh b/contrib/utils/ldap_groups.sh index 01bf5ee..beec511 100755 --- a/contrib/utils/ldap_groups.sh +++ b/contrib/utils/ldap_groups.sh @@ -5,7 +5,7 @@ # Given a username, # Provides a space-separated list of groups that the user is a member of. # -# see http://gitolite.com/gitolite/conf.html#ldap +# see http://gitolite.com/gitolite/conf.html#getting-user-group-info-from-ldap # GROUPLIST_PGM => /path/to/ldap_groups.sh ldap_groups() { diff --git a/src/commands/option b/src/commands/option index de49aab..208627e 100755 --- a/src/commands/option +++ b/src/commands/option @@ -31,7 +31,7 @@ # gitolite "options" # http://gitolite.com/gitolite/options.html # the "include" statement -# http://gitolite.com/gitolite/conf.html#include +# http://gitolite.com/gitolite/conf.html#include-files # setup: # 1. Enable the command by adding it to the ENABLE list in the rc file. diff --git a/src/commands/sskm b/src/commands/sskm index eb51f69..435e15a 100755 --- a/src/commands/sskm +++ b/src/commands/sskm @@ -8,7 +8,7 @@ use Gitolite::Common; =for usage Usage for this command is not that simple. Please read the full documentation -in doc/sskm.mkd or online at http://gitolite.com/gitolite/sskm.html. +in doc/sskm.mkd or online at http://gitolite.com/gitolite/contrib/sskm.html. =cut usage() if @ARGV and $ARGV[0] eq '-h'; diff --git a/src/lib/Gitolite/Conf/Load.pm b/src/lib/Gitolite/Conf/Load.pm index 57d1396..cc54d7a 100644 --- a/src/lib/Gitolite/Conf/Load.pm +++ b/src/lib/Gitolite/Conf/Load.pm @@ -702,7 +702,7 @@ Usage: gitolite list-members <group name> in your rc file[1], gitolite cannot expand group names completely; only your external database can. -[1]: http://gitolite.com/gitolite/conf.html#ldap +[1]: http://gitolite.com/gitolite/conf.html#getting-user-group-info-from-ldap =cut diff --git a/src/lib/Gitolite/Conf/Store.pm b/src/lib/Gitolite/Conf/Store.pm index 8757c89..a5867a2 100644 --- a/src/lib/Gitolite/Conf/Store.pm +++ b/src/lib/Gitolite/Conf/Store.pm @@ -209,6 +209,7 @@ sub new_repo { _mkdir("$repo.git"); _chdir("$repo.git"); _system("git init --bare >&2"); + unlink "description"; _chdir( $rc{GL_REPO_BASE} ); hook_1($repo); } diff --git a/src/lib/Gitolite/Rc.pm b/src/lib/Gitolite/Rc.pm index 5a0e83d..87387d3 100644 --- a/src/lib/Gitolite/Rc.pm +++ b/src/lib/Gitolite/Rc.pm @@ -578,7 +578,7 @@ __DATA__ # or you can use this, which lets you put everything in a subdirectory # called "local" in your gitolite-admin repo. For a SECURITY WARNING - # on this, see http://gitolite.com/gitolite/non-core.html#pushcode + # on this, see http://gitolite.com/gitolite/non-core.html#using-the-gitolite-admin-repo-to-manage-non-core-code # LOCAL_CODE => "$rc{GL_ADMIN_BASE}/local", # ------------------------------------------------------------------ @@ -29,7 +29,7 @@ On such a userid, clone gitolite then run this command in the clone: GITOLITE_TEST=y prove http://gitolite.com/gitolite/testing.html has more details. Alternatively, -http://gitolite.com/gitolite/req.html#trying will help you try out gitolite if +https://gitolite.com/gitolite/install.html#trying-out-gitolite-safely will help you try out gitolite if you want to play with gitolite safely. # RUNNING THE HTTP AND MIRROR TESTS |