diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-03-17 11:24:14 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-03-17 11:24:14 -0700 |
| commit | c638f3e4d585008f630d7dd8bb902f44217455b3 (patch) | |
| tree | 1772afa44a4b0878c94824762684866b24a12ee1 /pack-bitmap-write.c | |
| parent | 24358560c3c0ab51c9ef8178d99f46711716f6c0 (diff) | |
| parent | 765428699a5381f113d19974720bc91b5bfeaf1d (diff) | |
| download | git-c638f3e4d585008f630d7dd8bb902f44217455b3.tar.xz | |
Merge branch 'maint-2.4' into maint-2.5
* maint-2.4:
Git 2.4.11
list-objects: pass full pathname to callbacks
list-objects: drop name_path entirely
list-objects: convert name_path to a strbuf
show_object_with_name: simplify by using path_name()
http-push: stop using name_path
tree-diff: catch integer overflow in combine_diff_path allocation
add helpers for detecting size_t overflow
Diffstat (limited to 'pack-bitmap-write.c')
| -rw-r--r-- | pack-bitmap-write.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pack-bitmap-write.c b/pack-bitmap-write.c index c05d1386af..b2f6cb537c 100644 --- a/pack-bitmap-write.c +++ b/pack-bitmap-write.c @@ -148,8 +148,7 @@ static uint32_t find_object_pos(const unsigned char *sha1) return entry->in_pack_pos; } -static void show_object(struct object *object, const struct name_path *path, - const char *last, void *data) +static void show_object(struct object *object, const char *name, void *data) { struct bitmap *base = data; bitmap_set(base, find_object_pos(object->sha1)); |