diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-09-28 15:28:26 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-09-28 15:28:31 -0700 |
| commit | 6343e2f6f271cf344ea8e7384342502faecaf37c (patch) | |
| tree | 50abed20e4b930022a24b64389915f7c774acef9 /xdiff-interface.h | |
| parent | Git 2.4.9 (diff) | |
| parent | Git 2.3.10 (diff) | |
| download | git-6343e2f6f271cf344ea8e7384342502faecaf37c.tar.gz git-6343e2f6f271cf344ea8e7384342502faecaf37c.zip | |
Sync with 2.3.10
Diffstat (limited to 'xdiff-interface.h')
| -rw-r--r-- | xdiff-interface.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/xdiff-interface.h b/xdiff-interface.h index eff7762ee1..fbb5a1c394 100644 --- a/xdiff-interface.h +++ b/xdiff-interface.h @@ -3,6 +3,13 @@ #include "xdiff/xdiff.h" +/* + * xdiff isn't equipped to handle content over a gigabyte; + * we make the cutoff 1GB - 1MB to give some breathing + * room for constant-sized additions (e.g., merge markers) + */ +#define MAX_XDIFF_SIZE (1024UL * 1024 * 1023) + typedef void (*xdiff_emit_consume_fn)(void *, char *, unsigned long); int xdi_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, xdemitconf_t const *xecfg, xdemitcb_t *ecb); |