diff options
author | Dan Willemsen <dwillemsen@google.com> | 2015-09-14 23:40:05 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-09-14 23:40:05 +0000 |
commit | 7b01b2fd01f4e37688242db19c93feb27f9b65c6 (patch) | |
tree | 2f47ef28b89bcf6e6fdc97b35c5cf85e5ce795ce | |
parent | aad84232ca881cfd6510d9dd129e9b6036cee1d2 (diff) | |
parent | fee390eea2ed6afdfbc09639f39aeb3ace83efb4 (diff) | |
download | git-repo-7b01b2fd01f4e37688242db19c93feb27f9b65c6.tar.gz |
Merge "launcher: Update repo after applying clone.bundle"
-rwxr-xr-x | repo | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -20,7 +20,7 @@ REPO_REV = 'stable' | |||
20 | # limitations under the License. | 20 | # limitations under the License. |
21 | 21 | ||
22 | # increment this whenever we make important changes to this script | 22 | # increment this whenever we make important changes to this script |
23 | VERSION = (1, 21) | 23 | VERSION = (1, 22) |
24 | 24 | ||
25 | # increment this if the MAINTAINER_KEYS block is modified | 25 | # increment this if the MAINTAINER_KEYS block is modified |
26 | KEYRING_VERSION = (1, 2) | 26 | KEYRING_VERSION = (1, 2) |
@@ -567,8 +567,7 @@ def _Clone(url, local, quiet): | |||
567 | '+refs/heads/*:refs/remotes/origin/*') | 567 | '+refs/heads/*:refs/remotes/origin/*') |
568 | if _DownloadBundle(url, local, quiet): | 568 | if _DownloadBundle(url, local, quiet): |
569 | _ImportBundle(local) | 569 | _ImportBundle(local) |
570 | else: | 570 | _Fetch(url, local, 'origin', quiet) |
571 | _Fetch(url, local, 'origin', quiet) | ||
572 | 571 | ||
573 | 572 | ||
574 | def _Verify(cwd, branch, quiet): | 573 | def _Verify(cwd, branch, quiet): |