deac/gitolite
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #32 from ebfe/bump_requirements

Browse source 
git >= 1.6.6 is required since 49f5361
This commit is contained in:
Sitaram Chamarty 2011-09-02 05:09:06 -07:00
parent 6863dca73a d4570cc340
commit 6a3cd5d6b1
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/1-INSTALL.mkd
View file

@ -298,7 +298,7 @@ we mean `conf/gitolite.conf` on your gitolite-admin clone.
#### client/workstation #### 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 * 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 you're using putty, plink, puttygen, etc., for ssh; I recommend
msysgit for Windows and the openssh that comes with it 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". * any Unix system with a posix compatible "sh".
* people using "csh" or derivatives please don't ask me for help -- tell * people using "csh" or derivatives please don't ask me for help -- tell
your admin csh is not posix compatible 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 * can be in a non-PATH location if you are unable to install it
normally; see the `$GIT_PATH` variable in the "rc" file normally; see the `$GIT_PATH` variable in the "rc" file
* perl (but since git requires it anyway, you probably have it) * perl (but since git requires it anyway, you probably have it)

6
src/gl-compile-conf
View file

@ -383,7 +383,7 @@ parse_conf_file($GL_CONF, 'master');
# what's the git version? # 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`; my $git_version = `git --version`;
die " die "
@ -397,10 +397,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" $git_version = $gv_maj*10000 + $gv_min*100 + $gv_patchrel; # now it's "normalised"
die "\n\t\t***** AAARGH! *****\n" . 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" . "\tsince that is now more than one year old, and gitolite needs some of\n" .
"\tthe newer features, please upgrade.\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 # most of the rest of this program can be "switched off"; see