From 81e8d0eedf5240c0cd4a414818c410da74ab02d6 Mon Sep 17 00:00:00 2001
From: "Kyle J. McKay" <mackyle@gmail.com>
Date: Fri, 14 Feb 2014 20:46:15 -0800
Subject: [PATCH] Project.pm: make sure we are using $Girocco::Config::git_bin

Replace any bare instances of 'git' with $Girocco::Config::git_bin
to make sure that the selected version of git is always used.
---
 Girocco/Project.pm | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/Girocco/Project.pm b/Girocco/Project.pm
index 1208c59..6d732b8 100644
--- a/Girocco/Project.pm
+++ b/Girocco/Project.pm
@@ -88,11 +88,11 @@ sub _property_fget {
 	$pname = $propmapro{$name} unless $pname;
 	$pname or die "unknown property: $name";
 	if ($pname =~ s/^://) {
-		my $val = `git --git-dir="$self->{path}" config "gitweb.$pname"`;
+		my $val = `"$Girocco::Config::git_bin" --git-dir="$self->{path}" config "gitweb.$pname"`;
 		chomp $val;
 		return $val;
 	} elsif ($pname =~ s/^%//) {
-		my $val = `git --git-dir="$self->{path}" config "$pname"`;
+		my $val = `"$Girocco::Config::git_bin" --git-dir="$self->{path}" config "$pname"`;
 		chomp $val;
 		return $val;
 	}
@@ -111,10 +111,10 @@ sub _property_fput {
 	$pname or die "unknown property: $name";
 	$value ||= '';
 	if ($pname =~ s/^://) {
-		system('git', '--git-dir='.$self->{path}, 'config', "gitweb.$pname", $value);
+		system($Girocco::Config::git_bin, '--git-dir='.$self->{path}, 'config', "gitweb.$pname", $value);
 		return;
 	} elsif ($pname =~ s/^%//) {
-		system('git', '--git-dir='.$self->{path}, 'config', $pname, $value);
+		system($Girocco::Config::git_bin, '--git-dir='.$self->{path}, 'config', $pname, $value);
 		return;
 	}
 
@@ -132,12 +132,12 @@ sub _properties_load {
 	foreach my $prop (keys %propmapro) {
 		$self->{$prop} = $self->_property_fget($prop);
 	}
-	my $val = `git --git-dir="$self->{path}" config --bool "gitweb.statusupdates" 2>/dev/null`;
+	my $val = `"$Girocco::Config::git_bin" --git-dir="$self->{path}" config --bool "gitweb.statusupdates" 2>/dev/null`;
 	chomp $val;
 	$val = ($val eq 'false') ? 0 : 1;
 	$self->{statusupdates} = $val;
 	delete $self->{auth};
-	$val = `git --git-dir="$self->{path}" config "gitweb.delauth"`;
+	$val = `"$Girocco::Config::git_bin" --git-dir="$self->{path}" config "gitweb.delauth"`;
 	chomp $val;
 	if ($val =~ /^# DELAUTH ([0-9a-f]+) (\d+)/) {
 		my $expire = $2;
@@ -152,7 +152,7 @@ sub _properties_save {
 	}
 	$self->{statusupdates} = 1
 		unless defined($self->{statusupdates}) && $self->{statusupdates} =~ /^\d+$/;
-	system('git', '--git-dir='.$self->{path}, 'config', '--bool',
+	system($Girocco::Config::git_bin, '--git-dir='.$self->{path}, 'config', '--bool',
 		"gitweb.statusupdates", $self->{statusupdates});
 }
 
@@ -713,7 +713,7 @@ sub gen_auth {
 	}
 	my $expire = time + 24 * 3600;
 	my $propval = "# DELAUTH $self->{auth} $expire";
-	system('git', '--git-dir='.$self->{path}, 'config', 'gitweb.delauth', $propval);
+	system($Girocco::Config::git_bin, '--git-dir='.$self->{path}, 'config', 'gitweb.delauth', $propval);
 	$self->{auth};
 }
 
@@ -721,7 +721,7 @@ sub del_auth {
 	my $self = shift;
 
 	delete $self->{auth};
-	system('git', '--git-dir='.$self->{path}, 'config', '--unset', 'gitweb.delauth');
+	system($Girocco::Config::git_bin, '--git-dir='.$self->{path}, 'config', '--unset', 'gitweb.delauth');
 }
 
 sub remove_user {
-- 
2.11.4.GIT