diff options
author | Lars Schneider <larsxschneider@gmail.com> | 2016-12-18 20:01:40 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-12-20 10:01:00 -0800 |
commit | 862f9312b3c910e5c8df6f96591fd3565d5a64ee (patch) | |
tree | 1a532f883ba1c3810d7317379779727e95c69b4a /git-p4.py | |
parent | git-p4: fix Git LFS pointer parsing (diff) | |
download | git-862f9312b3c910e5c8df6f96591fd3565d5a64ee.tar.xz git-862f9312b3c910e5c8df6f96591fd3565d5a64ee.zip |
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>
Diffstat (limited to 'git-p4.py')
-rwxr-xr-x | git-p4.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-p4.py b/git-p4.py index e752153f6f1..fd3763b6540 100755 --- a/git-p4.py +++ b/git-p4.py @@ -1098,10 +1098,10 @@ class GitLFS(LargeFileSystem): '# 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) ] ) |