undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-p4: fix empty file processing for large file system backend GitLFS

Browse Source 
If git-p4 tried to store an empty file in GitLFS then it crashed while
parsing the pointer file:

  oid = re.search(r'^oid \w+:(\w+)', pointerFile, re.MULTILINE).group(1)
  AttributeError: 'NoneType' object has no attribute 'group'

This happens because GitLFS does not create a pointer file for an empty
file. Teach git-p4 this behavior to fix the problem and add a test case.

Signed-off-by: Lars Schneider <larsxschneider@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Lars Schneider 2016-12-04 17:03:37 +01:00 committed by Junio C Hamano
parent 454cb6bd52
commit d5eb3cf5e7
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
git-p4.py
View File

@ -1005,8 +1005,10 @@ class LargeFileSystem(object):
steps.""" steps."""
if self.exceedsLargeFileThreshold(relPath, contents) or self.hasLargeFileExtension(relPath): if self.exceedsLargeFileThreshold(relPath, contents) or self.hasLargeFileExtension(relPath):
contentTempFile = self.generateTempFile(contents) contentTempFile = self.generateTempFile(contents)
(git_mode, contents, localLargeFile) = self.generatePointer(contentTempFile) (pointer_git_mode, contents, localLargeFile) = self.generatePointer(contentTempFile)
if pointer_git_mode:
git_mode = pointer_git_mode
if localLargeFile:
# Move temp file to final location in large file system # Move temp file to final location in large file system
largeFileDir = os.path.dirname(localLargeFile) largeFileDir = os.path.dirname(localLargeFile)
if not os.path.isdir(largeFileDir): if not os.path.isdir(largeFileDir):
@ -1056,6 +1058,9 @@ class GitLFS(LargeFileSystem):
the actual content. Return also the new location of the actual the actual content. Return also the new location of the actual
content. content.
""" """
if os.path.getsize(contentFile) == 0:
return (None, '', None)
pointerProcess = subprocess.Popen( pointerProcess = subprocess.Popen(
['git', 'lfs', 'pointer', '--file=' + contentFile], ['git', 'lfs', 'pointer', '--file=' + contentFile],
stdout=subprocess.PIPE stdout=subprocess.PIPE

2
t/t9824-git-p4-git-lfs.sh
View File

@ -42,6 +42,8 @@ test_expect_success 'Create repo with binary files' '
( (
cd "$cli" && cd "$cli" &&
>file0.dat &&
p4 add file0.dat &&
echo "content 1 txt 23 bytes" >file1.txt && echo "content 1 txt 23 bytes" >file1.txt &&
p4 add file1.txt && p4 add file1.txt &&
echo "content 2-3 bin 25 bytes" >file2.dat && echo "content 2-3 bin 25 bytes" >file2.dat &&