author | Simon Hausmann <simon@lst.de> | |
Thu, 15 Nov 2007 09:38:45 +0000 (10:38 +0100) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Fri, 16 Nov 2007 09:32:59 +0000 (01:32 -0800) | ||
commit | 38f9f5ec41803558b4ccefc9db08fac5696aff8d | |
tree | f64723cc7b9d0eb495968542cb6a6bb9f878be37 | tree | snapshot |
parent | 41a7aa588f449d3b139480b102f510abc5ef7f85 | commit | diff |
git-p4: Fix direct import from perforce after fetching changes through git from origin
When using an existing git repository to cache the perforce import we don't
fetch the branch mapping from perforce as that is a slow operation. However
the origin repository may not be fully up-to-date and therefore it may be
necessary to import more changes directly from Perforce.
Such a direct import needs self.knownBranches to be set up though, so
initialize it from the existing p4/* git branches.
Signed-off-by: Simon Hausmann <simon@lst.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
When using an existing git repository to cache the perforce import we don't
fetch the branch mapping from perforce as that is a slow operation. However
the origin repository may not be fully up-to-date and therefore it may be
necessary to import more changes directly from Perforce.
Such a direct import needs self.knownBranches to be set up though, so
initialize it from the existing p4/* git branches.
Signed-off-by: Simon Hausmann <simon@lst.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
contrib/fast-import/git-p4 | diff | blob | history |