diff options
| author |  Simon Hausmann <shausman@trolltech.com> | 2007-05-25 10:28:46 +0200 |
|---|---|---|
| committer | Simon Hausmann <shausman@trolltech.com> | 2007-05-25 10:28:46 +0200 |
| commit | 417a7a6fc8c3d77e3e9a3bb0e11cb2eea978e20b (patch) | |
| tree | 022709f7498f5f1fbc4163881c1a44ac682d9ada /contrib/fast-import | |
| parent | Make git-p4 work with packed refs (don't use os.path.exists to check for the (diff) | |
| download | tgif-417a7a6fc8c3d77e3e9a3bb0e11cb2eea978e20b.tar.xz | |
Make --with-origin also work without origin :)
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
Diffstat (limited to 'contrib/fast-import')
| -rwxr-xr-x | contrib/fast-import/git-p4 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4 index e8a5c1fa31..30ee68c609 100755 --- a/contrib/fast-import/git-p4 +++ b/contrib/fast-import/git-p4 @@ -846,8 +846,9 @@ class P4Sync(Command): self.refPrefix = "refs/heads/" if self.syncWithOrigin: - print "Syncing with origin first as requested by calling git fetch origin" - system("git fetch origin") + if gitBranchExists("origin"): + print "Syncing with origin first as requested by calling git fetch origin" + system("git fetch origin") createP4HeadRef = False; |