Merge branch 'maint'

* maint:
t3101: modernise style
compat/nedmalloc: don't force NDEBUG on the rest of git

Conflicts:
Makefile

diff --cc Makefile
index c27e8bcc37575e5748649c15d121ec9d5401d884,38d3bf28595ff297d88260ebb535c35a21d0e22b..b7a62cfdf2ca4f05e47d69332976adabb73583e9
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1904,10 -1879,11 +1904,15 @@@ ifdef NO_EXPA
  http-walker.s http-walker.o: EXTRA_CPPFLAGS = -DNO_EXPAT
  endif
  
 +ifdef NO_REGEX
 +compat/regex/regex.o: EXTRA_CPPFLAGS = -DGAWK -DNO_MBSUPPORT
 +endif
 +
+ ifdef USE_NED_ALLOCATOR
+ compat/nedmalloc/nedmalloc.o: EXTRA_CPPFLAGS = \
+       -DNDEBUG -DOVERRIDE_STRDUP -DREPLACE_SYSTEM_ALLOCATOR
+ endif
+ 
  git-%$X: %.o $(GITLIBS)
        $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS)