diff options
| author | Vicent Martà <vicent@github.com> | 2013-01-11 10:59:31 -0800 |
|---|---|---|
| committer | Vicent Martà <vicent@github.com> | 2013-01-11 10:59:31 -0800 |
| commit | 3f4437e714874ed10ce20fb32ca2dad3ca6f80ee (patch) | |
| tree | 7120e039fceca5871ef912101ef9dddde50bea39 /src/pack.c | |
| parent | d0b14cea0e1ff09af83a801c1a9cf1a431d46d0c (diff) | |
| parent | f3738eba56cd6bafe1befea90a35a0b26600491c (diff) | |
| download | libgit2-3f4437e714874ed10ce20fb32ca2dad3ca6f80ee.tar.gz | |
Merge pull request #1227 from nulltoken/topic/emergeconflict
Introduce EMERGECONFLICT
Diffstat (limited to 'src/pack.c')
| -rw-r--r-- | src/pack.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/pack.c b/src/pack.c index 608450825..3490c8bb9 100644 --- a/src/pack.c +++ b/src/pack.c @@ -621,7 +621,7 @@ ssize_t git_packfile_stream_read(git_packfile_stream *obj, void *buffer, size_t return GIT_EBUFS; obj->zstream.next_out = buffer; - obj->zstream.avail_out = len; + obj->zstream.avail_out = (unsigned int)len; obj->zstream.next_in = in; st = inflate(&obj->zstream, Z_SYNC_FLUSH); |