Make --with-origin also work without origin :)
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
This commit is contained in:
parent
4280e53333
commit
417a7a6fc8
@ -846,8 +846,9 @@ class P4Sync(Command):
|
|||||||
self.refPrefix = "refs/heads/"
|
self.refPrefix = "refs/heads/"
|
||||||
|
|
||||||
if self.syncWithOrigin:
|
if self.syncWithOrigin:
|
||||||
print "Syncing with origin first as requested by calling git fetch origin"
|
if gitBranchExists("origin"):
|
||||||
system("git fetch origin")
|
print "Syncing with origin first as requested by calling git fetch origin"
|
||||||
|
system("git fetch origin")
|
||||||
|
|
||||||
createP4HeadRef = False;
|
createP4HeadRef = False;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user