kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'rb/p4-lfs' 

"git p4" used to ignore lfs.storage configuration variable, which
has been corrected.

* rb/p4-lfs:
  git-p4: honor lfs.storage configuration variable
maint
Junio C Hamano 2019-12-25 11:22:00 -08:00
parent fcd5b55f56 ea94b16fb8
commit 20aa6d88b7
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
git-p4.py
View File

@ -1257,9 +1257,15 @@ class GitLFS(LargeFileSystem):
pointerFile = re.sub(r'Git LFS pointer for.*\n\n', '', pointerFile) pointerFile = re.sub(r'Git LFS pointer for.*\n\n', '', pointerFile)


oid = re.search(r'^oid \w+:(\w+)', pointerFile, re.MULTILINE).group(1) oid = re.search(r'^oid \w+:(\w+)', pointerFile, re.MULTILINE).group(1)
# if someone use external lfs.storage ( not in local repo git )
lfs_path = gitConfig('lfs.storage')
if not lfs_path:
lfs_path = 'lfs'
if not os.path.isabs(lfs_path):
lfs_path = os.path.join(os.getcwd(), '.git', lfs_path)
localLargeFile = os.path.join( localLargeFile = os.path.join(
os.getcwd(), lfs_path,
'.git', 'lfs', 'objects', oid[:2], oid[2:4], 'objects', oid[:2], oid[2:4],
oid, oid,
) )
# LFS Spec states that pointer files should not have the executable bit set. # LFS Spec states that pointer files should not have the executable bit set.