On 23 Sep 2015, at 09:58, Luke Diamand <l...@diamand.org> wrote:
> On 21 September 2015 at 23:41, <larsxschnei...@gmail.com> wrote:
>> From: Lars Schneider <larsxschnei...@gmail.com>
>>
>> diff to v6:
>> * fix spaces in .gitattributes for Git-LFS files (old "[:space:]", new
>> "[[:space:]]")
>> * generated patch on top of next (95c4325) to resolve merge conflicts
>
> Trying this out by hand (rather than using the test cases) it crashes
> for me. Am I doing something wrong?
>
> - I've got the version of git-p4.py from
> ef93b8df71f6d8a7936786c989714868c2d3540c in Junio's ls/p4-lfs branch.
> - I have git-lfs v0.60 (just downloaded the binary distribution).
>
> Then I created a p4 repo, and added two files in Perforce, small.txt
> and bigfile. bigfile is 400k.
>
> Doing a regular git clone works fine:
>
> $ mkdir depot
> $ cd depot
> $ git init .
> $ git p4 sync //depot
> $ git checkout p4/master
>
> (I'm using git init + git sync rather than git clone so that I can
> setup the git config variables I need in the next step).
>
> Doing a clone with LFS support though doesn't work:
>
> $ mkdir depot2
> $ cd depot2
> $ git init
> $ git config git-p4.largeFileSystem GitLFS
> $ git config git-p4.largeFileThreshold 100k
> $ git p4 sync //depot
> Doing initial import of //depot/ from revision #head into
> refs/remotes/p4/master
> Traceback (most recent call last):
> File "/home/ldiamand/git/git/git-p4.py", line 3624, in <module>
> main()
> File "/home/ldiamand/git/git/git-p4.py", line 3618, in main
> if not cmd.run(args):
> File "/home/ldiamand/git/git/git-p4.py", line 3298, in run
> self.importHeadRevision(revision)
> File "/home/ldiamand/git/git/git-p4.py", line 3085, in importHeadRevision
> self.commit(details, self.extractFilesFromCommit(details), self.branch)
> File "/home/ldiamand/git/git/git-p4.py", line 2651, in commit
> self.streamP4Files(new_files)
> File "/home/ldiamand/git/git/git-p4.py", line 2565, in streamP4Files
> cb=streamP4FilesCbSelf)
> File "/home/ldiamand/git/git/git-p4.py", line 501, in p4CmdList
> cb(entry)
> File "/home/ldiamand/git/git/git-p4.py", line 2559, in streamP4FilesCbSelf
> self.streamP4FilesCb(entry)
> File "/home/ldiamand/git/git/git-p4.py", line 2501, in streamP4FilesCb
> self.streamOneP4File(self.stream_file, self.stream_contents)
> File "/home/ldiamand/git/git/git-p4.py", line 2451, in streamOneP4File
> (git_mode, contents) =
> self.largeFileSystem.processContent(self.cloneDestination, git_mode,
> relPath, contents)
> File "/home/ldiamand/git/git/git-p4.py", line 1111, in processContent
> return LargeFileSystem.processContent(self, cloneDestination,
> git_mode, relPath, contents)
> File "/home/ldiamand/git/git/git-p4.py", line 1004, in processContent
> (git_mode, contents, localLargeFile) =
> self.generatePointer(cloneDestination, contentTempFile)
> File "/home/ldiamand/git/git/git-p4.py", line 1068, in generatePointer
> oid,
> File "/usr/lib/python2.7/posixpath.py", line 70, in join
> elif path == '' or path.endswith('/'):
> AttributeError: 'NoneType' object has no attribute 'endswith'
>
Confirmed. This is a bug!
Can you try the following sequence of commands?
$ mkdir depot2
$ cd depot2
$ git init
$ git config git-p4.largeFileSystem GitLFS
$ git config git-p4.largeFileThreshold 100k
$ git p4 clone --destination=. //depot
I’ve always used “clone” and all test cases uses “clone”. I will fix it for
“sync”.
Thanks for reporting,
Lars
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
