diff options
| author |  Simon Hausmann <simon@lst.de> | 2007-05-24 22:28:28 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon@lst.de> | 2007-05-24 22:28:28 +0200 |
| commit | 10f880f8d4e2c6390928a0bcc8b43161b5f845b2 (patch) | |
| tree | d85c4c4151a2fc7e97ca88338e4da6c6f0c7f745 /contrib/fast-import | |
| parent | Added support for --with-origin with multi-branch imports (diff) | |
| download | tgif-10f880f8d4e2c6390928a0bcc8b43161b5f845b2.tar.xz | |
Oops, fix --with-origin to /really/ also call git fetch :)
Signed-off-by: Simon Hausmann <simon@lst.de>
Diffstat (limited to 'contrib/fast-import')
| -rwxr-xr-x | contrib/fast-import/git-p4 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4 index 0597daa849..08af23f9fd 100755 --- a/contrib/fast-import/git-p4 +++ b/contrib/fast-import/git-p4 @@ -841,6 +841,10 @@ class P4Sync(Command): else: self.refPrefix = "refs/heads/" + if self.syncWithOrigin: + print "Syncing with origin first as requested by calling git fetch origin" + system("git fetch origin") + createP4HeadRef = False; if len(self.branch) == 0: |