summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Pursehouse <david.pursehouse@sonymobile.com>2012-09-07 09:52:04 +0900
committerGustaf Lundh <gustaf.lundh@sonymobile.com>2012-09-07 10:17:00 +0200
commitd94aaef39e301cc912968c07d1783232bf34a174 (patch)
tree48b884fef63992e8b80127c40687a7cf5ff4c8f7
parentbd489c4eaa592af98b8b4f09b0a465e0d2b6046a (diff)
downloadgit-repo-d94aaef39e301cc912968c07d1783232bf34a174.tar.gz
sync: Correct imports of `R_HEADS` and `HEAD`
`R_HEADS` is imported twice, from both the git_refs and project modules. It is actually defined in git_refs, and in project it is imported from there, so the import of `R_HEADS` from project in the sync module is redundant. Remove it. `HEAD` is imported from project, but like `R_HEADS` it is actually defined in git_refs. Import it from git_refs instead. Change-Id: I8e2b0217d0d9f9f4ee5ef5b8cd0b026174ac52f4
-rw-r--r--subcmds/sync.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/subcmds/sync.py b/subcmds/sync.py
index b2658d87..cbf0decc 100644
--- a/subcmds/sync.py
+++ b/subcmds/sync.py
@@ -37,13 +37,11 @@ except ImportError:
37 return (256, 256) 37 return (256, 256)
38 38
39from git_command import GIT 39from git_command import GIT
40from git_refs import R_HEADS 40from git_refs import R_HEADS, HEAD
41from project import HEAD
42from project import Project 41from project import Project
43from project import RemoteSpec 42from project import RemoteSpec
44from command import Command, MirrorSafeCommand 43from command import Command, MirrorSafeCommand
45from error import RepoChangedException, GitError 44from error import RepoChangedException, GitError
46from project import R_HEADS
47from project import SyncBuffer 45from project import SyncBuffer
48from progress import Progress 46from progress import Progress
49 47