Fix up progress report for off-by-one error

We used to print the index of the object we unpacked, not how many we
had unpacked.  Which caused slightly confusing progress reports like

100% (2/3) done

rather than the more obvious "3/3" for 100% ;)

diff --git a/unpack-objects.c b/unpack-objects.c
index 355889f65bef73e512cf4c053493ae25c6a77b96..19874d004a03531b12922f1bd48a28f18e8d2897 100644 (file)
--- a/unpack-objects.c
+++ b/unpack-objects.c
@@ -211,7 +211,7 @@ static void unpack_one(unsigned nr, unsigned total)
                static unsigned long last_sec;
                static unsigned last_percent;
                struct timeval now;
                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) {
 
                gettimeofday(&now, NULL);
                if (percentage != last_percent || now.tv_sec != last_sec) {


@@ -255,7 +255,7 @@ static void unpack_all(void)
 
        use(sizeof(struct pack_header));
        for (i = 0; i < nr_objects; i++)
 
        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");
 }
        if (delta_list)
                die("unresolved deltas left after unpacking");
 }