X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=pack-objects.c;h=1b9e7a1cb987627f762f5fb6f91b3df30ec93605;hb=5f7f211a54cb62fba4f017cdf3b9bc0c3a7843e1;hp=5b2ef9a51387dc01e9d31f08962101cf1323e3e2;hpb=f6c7081aa97aa67baa06390a1ef36088c33bf010;p=git.git

diff --git a/pack-objects.c b/pack-objects.c
index 5b2ef9a5..1b9e7a1c 100644
--- a/pack-objects.c
+++ b/pack-objects.c
@@ -156,7 +156,7 @@ static void prepare_pack_revindex(struct pack_revindex *rix)
 
 	rix->revindex = xmalloc(sizeof(unsigned long) * (num_ent + 1));
 	for (i = 0; i < num_ent; i++) {
-		long hl = *((long *)(index + 24 * i));
+		uint32_t hl = *((uint32_t *)(index + 24 * i));
 		rix->revindex[i] = ntohl(hl);
 	}
 	/* This knows the pack format -- the 20-byte trailer
@@ -1243,6 +1243,7 @@ int main(int argc, char **argv)
 
 	setup_git_directory();
 
+	progress = isatty(2);
 	for (i = 1; i < argc; i++) {
 		const char *arg = argv[i];
 
@@ -1273,6 +1274,10 @@ int main(int argc, char **argv)
 					usage(pack_usage);
 				continue;
 			}
+			if (!strcmp("--progress", arg)) {
+				progress = 1;
+				continue;
+			}
 			if (!strcmp("-q", arg)) {
 				progress = 0;
 				continue;