commit 862f9312b3c910e5c8df6f96591fd3565d5a64ee
author Lars Schneider <larsxschneider@gmail.com> Sun Dec 18 20:01:40 2016 +0100
committer Junio C Hamano <gitster@pobox.com> Tue Dec 20 10:01:00 2016 -0800
tree 1a532f883ba1c3810d7317379779727e95c69b4a
parent 82f2567e3d01a6eeb4c6a0b9139232034de6e60f

git-p4: add diff/merge properties to .gitattributes for GitLFS files

The `git lfs track` command generates a .gitattributes file with diff
and merge properties [1]. Set the same .gitattributes format for files
tracked with GitLFS in git-p4.

[1] https://github.com/git-lfs/git-lfs/blob/v1.5.3/commands/command_track.go#L121

Signed-off-by: Lars Schneider <larsxschneider@gmail.com>
Reviewed-by: Luke Diamand <luke@diamand.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-p4.py

diff --git a/git-p4.py b/git-p4.py
index e752153..fd3763b 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -1098,10 +1098,10 @@
                 '# 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)
             ]
         )