diff options
author | Pete Wyckoff <pw@padd.com> | 2013-01-15 04:46:56 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-01-15 21:46:29 +0400 |
commit | 991a2de45af713ad6476c3d03aefb30ba5599bfe (patch) | |
tree | cd43a17abf87db7707d6a4fb1077255ea899c11e | |
parent | 46738bd7e9209e9a636dfddb46e32fd606386d81 (diff) |
git p4: rearrange and simplify hasOrigin handling
Signed-off-by: Pete Wyckoff <pw@padd.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-x | git-p4.py | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -2748,23 +2748,23 @@ class P4Sync(Command, P4UserMap): self.changeRange = "" self.initialParent = "" self.previousDepotPaths = [] + self.hasOrigin = False # map from branch depot path to parent branch self.knownBranches = {} self.initialParents = {} - self.hasOrigin = originP4BranchesExist() - if not self.syncWithOrigin: - self.hasOrigin = False if self.importIntoRemotes: self.refPrefix = "refs/remotes/p4/" else: self.refPrefix = "refs/heads/p4/" - if self.syncWithOrigin and self.hasOrigin: - if not self.silent: - print "Syncing with origin first by calling git fetch origin" - system("git fetch origin") + if self.syncWithOrigin: + self.hasOrigin = originP4BranchesExist() + if self.hasOrigin: + if not self.silent: + print 'Syncing with origin first, using "git fetch origin"' + system("git fetch origin") if len(self.branch) == 0: self.branch = self.refPrefix + "master" |