diff options
Diffstat (limited to 'subcmds/sync.py')
| -rw-r--r-- | subcmds/sync.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/subcmds/sync.py b/subcmds/sync.py index 24cd74d2b..117f158d6 100644 --- a/subcmds/sync.py +++ b/subcmds/sync.py | |||
| @@ -62,8 +62,7 @@ import event_log | |||
| 62 | import git_command | 62 | import git_command |
| 63 | from git_config import GetUrlCookieFile | 63 | from git_config import GetUrlCookieFile |
| 64 | from git_config import RepoConfig | 64 | from git_config import RepoConfig |
| 65 | from git_refs import HEAD | 65 | import git_refs |
| 66 | from git_refs import R_HEADS | ||
| 67 | import git_superproject | 66 | import git_superproject |
| 68 | from hooks import RepoHook | 67 | from hooks import RepoHook |
| 69 | from manifest_xml import XmlManifest | 68 | from manifest_xml import XmlManifest |
| @@ -866,8 +865,8 @@ later is required to fix a server side protocol bug. | |||
| 866 | """ | 865 | """ |
| 867 | b = manifest_project.GetBranch(manifest_project.CurrentBranch) | 866 | b = manifest_project.GetBranch(manifest_project.CurrentBranch) |
| 868 | branch = b.merge | 867 | branch = b.merge |
| 869 | if branch.startswith(R_HEADS): | 868 | if branch.startswith(git_refs.R_HEADS): |
| 870 | branch = branch[len(R_HEADS) :] | 869 | branch = branch[len(git_refs.R_HEADS) :] |
| 871 | return branch | 870 | return branch |
| 872 | 871 | ||
| 873 | @classmethod | 872 | @classmethod |
| @@ -3501,7 +3500,10 @@ def _PostRepoFetch(rp, repo_verify=True, verbose=False): | |||
| 3501 | logger.warning("warning: Skipped upgrade to unverified version") | 3500 | logger.warning("warning: Skipped upgrade to unverified version") |
| 3502 | else: | 3501 | else: |
| 3503 | if verbose: | 3502 | if verbose: |
| 3504 | print("repo version %s is current" % rp.work_git.describe(HEAD)) | 3503 | print( |
| 3504 | "repo version %s is current" | ||
| 3505 | % rp.work_git.describe(git_refs.HEAD) | ||
| 3506 | ) | ||
| 3505 | 3507 | ||
| 3506 | 3508 | ||
| 3507 | class _FetchTimes: | 3509 | class _FetchTimes: |
