Documentation updates.

diff --git a/unpack-objects.c b/unpack-objects.c
index 355889f65bef73e512cf4c053493ae25c6a77b96..8ae1a1c0fdab32e6c596872d857f40c5f87b97d4 100644 (file)
--- a/unpack-objects.c
+++ b/unpack-objects.c
@@ -6,7 +6,7 @@
 #include <sys/time.h>
 
 static int dry_run, quiet;
-static const char unpack_usage[] = "git-unpack-objects < pack-file";
+static const char unpack_usage[] = "git-unpack-objects [-q] < pack-file";
 
 /* We always read in 4kB chunks. */
 static unsigned char buffer[4096];
@@ -75,6 +75,7 @@ static void *get_data(unsigned long size)
                stream.next_in = fill(1);
                stream.avail_in = len;
        }
+       inflateEnd(&stream);
        return buf;
 }
 
@@ -167,6 +168,7 @@ static int unpack_delta_entry(unsigned long delta_size)
        unsigned long base_size;
        char type[20];
        unsigned char base_sha1[20];
+       int result;
 
        memcpy(base_sha1, fill(20), 20);
        use(20);
@@ -184,7 +186,9 @@ static int unpack_delta_entry(unsigned long delta_size)
        base = read_sha1_file(base_sha1, type, &base_size);
        if (!base)
                die("failed to read delta-pack base object %s", sha1_to_hex(base_sha1));
-       return resolve_delta(type, base, base_size, delta_data, delta_size);
+       result = resolve_delta(type, base, base_size, delta_data, delta_size);
+       free(base);
+       return result;
 }
 
 static void unpack_one(unsigned nr, unsigned total)
@@ -211,7 +215,7 @@ static void unpack_one(unsigned nr, unsigned total)
                static unsigned long last_sec;
                static unsigned last_percent;
                struct timeval now;
-               unsigned percentage = ((1+nr) * 100) / total;
+               unsigned percentage = (nr * 100) / total;
 
                gettimeofday(&now, NULL);
                if (percentage != last_percent || now.tv_sec != last_sec) {
@@ -255,7 +259,7 @@ static void unpack_all(void)
 
        use(sizeof(struct pack_header));
        for (i = 0; i < nr_objects; i++)
-               unpack_one(i, nr_objects);
+               unpack_one(i+1, nr_objects);
        if (delta_list)
                die("unresolved deltas left after unpacking");
 }