From d8cc6b53b353b418252f56e13253328cf28ec92e Mon Sep 17 00:00:00 2001 From: "Kyle J. McKay" Date: Thu, 22 Feb 2018 12:58:52 -0800 Subject: [PATCH] projects: set receive.fsckObjects too Girocco already sets transfer.fsckObjects which will activate both fetch.fsckObjects and receive.fsckObjects. But only with Git version 1.7.8 or later. Prior to that there was only receive.fsckObjects. Girocco does not require Git 1.7.8; therefore also set receive.fsckObjects everwhere we would set transfer.fsckObjects so that any installations forced to use an older version of Git for some unknown reason can at least still benefit from the receive check. Signed-off-by: Kyle J. McKay --- Girocco/Project.pm | 2 ++ toolbox/update-all-config.pl | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Girocco/Project.pm b/Girocco/Project.pm index e1f4185..157b889 100644 --- a/Girocco/Project.pm +++ b/Girocco/Project.pm @@ -912,6 +912,8 @@ sub _setup { or die "enabling transfer.fsckObjects failed: $?"; system($Girocco::Config::git_bin, '--git-dir='.$self->{path}, 'config', 'transfer.unpackLimit', '1') == 0 or die "setting transfer.unpackLimit failed: $?"; + system($Girocco::Config::git_bin, '--git-dir='.$self->{path}, 'config', 'receive.fsckObjects', 'true') == 0 + or die "enabling receive.fsckObjects failed: $?"; system($Girocco::Config::git_bin, '--git-dir='.$self->{path}, 'config', 'receive.denyNonFastForwards', 'false') == 0 or die "disabling receive.denyNonFastForwards failed: $?"; system($Girocco::Config::git_bin, '--git-dir='.$self->{path}, 'config', 'receive.denyDeleteCurrent', 'warn') == 0 diff --git a/toolbox/update-all-config.pl b/toolbox/update-all-config.pl index b9df9cd..1f495f2 100755 --- a/toolbox/update-all-config.pl +++ b/toolbox/update-all-config.pl @@ -167,7 +167,7 @@ BEGIN { @boolvars = qw(gitweb.statusupdates); @falsevars = qw(core.ignorecase receive.denynonfastforwards); @false0vars = qw(receive.autogc); - @truevars = qw(receive.updateserverinfo repack.writebitmaps transfer.fsckobjects); + @truevars = qw(receive.fsckobjects receive.updateserverinfo repack.writebitmaps transfer.fsckobjects); } my $hdr; -- 2.11.4.GIT