mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-07 18:56:10 +02:00
Code

Merge branch 'ls/p4-lfs' 

Update GitLFS integration with "git p4".

* ls/p4-lfs:
  git-p4: add diff/merge properties to .gitattributes for GitLFS files
This commit is contained in:
Junio C Hamano 2016-12-27 00:11:46 -08:00
parent eef32a0653 862f9312b3
commit 7143258d79
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
git-p4.py
View File

@ -1120,10 +1120,10 @@ def generateGitAttributes(self):
'# Git LFS (see https://git-lfs.github.com/)\n',
'#\n',
] +
['*.' + f.replace(' ', '[[:space:]]') + ' filter=lfs -text\n'
['*.' + f.replace(' ', '[[:space:]]') + ' filter=lfs diff=lfs merge=lfs -text\n'
for f in sorted(gitConfigList('git-p4.largeFileExtensions'))
] +
['/' + f.replace(' ', '[[:space:]]') + ' filter=lfs -text\n'
['/' + f.replace(' ', '[[:space:]]') + ' filter=lfs diff=lfs merge=lfs -text\n'
for f in sorted(self.largeFiles) if not self.hasLargeFileExtension(f)
]
)

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

@ -83,9 +83,9 @@ test_expect_success 'Store files in LFS based on size (>24 bytes)' '
#
# Git LFS (see https://git-lfs.github.com/)
#
/file2.dat filter=lfs -text
/file4.bin filter=lfs -text
/path[[:space:]]with[[:space:]]spaces/file3.bin filter=lfs -text
/file2.dat filter=lfs diff=lfs merge=lfs -text
/file4.bin filter=lfs diff=lfs merge=lfs -text
/path[[:space:]]with[[:space:]]spaces/file3.bin filter=lfs diff=lfs merge=lfs -text
EOF
test_path_is_file .gitattributes &&
test_cmp expect .gitattributes
@ -111,7 +111,7 @@ test_expect_success 'Store files in LFS based on size (>25 bytes)' '
#
# Git LFS (see https://git-lfs.github.com/)
#
/file4.bin filter=lfs -text
/file4.bin filter=lfs diff=lfs merge=lfs -text
EOF
test_path_is_file .gitattributes &&
test_cmp expect .gitattributes
@ -137,7 +137,7 @@ test_expect_success 'Store files in LFS based on extension (dat)' '
#
# Git LFS (see https://git-lfs.github.com/)
#
*.dat filter=lfs -text
*.dat filter=lfs diff=lfs merge=lfs -text
EOF
test_path_is_file .gitattributes &&
test_cmp expect .gitattributes
@ -165,8 +165,8 @@ test_expect_success 'Store files in LFS based on size (>25 bytes) and extension
#
# Git LFS (see https://git-lfs.github.com/)
#
*.dat filter=lfs -text
/file4.bin filter=lfs -text
*.dat filter=lfs diff=lfs merge=lfs -text
/file4.bin filter=lfs diff=lfs merge=lfs -text
EOF
test_path_is_file .gitattributes &&
test_cmp expect .gitattributes
@ -201,8 +201,8 @@ test_expect_success 'Remove file from repo and store files in LFS based on size
#
# Git LFS (see https://git-lfs.github.com/)
#
/file2.dat filter=lfs -text
/path[[:space:]]with[[:space:]]spaces/file3.bin filter=lfs -text
/file2.dat filter=lfs diff=lfs merge=lfs -text
/path[[:space:]]with[[:space:]]spaces/file3.bin filter=lfs diff=lfs merge=lfs -text
EOF
test_path_is_file .gitattributes &&
test_cmp expect .gitattributes
@ -239,8 +239,8 @@ test_expect_success 'Add .gitattributes and store files in LFS based on size (>2
#
# Git LFS (see https://git-lfs.github.com/)
#
/file2.dat filter=lfs -text
/path[[:space:]]with[[:space:]]spaces/file3.bin filter=lfs -text
/file2.dat filter=lfs diff=lfs merge=lfs -text
/path[[:space:]]with[[:space:]]spaces/file3.bin filter=lfs diff=lfs merge=lfs -text
EOF
test_path_is_file .gitattributes &&
test_cmp expect .gitattributes
@ -280,7 +280,7 @@ test_expect_success 'Add big files to repo and store files in LFS based on compr
#
# Git LFS (see https://git-lfs.github.com/)
#
/file6.bin filter=lfs -text
/file6.bin filter=lfs diff=lfs merge=lfs -text
EOF
test_path_is_file .gitattributes &&
test_cmp expect .gitattributes