]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ls/p4-empty-file-on-lfs' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 17 Jan 2017 22:49:27 +0000 (14:49 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 17 Jan 2017 22:49:27 +0000 (14:49 -0800)
"git p4" LFS support was broken when LFS stores an empty blob.

* ls/p4-empty-file-on-lfs:
  git-p4: fix empty file processing for large file system backend GitLFS


Trivial merge