Merge branch 'js/try-to-free-stackable' into next
commit4c1afcb0495b609bde36068513219066509d3e8b
authorJunio C Hamano <gitster@pobox.com>
Fri, 21 May 2010 11:04:39 +0000 (21 04:04 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 21 May 2010 11:04:39 +0000 (21 04:04 -0700)
treec5738900b69c64eb339cf20bce9e781005fabc11
parenta3cbd671c169ca5792fbcec7bdd30f1e0adaa37c
parent3a0942598ce33b195bfaaf250b2da23e4eceb3c6
Merge branch 'js/try-to-free-stackable' into next

* 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
builtin/pack-objects.c
git-compat-util.h
wrapper.c