threads / patch / 43560

patchpack-objects: remove redundent status information

Subject: [PATCH] pack-objects: remove redundent status information

## tl;dr

One message between Nov 29, 2006 and Nov 29, 2006. Diffs are folded; open one to read it.

replies: 0people: 1as markdown or json

Nicolas Pitre· Nov 29, 2006, 22:15 UTC · lore

The final 'nr_result' and 'written' values must always be the same otherwise we're in deep trouble. So let's remove a redundent report.

And for paranoia sake let's make sure those two variables are actually equal after all objects are written (one never knows).

Signed-off-by: Nicolas Pitre <nico@cam.org>
---
Show changes to builtin-pack-objects.c +4 −2
diff --git a/builtin-pack-objects.c b/builtin-pack-objects.c
index 753bcd5..a2dc7d1 100644
--- a/builtin-pack-objects.c
+++ b/builtin-pack-objects.c
@@ -514,6 +514,8 @@ static void write_pack_file(void)
 	if (do_progress)
 		fputc('\n', stderr);
  done:
+	if (written != nr_result)
+		die("wrote %d objects while expecting %d", written, nr_result);
 	sha1close(f, pack_file_sha1, 1);
 }
 
@@ -1662,7 +1664,7 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
 		}
 	}
 	if (progress)
-		fprintf(stderr, "Total %d, written %d (delta %d), reused %d (delta %d)\n",
-			nr_result, written, written_delta, reused, reused_delta);
+		fprintf(stderr, "Total %d (delta %d), reused %d (delta %d)\n",
+			written, written_delta, reused, reused_delta);
 	return 0;

← back to recent threads