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] } }