add throughput display to index-pack

... and call it "Receiving objects" when over stdin to look clearer
to end users.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/index-pack.c b/index-pack.c
index 879ea1548562b84a079a45c6195ab5a286195042..61ea7621bef3d653b3b88ba89801305b95a8d1a7 100644 (file)
--- a/index-pack.c
+++ b/index-pack.c
@@ -87,6 +87,8 @@ static void *fill(int min)
                                die("early EOF");
                        die("read error on input: %s", strerror(errno));
                }
                                die("early EOF");
                        die("read error on input: %s", strerror(errno));
                }

+               if (from_stdin)
+                       display_throughput(progress, ret);

                input_len += ret;
        } while (input_len < min);
        return input_buffer;
                input_len += ret;
        } while (input_len < min);
        return input_buffer;


@@ -406,7 +408,9 @@ static void parse_pack_objects(unsigned char *sha1)
         * - remember base (SHA1 or offset) for all deltas.
         */
        if (verbose)
         * - remember base (SHA1 or offset) for all deltas.
         */
        if (verbose)

-               progress = start_progress("Indexing objects", nr_objects);
+               progress = start_progress(
+                               from_stdin ? "Receiving objects" : "Indexing objects",
+                               nr_objects);

        for (i = 0; i < nr_objects; i++) {
                struct object_entry *obj = &objects[i];
                data = unpack_raw_entry(obj, &delta->base);
        for (i = 0; i < nr_objects; i++) {
                struct object_entry *obj = &objects[i];
                data = unpack_raw_entry(obj, &delta->base);