Merge branch 'rj/maint-difftool-cygwin-workaround'

[thirdparty/git.git] / wrapper.c

diff --git a/wrapper.c b/wrapper.c
index 185dfbcc463fd57fd5051457ef5d90d28b487177..8d7dd31c4ba5439652d11e5ada06e0d52bc04e4f 100644 (file)
--- a/wrapper.c
+++ b/wrapper.c
@@ -3,16 +3,17 @@
  */
 #include "cache.h"
 
-static void try_to_free_builtin(size_t size)
+static void do_nothing(size_t size)
 {
-       release_pack_memory(size, -1);
 }
 
-static void (*try_to_free_routine)(size_t size) = try_to_free_builtin;
+static void (*try_to_free_routine)(size_t size) = do_nothing;
 
 try_to_free_t set_try_to_free_routine(try_to_free_t routine)
 {
        try_to_free_t old = try_to_free_routine;
+       if (!routine)
+               routine = do_nothing;
        try_to_free_routine = routine;
        return old;
 }