From 901668ad4b38d2757115063cf656e0910097fdc7 Mon Sep 17 00:00:00 2001
From: Cian Johnston <cian@coder.com>
Date: Tue, 12 Mar 2024 17:28:07 +0000
Subject: [PATCH] feat(dogfood): add git from git-core ppa (#12564)

---
 dogfood/files/etc/apt/preferences.d/ppa       |   5 +++++
 dogfood/files/etc/apt/sources.list.d/ppa.list |   1 +
 dogfood/files/usr/share/keyrings/git-core.gpg | Bin 0 -> 369 bytes
 dogfood/update-keys.sh                        |   4 ++++
 4 files changed, 10 insertions(+)
 create mode 100644 dogfood/files/usr/share/keyrings/git-core.gpg

diff --git a/dogfood/files/etc/apt/preferences.d/ppa b/dogfood/files/etc/apt/preferences.d/ppa
index 1dc9da8f9f..ca3732cd83 100644
--- a/dogfood/files/etc/apt/preferences.d/ppa
+++ b/dogfood/files/etc/apt/preferences.d/ppa
@@ -17,3 +17,8 @@ Pin-Priority: 500
 Package: neovim-runtime
 Pin: origin ppa.launchpad.net
 Pin-Priority: 500
+
+# Git
+Package: git
+Pin: origin ppa.launchpad.net
+Pin-Priority: 500
diff --git a/dogfood/files/etc/apt/sources.list.d/ppa.list b/dogfood/files/etc/apt/sources.list.d/ppa.list
index e817c20915..8370a809b8 100644
--- a/dogfood/files/etc/apt/sources.list.d/ppa.list
+++ b/dogfood/files/etc/apt/sources.list.d/ppa.list
@@ -1,2 +1,3 @@
 deb [signed-by=/usr/share/keyrings/ansible.gpg] https://ppa.launchpadcontent.net/ansible/ansible/ubuntu focal main
 deb [signed-by=/usr/share/keyrings/neovim.gpg] https://ppa.launchpadcontent.net/neovim-ppa/stable/ubuntu focal main
+deb [signed-by=/usr/share/keyrings/git-core.gpg] https://ppa.launchpadcontent.net/git-core/ppa/ubuntu jammy main
diff --git a/dogfood/files/usr/share/keyrings/git-core.gpg b/dogfood/files/usr/share/keyrings/git-core.gpg
new file mode 100644
index 0000000000000000000000000000000000000000..ff0a75599490a9ea862d807b706c3d1c93520552
GIT binary patch
literal 369
zcmV-%0gnF0jRZ+}+8Y4`0KhirUH+PMR`TR(0V6CCu0*nEFH(}j>_VvvzjWN{VlZT{
zXKMuCh&x-U)Ip6A|L_@0XqMrX-@VvSO$)9*QOxNL;!q2IpC#OX+(DMdEbwW&+iSRt
z3q`aPxCF!zg%n>|G4LdVjOgk{A;%*<?<qm@9-$m$D4b<_9Prv@H2@I-00GS?Oks6y
zV`y+;WFSybK_F&tav)V=b#8QZAV+C*AWdOuZggR3Ze?<F!nOnx0RjLZ1p-NU+8Y8J
z0|pBT2nPcK1Qh}Z0|XWV0|5da0Rk6*0162Zp>bV^;ol!5|1$&q5`i){ue@1%)qq;f
zBZik|A4<kzNAL}?ytn$b8c??UyBxwDa1fqR`MujqNc!?<uy4#IJPUBN+M`qQG+J>@
zyXS1|3P7UOBGE|Y-6QZ5Bz)TCr0-#0cdarL1{FB4lpZV8R?sV24G=LV$^Q<%iQZEG
PbJ@LdK3^7`P9nj0p@*8A

literal 0
HcmV?d00001

diff --git a/dogfood/update-keys.sh b/dogfood/update-keys.sh
index 39b65df58d..c2dac58e4b 100755
--- a/dogfood/update-keys.sh
+++ b/dogfood/update-keys.sh
@@ -59,4 +59,8 @@ curl "${curl_flags[@]}" "https://apt.releases.hashicorp.com/gpg" |
 # GitHub CLI signing key
 curl "${curl_flags[@]}" "https://cli.github.com/packages/githubcli-archive-keyring.gpg" |
 	gpg "${gpg_flags[@]}" --output="github-cli.gpg"
+
+# Git-Core signing key
+curl "${curl_flags[@]}" "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0xE1DD270288B4E6030699E45FA1715D88E1DF1F24" |
+	gpg "${gpg_flags[@]}" --output="git-core.gpg"
 popd