Merge branch 'nd/large-blobs'
authorJunio C Hamano <gitster@pobox.com>
Thu, 11 Sep 2014 17:33:32 +0000 (10:33 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 11 Sep 2014 17:33:33 +0000 (10:33 -0700)
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()

1  2 
diff.c
git-compat-util.h
sha1_file.c
wrapper.c
diff --cc diff.c
Simple merge
Simple merge
diff --cc sha1_file.c
Simple merge
diff --cc wrapper.c
Simple merge