diff options
-rw-r--r-- | project.py | 10 | ||||
-rw-r--r-- | requirements.json | 4 |
2 files changed, 3 insertions, 11 deletions
@@ -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 | } |