about summary refs log tree commit diff
path: root/third_party/git/builtin/unpack-objects.c
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@google.com>2020-05-25T23·06+0100
committerVincent Ambo <tazjin@google.com>2020-05-25T23·06+0100
commit93ba78d6f4632ef1c5228965e3edc8c0faf88c1e (patch)
tree85730c182a9f5f492ade8e8ccdb1c2356f9900bd /third_party/git/builtin/unpack-objects.c
parent6f8fbf4aa4b1654ab27d4829e114538761817de0 (diff)
revert(3p/git): Revert merge of git upstream at v2.26.2 r/852
This causes cgit to serve error pages, which is undesirable.

This reverts commit 5229c9b232de5bfa959ad6ebbb4c8192ac513352, reversing
changes made to f2b211131f2347342dde63975b09cf603149f1a3.
Diffstat (limited to 'third_party/git/builtin/unpack-objects.c')
-rw-r--r--third_party/git/builtin/unpack-objects.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/third_party/git/builtin/unpack-objects.c b/third_party/git/builtin/unpack-objects.c
index dd4a75e030d2..a87a4bfd2c55 100644
--- a/third_party/git/builtin/unpack-objects.c
+++ b/third_party/git/builtin/unpack-objects.c
@@ -24,7 +24,6 @@ static off_t consumed_bytes;
 static off_t max_input_size;
 static git_hash_ctx ctx;
 static struct fsck_options fsck_options = FSCK_OPTIONS_STRICT;
-static struct progress *progress;
 
 /*
  * When running under --strict mode, objects whose reachability are
@@ -93,7 +92,6 @@ static void use(int bytes)
 	consumed_bytes += bytes;
 	if (max_input_size && consumed_bytes > max_input_size)
 		die(_("pack exceeds maximum allowed size"));
-	display_throughput(progress, consumed_bytes);
 }
 
 static void *get_data(unsigned long size)
@@ -265,8 +263,7 @@ static void write_object(unsigned nr, enum object_type type,
 	} else {
 		struct object *obj;
 		int eaten;
-		hash_object_file(the_hash_algo, buf, size, type_name(type),
-				 &obj_list[nr].oid);
+		hash_object_file(buf, size, type_name(type), &obj_list[nr].oid);
 		added_object(nr, type, buf, size);
 		obj = parse_object_buffer(the_repository, &obj_list[nr].oid,
 					  type, size, buf,
@@ -487,6 +484,7 @@ static void unpack_one(unsigned nr)
 static void unpack_all(void)
 {
 	int i;
+	struct progress *progress = NULL;
 	struct pack_header *hdr = fill(sizeof(struct pack_header));
 
 	nr_objects = ntohl(hdr->hdr_entries);