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

diff --git a/git-compat-util.h b/git-compat-util.h
index f8d46d587bec2b4dbab0263fa3df97e60beb08e4..8781e8e22d575c155967c8766f5d74835c0b1f78 100644 (file)
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -202,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)