diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-09-11 10:33:32 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-09-11 10:33:33 -0700 |
| commit | bedd3b4b7b25df0b994abf444ee2136995dfeffa (patch) | |
| tree | 1f5866f73cce9cf92d602f8d61fb6a52d1c3d3c9 /diffcore.h | |
| parent | 08ad26a63deaa7eaaaa987ed2cc84ac0f83c080b (diff) | |
| parent | 1aaf69e669b7fd67073d3024b386ac25ac77d0f8 (diff) | |
| download | git-bedd3b4b7b25df0b994abf444ee2136995dfeffa.tar.xz | |
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 'diffcore.h')
| -rw-r--r-- | diffcore.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/diffcore.h b/diffcore.h index c876dac71a..33ea2de348 100644 --- a/diffcore.h +++ b/diffcore.h @@ -55,7 +55,9 @@ extern void free_filespec(struct diff_filespec *); extern void fill_filespec(struct diff_filespec *, const unsigned char *, int, unsigned short); -extern int diff_populate_filespec(struct diff_filespec *, int); +#define CHECK_SIZE_ONLY 1 +#define CHECK_BINARY 2 +extern int diff_populate_filespec(struct diff_filespec *, unsigned int); extern void diff_free_filespec_data(struct diff_filespec *); extern void diff_free_filespec_blob(struct diff_filespec *); extern int diff_filespec_is_binary(struct diff_filespec *); |