Merge branch 'js/rebase-merge-octopus'

diff --git a/packfile.c b/packfile.c
index 1a714fbde994f8b4a7bde68f1fcad1725970fe9b..6974903e581ae4517979ec083da844bde3034c8f 100644 (file)
--- a/packfile.c
+++ b/packfile.c
@@ -1454,6 +1454,9 @@ static void *unpack_compressed_entry(struct packed_git *p,
                return NULL;
        }
 
+       /* versions of zlib can clobber unconsumed portion of outbuf */
+       buffer[size] = '\0';
+
        return buffer;
 }
 
@@ -1931,7 +1934,7 @@ static int add_promisor_object(const struct object_id *oid,
                               void *set_)
 {
        struct oidset *set = set_;
-       struct object *obj = parse_object(oid);
+       struct object *obj = parse_object(the_repository, oid);
        if (!obj)
                return 1;