Merge branch 'master' into i486

1 files changed, 21 insertions, 0 deletions

diff --git a/extra/libgit2/libgit2-0.27.7-disable-oom-tests-on-32bit.patch b/extra/libgit2/libgit2-0.27.7-disable-oom-tests-on-32bit.patch
new file mode 100644
index 00000000..918e22ec
--- /dev/null
+++ b/extra/libgit2/libgit2-0.27.7-disable-oom-tests-on-32bit.patch
@@ -0,0 +1,21 @@
+diff -rauN libgit2-0.27.7/tests/buf/oom.c libgit2-0.27.7-disable-oom-tests-on-32bit-patch/tests/buf/oom.c
+--- libgit2-0.27.7/tests/buf/oom.c	2018-10-26 15:27:21.000000000 +0200
++++ libgit2-0.27.7-disable-oom-tests-on-32bit-patch/tests/buf/oom.c	2018-11-09 15:17:30.475788525 +0100
+@@ -32,6 +32,7 @@
+  */
+ void test_buf_oom__grow(void)
+ {
++#if defined(GIT_ARCH_64)
+ 	git_buf buf = GIT_BUF_INIT;
+ 
+ 	git_buf_clear(&buf);
+@@ -40,6 +41,9 @@
+ 	cl_assert(git_buf_oom(&buf));
+ 
+ 	git_buf_free(&buf);
++#else
++	cl_skip();
++#endif
+ }
+ 
+ void test_buf_oom__grow_by(void)