Merge branch 'ls/p4-lfs'

gitster · gitster · commit 7143258d7903 · 2016-12-27T00:11:46.000-08:00
Update GitLFS integration with "git p4".

* ls/p4-lfs:
  git-p4: add diff/merge properties to .gitattributes for GitLFS files
diff --git a/git-p4.py b/git-p4.py
@@ -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)
             ]
         )
diff --git a/t/t9824-git-p4-git-lfs.sh b/t/t9824-git-p4-git-lfs.sh
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -1120,10 +1120,10 @@ def generateGitAttributes(self):`
`1120`	`1120`	`'# Git LFS (see https://git-lfs.github.com/)\n',`
`1121`	`1121`	`'#\n',`
`1122`	`1122`	`] +`
`1123`		`- ['*.' + f.replace(' ', '[[:space:]]') + ' filter=lfs -text\n'`
	`1123`	`+ ['*.' + f.replace(' ', '[[:space:]]') + ' filter=lfs diff=lfs merge=lfs -text\n'`
`1124`	`1124`	`for f in sorted(gitConfigList('git-p4.largeFileExtensions'))`
`1125`	`1125`	`] +`
`1126`		`- ['/' + f.replace(' ', '[[:space:]]') + ' filter=lfs -text\n'`
	`1126`	`+ ['/' + f.replace(' ', '[[:space:]]') + ' filter=lfs diff=lfs merge=lfs -text\n'`
`1127`	`1127`	`for f in sorted(self.largeFiles) if not self.hasLargeFileExtension(f)`
`1128`	`1128`	`]`
`1129`	`1129`	`)`
Original file line number	Diff line number	Diff line change
`@@ -83,9 +83,9 @@ test_expect_success 'Store files in LFS based on size (>24 bytes)' '`
`83`	`83`	`#`
`84`	`84`	`# Git LFS (see https://git-lfs.github.com/)`
`85`	`85`	`#`
`86`		`- /file2.dat filter=lfs -text`
`87`		`- /file4.bin filter=lfs -text`
`88`		`- /path[[:space:]]with[[:space:]]spaces/file3.bin filter=lfs -text`
	`86`	`+ /file2.dat filter=lfs diff=lfs merge=lfs -text`
	`87`	`+ /file4.bin filter=lfs diff=lfs merge=lfs -text`
	`88`	`+ /path[[:space:]]with[[:space:]]spaces/file3.bin filter=lfs diff=lfs merge=lfs -text`
`89`	`89`	`EOF`
`90`	`90`	`test_path_is_file .gitattributes &&`
`91`	`91`	`test_cmp expect .gitattributes`
`@@ -111,7 +111,7 @@ test_expect_success 'Store files in LFS based on size (>25 bytes)' '`
`111`	`111`	`#`
`112`	`112`	`# Git LFS (see https://git-lfs.github.com/)`
`113`	`113`	`#`
`114`		`- /file4.bin filter=lfs -text`
	`114`	`+ /file4.bin filter=lfs diff=lfs merge=lfs -text`
`115`	`115`	`EOF`
`116`	`116`	`test_path_is_file .gitattributes &&`
`117`	`117`	`test_cmp expect .gitattributes`
`@@ -137,7 +137,7 @@ test_expect_success 'Store files in LFS based on extension (dat)' '`
`137`	`137`	`#`
`138`	`138`	`# Git LFS (see https://git-lfs.github.com/)`
`139`	`139`	`#`
`140`		`- *.dat filter=lfs -text`
	`140`	`+ *.dat filter=lfs diff=lfs merge=lfs -text`
`141`	`141`	`EOF`
`142`	`142`	`test_path_is_file .gitattributes &&`
`143`	`143`	`test_cmp expect .gitattributes`
`@@ -165,8 +165,8 @@ test_expect_success 'Store files in LFS based on size (>25 bytes) and extension`
`165`	`165`	`#`
`166`	`166`	`# Git LFS (see https://git-lfs.github.com/)`
`167`	`167`	`#`
`168`		`- *.dat filter=lfs -text`
`169`		`- /file4.bin filter=lfs -text`
	`168`	`+ *.dat filter=lfs diff=lfs merge=lfs -text`
	`169`	`+ /file4.bin filter=lfs diff=lfs merge=lfs -text`
`170`	`170`	`EOF`
`171`	`171`	`test_path_is_file .gitattributes &&`
`172`	`172`	`test_cmp expect .gitattributes`
`@@ -201,8 +201,8 @@ test_expect_success 'Remove file from repo and store files in LFS based on size`
`201`	`201`	`#`
`202`	`202`	`# Git LFS (see https://git-lfs.github.com/)`
`203`	`203`	`#`
`204`		`- /file2.dat filter=lfs -text`
`205`		`- /path[[:space:]]with[[:space:]]spaces/file3.bin filter=lfs -text`
	`204`	`+ /file2.dat filter=lfs diff=lfs merge=lfs -text`
	`205`	`+ /path[[:space:]]with[[:space:]]spaces/file3.bin filter=lfs diff=lfs merge=lfs -text`
`206`	`206`	`EOF`
`207`	`207`	`test_path_is_file .gitattributes &&`
`208`	`208`	`test_cmp expect .gitattributes`
`@@ -239,8 +239,8 @@ test_expect_success 'Add .gitattributes and store files in LFS based on size (>2`
`239`	`239`	`#`
`240`	`240`	`# Git LFS (see https://git-lfs.github.com/)`
`241`	`241`	`#`
`242`		`- /file2.dat filter=lfs -text`
`243`		`- /path[[:space:]]with[[:space:]]spaces/file3.bin filter=lfs -text`
	`242`	`+ /file2.dat filter=lfs diff=lfs merge=lfs -text`
	`243`	`+ /path[[:space:]]with[[:space:]]spaces/file3.bin filter=lfs diff=lfs merge=lfs -text`
`244`	`244`	`EOF`
`245`	`245`	`test_path_is_file .gitattributes &&`
`246`	`246`	`test_cmp expect .gitattributes`
`@@ -280,7 +280,7 @@ test_expect_success 'Add big files to repo and store files in LFS based on compr`
`280`	`280`	`#`
`281`	`281`	`# Git LFS (see https://git-lfs.github.com/)`
`282`	`282`	`#`
`283`		`- /file6.bin filter=lfs -text`
	`283`	`+ /file6.bin filter=lfs diff=lfs merge=lfs -text`
`284`	`284`	`EOF`
`285`	`285`	`test_path_is_file .gitattributes &&`
`286`	`286`	`test_cmp expect .gitattributes`