Hi Luke, >Marcus - if you're able to take a look at this and see if it >fixes your problem that would be very useful.
Fix works for me. Thanks a lot for fixing this issue. Best regards, Marcus On 27/08/15 09:18, "Luke Diamand" <[email protected]> wrote: >Marcus Holl discovered that git-p4 fails to import labels sometimes. > >http://permalink.gmane.org/gmane.comp.version-control.git/273034 > >It turns out there are at least two related problems. > >The first is that if git-p4 tries to import a P4 tag which references >a commit that we don't know about at all (e.g. because the P4 >changelist was created before the point at which the repo was >cloned) then when it tries to find the commit, the git rev-list >command fails, and git-p4 terminates. > >This can be fixed by detecting the problem and ignoring that label. > >The second problem is that git-p4 can end up trying to find out >about a commit which is still in the git fast-import stream and not >yet processed. This is fixed by using fast-import "marks" to reference >these commits, which avoids having to query for commits which don't >yet exist. The normal path is used for commits that have not been >imported during this run of the program (and so won't have marks). > >A test case is added to demonstrate the problem. > >Marcus - if you're able to take a look at this and see if it >fixes your problem that would be very useful. > >Thanks, >Luke > >Luke Diamand (3): > git-p4: failing test for ignoring invalid p4 labels > git-p4: do not terminate creating tag for unknown commit > git-p4: fix P4 label import for unprocessed commits > > git-p4.py | 25 +++++++++++++++-------- > t/t9811-git-p4-label-import.sh | 45 >++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 62 insertions(+), 8 deletions(-) > >-- >2.5.0.rc0 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
