summaryrefslogtreecommitdiff
path: root/git-compat-util.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-09-11 10:33:32 -0700
committerJunio C Hamano <gitster@pobox.com>2014-09-11 10:33:33 -0700
commitbedd3b4b7b25df0b994abf444ee2136995dfeffa (patch)
tree1f5866f73cce9cf92d602f8d61fb6a52d1c3d3c9 /git-compat-util.h
parent08ad26a63deaa7eaaaa987ed2cc84ac0f83c080b (diff)
parent1aaf69e669b7fd67073d3024b386ac25ac77d0f8 (diff)
downloadgit-bedd3b4b7b25df0b994abf444ee2136995dfeffa.tar.gz
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()
Diffstat (limited to 'git-compat-util.h')
-rw-r--r--git-compat-util.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/git-compat-util.h b/git-compat-util.h
index d675c89603..4e7e3f8726 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -609,6 +609,7 @@ extern try_to_free_t set_try_to_free_routine(try_to_free_t);
extern char *xstrdup(const char *str);
extern void *xmalloc(size_t size);
extern void *xmallocz(size_t size);
+extern void *xmallocz_gently(size_t size);
extern void *xmemdupz(const void *data, size_t len);
extern char *xstrndup(const char *str, size_t len);
extern void *xrealloc(void *ptr, size_t size);