From 5435686d5d4c43b708c592fa09ec51bcfe7a07ce Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Mon, 30 Jan 2023 11:10:45 -0800
Subject: [PATCH] Revert "Update git in gitea images"

This reverts commit eb823707ab1ba333eedecd2845b6fdb1fab56bba.

Upstream Debian has updated git to 2.30.2-1+deb11u1 which patches git
for the issues we manually patched to cover. We don't need the manual
patch anymore and can switch to the distro hence this revert.

Reviewers should double check that the image build process installs the
expected 2.30.2-1+deb11u1 version.

Change-Id: I17fd16a88fbcaa9bbd5d32bfc6d4bb8cdd52ce99
---
 docker/gitea/Dockerfile | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/docker/gitea/Dockerfile b/docker/gitea/Dockerfile
index b69a82b091..1454f04170 100644
--- a/docker/gitea/Dockerfile
+++ b/docker/gitea/Dockerfile
@@ -76,19 +76,6 @@ RUN apt-get update && apt-get -y install \
   && apt-get clean \
   && rm -rf /var/lib/apt/lists/*
 
-# Begin temporary git package upgrade
-RUN ARCH=`dpkg --print-architecture` \
-    && cd /tmp \
-    && apt-get update \
-    && apt-get -y install wget \
-    && wget https://static.opendev.org/project/opendev.org/debs/git/git_2.30.2-1opendev1.0_$ARCH.deb \
-    && wget https://static.opendev.org/project/opendev.org/debs/git/git-man_2.30.2-1opendev1.0_all.deb \
-    && apt-get -y install /tmp/git_*.deb /tmp/git-man_*.deb \
-    && rm -f /tmp/*.deb \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
-# End temporary git package upgrade
-
 RUN addgroup --system --gid 1000 git \
   && adduser \
     --system --no-create-home --disabled-login \