diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-10-26 04:38:56 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-10-26 04:38:56 +0300 |
commit | 6665b9ec115073f08274eb4d493fd215dba1d718 (patch) | |
tree | 7b4f5dc3b820c51b68c628a3394640a9fc95fbf6 | |
parent | 18fbc94c3c00964beddeb4c415167557c16519d0 (diff) | |
parent | 6c0efa2ac07f275c1edd11ae6646a647d7f19f36 (diff) |
Sync with 1.6.5.2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r-- | Documentation/RelNotes-1.6.5.2.txt | 19 | ||||
-rw-r--r-- | Documentation/git.txt | 3 | ||||
-rw-r--r-- | sha1_file.c | 8 |
3 files changed, 24 insertions, 6 deletions
diff --git a/Documentation/RelNotes-1.6.5.2.txt b/Documentation/RelNotes-1.6.5.2.txt new file mode 100644 index 0000000000..aa7ccce3a2 --- /dev/null +++ b/Documentation/RelNotes-1.6.5.2.txt @@ -0,0 +1,19 @@ +GIT v1.6.5.2 Release Notes +========================== + +Fixes since v1.6.5.1 +-------------------- + + * Installation of templates triggered a bug in busybox when using tar + implementation from it. + + * "git add -i" incorrectly ignored paths that are already in the index + if they matched .gitignore patterns. + + * "git describe --always" should have produced some output even there + were no tags in the repository, but it didn't. + + * "git ls-files" when showing tracked files incorrectly paid attention + to the exclude patterns. + +Other minor documentation updates are included. diff --git a/Documentation/git.txt b/Documentation/git.txt index 10f2f82ca1..0f536793df 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -43,9 +43,10 @@ unreleased) version of git, that is available from 'master' branch of the `git.git` repository. Documentation for older releases are available here: -* link:v1.6.5.1/git.html[documentation for release 1.6.5.1] +* link:v1.6.5.2/git.html[documentation for release 1.6.5.2] * release notes for + link:RelNotes-1.6.5.2.txt[1.6.5.2], link:RelNotes-1.6.5.1.txt[1.6.5.1], link:RelNotes-1.6.5.txt[1.6.5]. diff --git a/sha1_file.c b/sha1_file.c index 4cc8939e4b..63981fb3fd 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -1357,8 +1357,6 @@ unsigned long get_size_from_delta(struct packed_git *p, in = use_pack(p, w_curs, curpos, &stream.avail_in); stream.next_in = in; st = git_inflate(&stream, Z_FINISH); - if (st == Z_BUF_ERROR && (stream.avail_in || !stream.avail_out)) - break; curpos += stream.next_in - in; } while ((st == Z_OK || st == Z_BUF_ERROR) && stream.total_out < sizeof(delta_head)); @@ -1589,15 +1587,15 @@ static void *unpack_compressed_entry(struct packed_git *p, buffer[size] = 0; memset(&stream, 0, sizeof(stream)); stream.next_out = buffer; - stream.avail_out = size; + stream.avail_out = size + 1; git_inflate_init(&stream); do { in = use_pack(p, w_curs, curpos, &stream.avail_in); stream.next_in = in; st = git_inflate(&stream, Z_FINISH); - if (st == Z_BUF_ERROR && (stream.avail_in || !stream.avail_out)) - break; + if (!stream.avail_out) + break; /* the payload is larger than it should be */ curpos += stream.next_in - in; } while (st == Z_OK || st == Z_BUF_ERROR); git_inflate_end(&stream); |