Merge branch 'js/try-to-free-stackable'

* js/try-to-free-stackable:
  Do not call release_pack_memory in malloc wrappers when GIT_TRACE is used
  Have set_try_to_free_routine return the previous routine

diff --cc builtin/pack-objects.c
Simple merge

diff --cc git-compat-util.h
index c0198dde4c2c6a61718228ca2ade463c22e0bec3,828aadaf3ae0bdd41ed3d2966ab36c5a73ca91ab..81ceb7f906da563df8907d692b2628709ea8f660
--- 1/git-compat-util.h
--- 2/git-compat-util.h
+++ b/git-compat-util.h
@@@ -353,17 -344,10 +353,18 @@@ static inline char *gitstrchrnul(const 
  }
  #endif
  
 +#ifndef HAVE_MEMPCPY
 +#define mempcpy gitmempcpy
 +static inline void *gitmempcpy(void *dest, const void *src, size_t n)
 +{
 +      return (char *)memcpy(dest, src, n) + n;
 +}
 +#endif
 +
  extern void release_pack_memory(size_t, int);
  
- extern void set_try_to_free_routine(void (*routine)(size_t));
+ typedef void (*try_to_free_t)(size_t);
+ extern try_to_free_t set_try_to_free_routine(try_to_free_t);
  
  extern char *xstrdup(const char *str);
  extern void *xmalloc(size_t size);

diff --cc wrapper.c
Simple merge