summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Frysinger <vapier@google.com>2024-03-21 13:06:11 -0400
committerLUCI <gerrit-scoped@luci-project-accounts.iam.gserviceaccount.com>2024-05-01 15:23:50 +0000
commit12f6dc49e9827e51f0deff5730e734ead52acf71 (patch)
tree8c5a2c83bc27d410409471063a7a81be24196d4d
parent5591d99ee239be9116f4879bfea4a538b0b89e9c (diff)
downloadgit-repo-main.tar.gz
git: raise hard version to 1.9.1main
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 <sokcevic@google.com> Tested-by: Mike Frysinger <vapier@google.com> Commit-Queue: Mike Frysinger <vapier@google.com>
-rw-r--r--project.py10
-rw-r--r--requirements.json4
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:
1145 # This stops git from pushing all reachable annotated tags when 1145 # This stops git from pushing all reachable annotated tags when
1146 # push.followTags is configured. Gerrit does not accept any tags 1146 # push.followTags is configured. Gerrit does not accept any tags
1147 # pushed to a CL. 1147 # pushed to a CL.
1148 if git_require((1, 8, 3)): 1148 cmd.append("--no-follow-tags")
1149 cmd.append("--no-follow-tags")
1150 1149
1151 for push_option in push_options or []: 1150 for push_option in push_options or []:
1152 cmd.append("-o") 1151 cmd.append("-o")
@@ -2565,12 +2564,7 @@ class Project:
2565 branch = None 2564 branch = None
2566 else: 2565 else:
2567 branch = self.revisionExpr 2566 branch = self.revisionExpr
2568 if ( 2567 if not self.manifest.IsMirror and is_sha1 and depth:
2569 not self.manifest.IsMirror
2570 and is_sha1
2571 and depth
2572 and git_require((1, 8, 3))
2573 ):
2574 # Shallow checkout of a specific commit, fetch from that commit and 2568 # Shallow checkout of a specific commit, fetch from that commit and
2575 # not the heads only as the commit might be deeper in the history. 2569 # not the heads only as the commit might be deeper in the history.
2576 spec.append(branch) 2570 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 @@
46 46
47 # Supported git versions. 47 # Supported git versions.
48 # 48 #
49 # git-1.7.9 is in Ubuntu Precise.
50 # git-1.7.10 is in Debian Wheezy.
51 # git-1.9.1 is in Ubuntu Trusty. 49 # git-1.9.1 is in Ubuntu Trusty.
52 # git-2.1.4 is in Debian Jessie. 50 # git-2.1.4 is in Debian Jessie.
53 # git-2.7.4 is in Ubuntu Xenial. 51 # git-2.7.4 is in Ubuntu Xenial.
@@ -55,7 +53,7 @@
55 # git-2.17.0 is in Ubuntu Bionic. 53 # git-2.17.0 is in Ubuntu Bionic.
56 # git-2.20.1 is in Debian Buster. 54 # git-2.20.1 is in Debian Buster.
57 "git": { 55 "git": {
58 "hard": [1, 7, 9], 56 "hard": [1, 9, 1],
59 "soft": [2, 7, 4] 57 "soft": [2, 7, 4]
60 } 58 }
61} 59}