| commit | da7e86865f7df0093fd66941d4db166db4e2c52f | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 25 Aug 2014 19:34:08 +0000 (25 12:34 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 25 Aug 2014 19:34:09 +0000 (25 12:34 -0700) | ||
| tree | 1572f69d1c71eeeea303015ac049b2eeba77d61b | treesnapshot (tar.gz zip) |
| parent | 8529ef2f4d56cf1e7b913fbc046431dcfdf5afb5 | commitdiff |
| parent | d917aa5500224bc52d386b1e5adfb8eb294106a9 | commitdiff |
Merge branch 'sp/stream-clean-filter' into jch
* sp/stream-clean-filter:
convert: stream from fd to required clean filter instead of mmap
memory_limit_check(): allow a limit that does not fit in "int"
sha1_file.c: introduce GIT_MMAP_LIMIT to limit mmap size
convert: drop arguments other than 'path' from would_convert_to_git()
# Conflicts:
# wrapper.c
* sp/stream-clean-filter:
convert: stream from fd to required clean filter instead of mmap
memory_limit_check(): allow a limit that does not fit in "int"
sha1_file.c: introduce GIT_MMAP_LIMIT to limit mmap size
convert: drop arguments other than 'path' from would_convert_to_git()
# Conflicts:
# wrapper.c
| convert.c | diff1 | diff2 | blobhistory |
| sha1_file.c | diff1 | diff2 | blobhistory |
| wrapper.c | diff1 | diff2 | blobhistory |