diff options
| author | Simon Hausmann <simon@lst.de> | 2007-06-11 07:59:27 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon@lst.de> | 2007-06-11 07:59:27 (GMT) |
| commit | a43ff00c7c2981426d06b3621bbf62476aa5ec0d (patch) | |
| tree | 40f53c2928615b8347a14c23dd639f221b4037de /contrib/fast-import | |
| parent | 86fda6a327ce9355ae9eab69fc7a3ec33fb5d7d1 (diff) | |
| download | git-a43ff00c7c2981426d06b3621bbf62476aa5ec0d.zip git-a43ff00c7c2981426d06b3621bbf62476aa5ec0d.tar.gz git-a43ff00c7c2981426d06b3621bbf62476aa5ec0d.tar.bz2 | |
Fix support for explicit disabling of syncing with the origin
Signed-off-by: Simon Hausmann <simon@lst.de>
Diffstat (limited to 'contrib/fast-import')
| -rwxr-xr-x | contrib/fast-import/git-p4 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4 index 815d8bb..ff56181 100755 --- a/contrib/fast-import/git-p4 +++ b/contrib/fast-import/git-p4 @@ -1028,6 +1028,8 @@ class P4Sync(Command): self.knownBranches = {} self.initialParents = {} self.hasOrigin = gitBranchExists("origin") or gitBranchExists("origin/p4") or gitBranchExists("origin/p4/master") + if not self.syncWithOrigin: + self.hasOrigin = False if self.importIntoRemotes: self.refPrefix = "refs/remotes/p4/" |