git-send-pack: Fix duplicate refname match

diff --git a/unpack-objects.c b/unpack-objects.c
index b9ddcb70e0b653865716e5b78e4035028d651c9e..19874d004a03531b12922f1bd48a28f18e8d2897 100644 (file)
--- a/unpack-objects.c
+++ b/unpack-objects.c
@@ -3,7 +3,9 @@
 #include "delta.h"
 #include "pack.h"
 
-static int dry_run;
+#include <sys/time.h>
+
+static int dry_run, quiet;
 static const char unpack_usage[] = "git-unpack-objects < pack-file";
 
 /* We always read in 4kB chunks. */
@@ -55,8 +57,6 @@ static void *get_data(unsigned long size)
        z_stream stream;
        void *buf = xmalloc(size);
 
-       if (!size)
-               return buf;
        memset(&stream, 0, sizeof(stream));
 
        stream.next_out = buf;
@@ -98,15 +98,22 @@ static void add_delta_to_list(unsigned char *base_sha1, void *delta, unsigned lo
        delta_list = info;
 }
 
-static void added_object(unsigned char *sha1, char *type, void *data, unsigned long size);
+static void added_object(unsigned char *sha1, const char *type, void *data, unsigned long size);
 
-static int resolve_delta(char *type,
+static void write_object(void *buf, unsigned long size, const char *type)
+{
+       unsigned char sha1[20];
+       if (write_sha1_file(buf, size, type, sha1) < 0)
+               die("failed to write object");
+       added_object(sha1, type, buf, size);
+}
+
+static int resolve_delta(const char *type,
        void *base, unsigned long base_size, 
        void *delta, unsigned long delta_size)
 {
        void *result;
        unsigned long result_size;
-       unsigned char sha1[20];
 
        result = patch_delta(base, base_size,
                             delta, delta_size,
@@ -114,15 +121,12 @@ static int resolve_delta(char *type,
        if (!result)
                die("failed to apply delta");
        free(delta);
-
-       if (write_sha1_file(result, result_size, type, sha1) < 0)
-               die("failed to write object");
-       added_object(sha1, type, result, result_size);
+       write_object(result, result_size, type);
        free(result);
        return 0;
 }
 
-static void added_object(unsigned char *sha1, char *type, void *data, unsigned long size)
+static void added_object(unsigned char *sha1, const char *type, void *data, unsigned long size)
 {
        struct delta_info **p = &delta_list;
        struct delta_info *info;
@@ -142,8 +146,7 @@ static void added_object(unsigned char *sha1, char *type, void *data, unsigned l
 static int unpack_non_delta_entry(enum object_type kind, unsigned long size)
 {
        void *buf = get_data(size);
-       unsigned char sha1[20];
-       char *type;
+       const char *type;
 
        switch (kind) {
        case OBJ_COMMIT: type = "commit"; break;
@@ -152,9 +155,8 @@ static int unpack_non_delta_entry(enum object_type kind, unsigned long size)
        case OBJ_TAG:    type = "tag"; break;
        default: die("bad type %d", kind);
        }
-       if (write_sha1_file(buf, size, type, sha1) < 0)
-               die("failed to write object");
-       added_object(sha1, type, buf, size);
+       if (!dry_run)
+               write_object(buf, size, type);
        free(buf);
        return 0;
 }
@@ -170,6 +172,10 @@ static int unpack_delta_entry(unsigned long delta_size)
        use(20);
 
        delta_data = get_data(delta_size);
+       if (dry_run) {
+               free(delta_data);
+               return 0;
+       }
 
        if (!has_sha1_file(base_sha1)) {
                add_delta_to_list(base_sha1, delta_data, delta_size);
@@ -181,7 +187,7 @@ static int unpack_delta_entry(unsigned long delta_size)
        return resolve_delta(type, base, base_size, delta_data, delta_size);
 }
 
-static void unpack_one(void)
+static void unpack_one(unsigned nr, unsigned total)
 {
        unsigned shift;
        unsigned char *pack, c;
@@ -201,6 +207,19 @@ static void unpack_one(void)
                size += (c & 0x7f) << shift;
                shift += 7;
        }
+       if (!quiet) {
+               static unsigned long last_sec;
+               static unsigned last_percent;
+               struct timeval now;
+               unsigned percentage = (nr * 100) / total;
+
+               gettimeofday(&now, NULL);
+               if (percentage != last_percent || now.tv_sec != last_sec) {
+                       last_sec = now.tv_sec;
+                       last_percent = percentage;
+                       fprintf(stderr, "%4u%% (%u/%u) done\r", percentage, nr, total);
+               }
+       }
        switch (type) {
        case OBJ_COMMIT:
        case OBJ_TREE:
@@ -236,7 +255,7 @@ static void unpack_all(void)
 
        use(sizeof(struct pack_header));
        for (i = 0; i < nr_objects; i++)
-               unpack_one();
+               unpack_one(i+1, nr_objects);
        if (delta_list)
                die("unresolved deltas left after unpacking");
 }
@@ -254,6 +273,10 @@ int main(int argc, char **argv)
                                dry_run = 1;
                                continue;
                        }
+                       if (!strcmp(arg, "-q")) {
+                               quiet = 1;
+                               continue;
+                       }
                        usage(unpack_usage);
                }
 
@@ -283,5 +306,7 @@ int main(int argc, char **argv)
        }
 
        /* All done */
+       if (!quiet)
+               fprintf(stderr, "\n");
        return 0;
 }