From 12f6dc49e9827e51f0deff5730e734ead52acf71 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Thu, 21 Mar 2024 13:06:11 -0400 Subject: git: raise hard version to 1.9.1 Debian 7 Wheezy went EOL in May 2018. We don't need to carry support for that anymore as there have been 5 major releases since. Ubuntu Precise went EOL in Apr 2019 (including the extended support phase). That means we can bump the required git version from 1.7.9 to 1.9.1. git-1.7.9 was released in 2012 while git-1.9.1 was released in 2014. So that shouldn't be a problem either. And we've been warning people using git versions older than 1.9.1 for 3 years now that they need to upgrade. Change-Id: Ifbbf72f51010b0a944c2785895d1b605333f9146 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/415637 Reviewed-by: Josip Sokcevic Tested-by: Mike Frysinger Commit-Queue: Mike Frysinger --- project.py | 10 ++-------- requirements.json | 4 +--- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/project.py b/project.py index a8503a3a..07685dae 100644 --- a/project.py +++ b/project.py @@ -1145,8 +1145,7 @@ class Project: # This stops git from pushing all reachable annotated tags when # push.followTags is configured. Gerrit does not accept any tags # pushed to a CL. - if git_require((1, 8, 3)): - cmd.append("--no-follow-tags") + cmd.append("--no-follow-tags") for push_option in push_options or []: cmd.append("-o") @@ -2565,12 +2564,7 @@ class Project: branch = None else: branch = self.revisionExpr - if ( - not self.manifest.IsMirror - and is_sha1 - and depth - and git_require((1, 8, 3)) - ): + if not self.manifest.IsMirror and is_sha1 and depth: # Shallow checkout of a specific commit, fetch from that commit and # not the heads only as the commit might be deeper in the history. spec.append(branch) diff --git a/requirements.json b/requirements.json index dac9a4f2..2976eece 100644 --- a/requirements.json +++ b/requirements.json @@ -46,8 +46,6 @@ # Supported git versions. # - # git-1.7.9 is in Ubuntu Precise. - # git-1.7.10 is in Debian Wheezy. # git-1.9.1 is in Ubuntu Trusty. # git-2.1.4 is in Debian Jessie. # git-2.7.4 is in Ubuntu Xenial. @@ -55,7 +53,7 @@ # git-2.17.0 is in Ubuntu Bionic. # git-2.20.1 is in Debian Buster. "git": { - "hard": [1, 7, 9], + "hard": [1, 9, 1], "soft": [2, 7, 4] } } -- cgit v1.2.3-54-g00ecf