X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=pack-objects.c;h=5466b1516788c878bfd3377f74dab40f73355127;hb=49e3343c9fe0e134e0a8c1ec0ddeb64ae18ee9fd;hp=5b2ef9a51387dc01e9d31f08962101cf1323e3e2;hpb=f6c7081aa97aa67baa06390a1ef36088c33bf010;p=git.git

diff --git a/pack-objects.c b/pack-objects.c
index 5b2ef9a5..5466b151 100644
--- a/pack-objects.c
+++ b/pack-objects.c
@@ -10,6 +10,7 @@
 #include "tree-walk.h"
 #include <sys/time.h>
 #include <signal.h>
+#include <stdint.h>
 
 static const char pack_usage[] = "git-pack-objects [-q] [--no-reuse-delta] [--non-empty] [--local] [--incremental] [--window=N] [--depth=N] {--stdout | base-name} < object-list";
 
@@ -156,7 +157,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 +1244,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 +1275,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;