git/pack-bitmap.c, branch v2.4.9

Merge branch 'es/osx-header-pollutes-mask-macro' into maint

2015-07-15T18:41:24Z

* es/osx-header-pollutes-mask-macro: ewah: use less generic macro name ewah/bitmap: silence warning about MASK macro redefinition

Merge branch 'sb/test-bitmap-free-at-end' into maint

2015-06-16T21:33:47Z

An earlier leakfix to bitmap testing code was incomplete. * sb/test-bitmap-free-at-end: test_bitmap_walk: free bitmap with bitmap_free

Merge branch 'rs/plug-leak-in-pack-bitmaps' into maint

2015-06-05T19:00:22Z

The code to read pack-bitmap wanted to allocate a few hundred pointers to a structure, but by mistake allocated and leaked memory enough to hold that many actual structures. Correct the allocation size and also have it on stack, as it is small enough. * rs/plug-leak-in-pack-bitmaps: pack-bitmaps: plug memory leak, fix allocation size for recent_bitmaps

ewah: use less generic macro name

2015-06-03T07:04:01Z

The ewah/ewok.h header pollutes the global namespace with "BITS_IN_WORD", without any specific notion that we are talking about the bits in an eword_t. We can give this the more specific name "BITS_IN_EWORD". Signed-off-by: Jeff King Reviewed-by: Eric Sunshine Signed-off-by: Junio C Hamano

test_bitmap_walk: free bitmap with bitmap_free

2015-05-22T16:03:04Z

Commit f86a374 (pack-bitmap.c: fix a memleak, 2015-03-30) noticed that we leak the "result" bitmap. But we should use "bitmap_free" rather than straight "free", as the former remembers to free the bitmap array pointed to by the struct. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

pack-bitmaps: plug memory leak, fix allocation size for recent_bitmaps

2015-05-19T16:31:09Z

Use an automatic variable for recent_bitmaps, an array of pointers. This way we don't allocate too much and don't have to free the memory at the end. The old code over-allocated because it reserved enough memory to store all of the structs it is only pointing to and never freed it. 160 64-bit pointers take up 1280 bytes, which is not too much to be placed on the stack. MAX_XOR_OFFSET is turned into a preprocessor constant to make it constant enough for use in an non-variable array declaration. Noticed-by: Stefan Beller Suggested-by: Jeff King Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

Merge branch 'sb/test-bitmap-free-at-end' into maint

2015-05-13T21:05:56Z

* sb/test-bitmap-free-at-end: pack-bitmap.c: fix a memleak

pack-bitmap.c: fix a memleak

2015-04-13T04:45:27Z

Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano

Merge branch 'jc/unused-symbols'

2015-02-11T21:44:07Z

Mark file-local symbols as "static", and drop functions that nobody uses. * jc/unused-symbols: shallow.c: make check_shallow_file_for_update() static remote.c: make clear_cas_option() static urlmatch.c: make match_urls() static revision.c: make save_parents() and free_saved_parents() static line-log.c: make line_log_data_init() static pack-bitmap.c: make pack_bitmap_filename() static prompt.c: remove git_getpass() nobody uses http.c: make finish_active_slot() and handle_curl_result() static

Merge branch 'ak/typofixes'

2015-02-11T21:37:39Z

* ak/typofixes: t/lib-terminal.sh: fix typo pack-bitmap: fix typo