From d4570cc3404046c9c50880aea6160f9a0ff3e375 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Thu, 25 Aug 2011 15:35:29 +0200 Subject: [PATCH] git >= 1.6.6 is required since 49f5361 --- doc/1-INSTALL.mkd | 4 ++-- src/gl-compile-conf | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/1-INSTALL.mkd b/doc/1-INSTALL.mkd index d81758d..2b724ca 100644 --- a/doc/1-INSTALL.mkd +++ b/doc/1-INSTALL.mkd @@ -298,7 +298,7 @@ we mean `conf/gitolite.conf` on your gitolite-admin clone. #### client/workstation - * git version 1.6.2 or greater + * git version 1.6.6 or greater * even msysgit on Windows is fine; please don't ask me for help if you're using putty, plink, puttygen, etc., for ssh; I recommend msysgit for Windows and the openssh that comes with it @@ -313,7 +313,7 @@ we mean `conf/gitolite.conf` on your gitolite-admin clone. * any Unix system with a posix compatible "sh". * people using "csh" or derivatives please don't ask me for help -- tell your admin csh is not posix compatible - * git version 1.6.2 or greater + * git version 1.6.6 or greater * can be in a non-PATH location if you are unable to install it normally; see the `$GIT_PATH` variable in the "rc" file * perl (but since git requires it anyway, you probably have it) diff --git a/src/gl-compile-conf b/src/gl-compile-conf index 56d023c..164bf39 100755 --- a/src/gl-compile-conf +++ b/src/gl-compile-conf @@ -377,7 +377,7 @@ for my $fragment_file (glob("conf/fragments/*.conf")) # what's the git version? # ---------------------------------------------------------------------------- -# we don't like stuff older than 1.6.2 +# we don't like stuff older than 1.6.6 my $git_version = `git --version`; die " @@ -391,10 +391,10 @@ die "$ABRT I can't understand $git_version\n" unless ($gv_maj >= 1); $git_version = $gv_maj*10000 + $gv_min*100 + $gv_patchrel; # now it's "normalised" die "\n\t\t***** AAARGH! *****\n" . - "\tyour git version is older than 1.6.2\n" . + "\tyour git version is older than 1.6.6\n" . "\tsince that is now more than one year old, and gitolite needs some of\n" . "\tthe newer features, please upgrade.\n" - if $git_version < 10602; # that's 1.6.2 to you + if $git_version < 10606; # that's 1.6.6 to you # ---------------------------------------------------------------------------- # most of the rest of this program can be "switched off"; see