From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 11 Sep 2014 17:33:32 +0000 (-0700)
Subject: Merge branch 'nd/large-blobs'
X-Git-Tag: v2.2.0-rc0~136
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bedd3b4b7b25df0b994abf444ee2136995dfeffa;p=thirdparty%2Fgit.git

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()
---

bedd3b4b7b25df0b994abf444ee2136995dfeffa