Allow the user to control the verbosity of merge-recursive.

diff --git a/git-compat-util.h b/git-compat-util.h
index 55456da37cdd25126b7bccae879ca500176220f9..8781e8e22d575c155967c8766f5d74835c0b1f78 100644 (file)
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -105,9 +105,12 @@ extern int git_munmap(void *start, size_t length);
 #endif /* NO_MMAP */
 
 #define DEFAULT_PACKED_GIT_LIMIT \
-       (sizeof(void*) >= 8 \
-               ?   8 * 1024 * 1024 * 1024 \
-               : 256 * 1024 * 1024)
+       ((1024L * 1024L) * (sizeof(void*) >= 8 ? 8192 : 256))
+
+#ifdef NO_PREAD
+#define pread git_pread
+extern ssize_t git_pread(int fd, void *buf, size_t count, off_t offset);
+#endif
 
 #ifdef NO_SETENV
 #define setenv gitsetenv
@@ -199,6 +202,8 @@ static inline void *xmmap(void *start, size_t length,
 {
        void *ret = mmap(start, length, prot, flags, fd, offset);
        if (ret == MAP_FAILED) {
+               if (!length)
+                       return NULL;
                release_pack_memory(length);
                ret = mmap(start, length, prot, flags, fd, offset);
                if (ret == MAP_FAILED)