Skip to content

Commit

Permalink
Merge branch 'ls/p4-lfs'
Browse files Browse the repository at this point in the history
Teach "git p4" to send large blobs outside the repository by
talking to Git LFS.

* ls/p4-lfs:
  git-p4: add Git LFS backend for large file system
  git-p4: add support for large file systems
  git-p4: check free space during streaming
  git-p4: add file streaming progress in verbose mode
  git-p4: return an empty list if a list config has no values
  git-p4: add gitConfigInt reader
  git-p4: add optional type specifier to gitConfig reader
  • Loading branch information
Junio C Hamano committed Oct 15, 2015
2 parents 1018f3e + b47d807 commit 6ff518f
Show file tree
Hide file tree
Showing 4 changed files with 766 additions and 16 deletions.
32 changes: 32 additions & 0 deletions Documentation/git-p4.txt
Original file line number Diff line number Diff line change
Expand Up @@ -517,6 +517,38 @@ git-p4.pathEncoding::
to transcode the paths to UTF-8. As an example, Perforce on Windows
often uses “cp1252” to encode path names.

git-p4.largeFileSystem::
Specify the system that is used for large (binary) files. Please note
that large file systems do not support the 'git p4 submit' command.
Only Git LFS [1] is implemented right now. Download
and install the Git LFS command line extension to use this option
and configure it like this:
+
-------------
git config git-p4.largeFileSystem GitLFS
-------------
+
[1] https://git-lfs.github.com/

git-p4.largeFileExtensions::
All files matching a file extension in the list will be processed
by the large file system. Do not prefix the extensions with '.'.

git-p4.largeFileThreshold::
All files with an uncompressed size exceeding the threshold will be
processed by the large file system. By default the threshold is
defined in bytes. Add the suffix k, m, or g to change the unit.

git-p4.largeFileCompressedThreshold::
All files with a compressed size exceeding the threshold will be
processed by the large file system. This option might slow down
your clone/sync process. By default the threshold is defined in
bytes. Add the suffix k, m, or g to change the unit.

git-p4.largeFilePush::
Boolean variable which defines if large files are automatically
pushed to a server.

Submit variables
~~~~~~~~~~~~~~~~
git-p4.detectRenames::
Expand Down
Loading

0 comments on commit 6ff518f

Please sign in to comment.