From 85dd0adb1fa2ea3e2170e857ccdd2655a47c31d4 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Wed, 29 Apr 2020 20:43:17 +0100
Subject: [PATCH] Use git-core PPA for git

---
 cookbooks/apt/recipes/default.rb    | 5 +++++
 cookbooks/git/attributes/default.rb | 2 ++
 cookbooks/git/metadata.rb           | 1 +
 cookbooks/git/recipes/default.rb    | 2 ++
 4 files changed, 10 insertions(+)

diff --git a/cookbooks/apt/recipes/default.rb b/cookbooks/apt/recipes/default.rb
index fe79213c0..802ab186a 100644
--- a/cookbooks/apt/recipes/default.rb
+++ b/cookbooks/apt/recipes/default.rb
@@ -73,6 +73,11 @@ apt_repository "ubuntugis-unstable" do
   uri "ppa:ubuntugis/ubuntugis-unstable"
 end
 
+apt_repository "git-core" do
+  action repository_actions["git-core"]
+  uri "ppa:git-core/ppa"
+end
+
 apt_repository "maxmind" do
   action repository_actions["maxmind"]
   uri "ppa:maxmind/ppa"
diff --git a/cookbooks/git/attributes/default.rb b/cookbooks/git/attributes/default.rb
index fd641f37a..7a4209f5d 100644
--- a/cookbooks/git/attributes/default.rb
+++ b/cookbooks/git/attributes/default.rb
@@ -5,3 +5,5 @@ default[:git][:public_group] = "git"
 default[:git][:private_user] = "git"
 default[:git][:private_group] = "git"
 default[:git][:private_nodes] = "fqdn:*"
+
+default[:apt][:sources] |= ["git-core"]
diff --git a/cookbooks/git/metadata.rb b/cookbooks/git/metadata.rb
index 19f53944f..b86267bd2 100644
--- a/cookbooks/git/metadata.rb
+++ b/cookbooks/git/metadata.rb
@@ -8,4 +8,5 @@ version           "1.0.0"
 supports          "ubuntu"
 depends           "accounts"
 depends           "apache"
+depends           "apt"
 depends           "networking"
diff --git a/cookbooks/git/recipes/default.rb b/cookbooks/git/recipes/default.rb
index 3f93f651c..49d43ae82 100644
--- a/cookbooks/git/recipes/default.rb
+++ b/cookbooks/git/recipes/default.rb
@@ -17,4 +17,6 @@
 # limitations under the License.
 #
 
+include_recipe "apt"
+
 package "git"
-- 
2.39.5