diff options
| author |  Jeff King <peff@peff.net> | 2010-04-01 20:03:18 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-04-01 23:49:03 -0700 |
| commit | c00e657df23d9e83d86a79657ff9061b1c2d357b (patch) | |
| tree | 23ca1039d12d63feddaf8cdf84fce692ededb4d5 /builtin/merge-ours.c | |
| parent | Sync with 1.7.0.4 (diff) | |
| download | tgif-c00e657df23d9e83d86a79657ff9061b1c2d357b.tar.xz | |
fix const-correctness of write_sha1_file
These should take const buffers as input data, but zlib's
next_in pointer is not const-correct. Let's fix it at the
zlib level, though, so the cast happens in one obvious
place. This should be safe, as a similar cast is used in
zlib's example code for a const array.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions