| commit | bedd3b4b7b25df0b994abf444ee2136995dfeffa | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 11 Sep 2014 17:33:32 +0000 (11 10:33 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 11 Sep 2014 17:33:33 +0000 (11 10:33 -0700) | ||
| tree | 1f5866f73cce9cf92d602f8d61fb6a52d1c3d3c9 | treesnapshot (tar.gz zip) |
| parent | 08ad26a63deaa7eaaaa987ed2cc84ac0f83c080b | commitdiff |
| parent | 1aaf69e669b7fd67073d3024b386ac25ac77d0f8 | commitdiff |
Merge branch 'nd/large-blobs'
Teach a few codepaths to punt (instead of dying) when large blobs
that would not fit in core are involved in the operation.
* nd/large-blobs:
diff: shortcut for diff'ing two binary SHA-1 objects
diff --stat: mark any file larger than core.bigfilethreshold binary
diff.c: allow to pass more flags to diff_populate_filespec
sha1_file.c: do not die failing to malloc in unpack_compressed_entry
wrapper.c: introduce gentle xmallocz that does not die()
Teach a few codepaths to punt (instead of dying) when large blobs
that would not fit in core are involved in the operation.
* nd/large-blobs:
diff: shortcut for diff'ing two binary SHA-1 objects
diff --stat: mark any file larger than core.bigfilethreshold binary
diff.c: allow to pass more flags to diff_populate_filespec
sha1_file.c: do not die failing to malloc in unpack_compressed_entry
wrapper.c: introduce gentle xmallocz that does not die()
| diff.c | diff1 | diff2 | blobhistory |
| git-compat-util.h | diff1 | diff2 | blobhistory |
| sha1_file.c | diff1 | diff2 | blobhistory |
| wrapper.c | diff1 | diff2 | blobhistory |