Revert "Ubuntu & universat: Install git (patched) form opt feeds"

This reverts commit 77df542.

Author: samruddhikhandale

src/base-ubuntu/.devcontainer/devcontainer.json

@@ -10,6 +10,10 @@
             "userUid": "1000",
             "userGid": "1000",
             "upgradePackages": "true"
+        },
+        "ghcr.io/devcontainers/features/git:1": {
+            "version": "latest",
+            "ppa": "false"
         }
     },
     // Use 'forwardPorts' to make a list of ports inside the container available locally.

src/base-ubuntu/test-project/test.sh

@@ -12,6 +12,9 @@ check "zsh theme symlink" test -e $HOME/.oh-my-zsh/custom/themes/codespaces.zsh-
 check "git" git --version
 check "git-location" sh -c "which git | grep /usr/local/bin/git"
 
+git_version=$(git --version)
+check-version-ge "git-requirement" "${git_version}" "git version 2.39.1"
+
 check "set-git-config-user-name" sh -c "sudo git config --system user.name devcontainers"
 check "gitconfig-file-location" sh -c "ls /etc/gitconfig"
 check "gitconfig-contains-name" sh -c "cat /etc/gitconfig | grep 'name = devcontainers'"

src/universal/.devcontainer/Dockerfile

@@ -16,7 +16,6 @@ RUN LANG="C.UTF-8" \
     && apt-get update \
     && apt-get upgrade -y \
     && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
-        git \
         make \
         unzip \
         # The tools in this package are used when installing packages for Python

src/universal/.devcontainer/devcontainer.json

@@ -62,6 +62,10 @@
         "ghcr.io/devcontainers/features/kubectl-helm-minikube:1": {
             "version": "latest"
         },
+        "ghcr.io/devcontainers/features/git:1": {
+            "version": "latest",
+            "ppa": "false"
+        },
         "ghcr.io/devcontainers/features/go:1": {
             "version": "latest"
         },
@@ -71,6 +75,7 @@
     },
     "overrideFeatureInstallOrder": [
         "ghcr.io/devcontainers/features/common-utils",
+        "ghcr.io/devcontainers/features/git",
         "ghcr.io/devcontainers/features/dotnet",
         "ghcr.io/devcontainers/features/hugo",
         "ghcr.io/devcontainers/features/node",

src/universal/test-project/test.sh

@@ -9,6 +9,9 @@ checkCommon
 check "git" git --version
 check "git-location" sh -c "which git | grep /usr/local/bin/git"
 
+git_version=$(git --version)
+check-version-ge "git-requirement" "${git_version}" "git version 2.39.1"
+
 check "set-git-config-user-name" sh -c "sudo git config --system user.name devcontainers"
 check "gitconfig-file-location" sh -c "ls /etc/gitconfig"
 check "gitconfig-contains-name" sh -c "cat /etc/gitconfig | grep 'name = devcontainers'"