Merge branch 'sg/progress-fix'

gitster · gitster · commit e3cf08361ae5 · 2019-10-23T14:43:09.000+09:00
Byte-order fix the recent update to progress display code.

* sg/progress-fix:
  test-progress: fix test failures on big-endian systems
diff --git a/t/helper/test-progress.c b/t/helper/test-progress.c
@@ -29,7 +29,7 @@ void progress_test_force_update(void);
 
 int cmd__progress(int argc, const char **argv)
 {
-	uint64_t total = 0;
+	int total = 0;
 	const char *title;
 	struct strbuf line = STRBUF_INIT;
 	struct progress *progress;

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ void progress_test_force_update(void);`
`29`	`29`
`30`	`30`	`int cmd__progress(int argc, const char **argv)`
`31`	`31`	`{`
`32`		`- uint64_t total = 0;`
	`32`	`+ int total = 0;`
`33`	`33`	`const char *title;`
`34`	`34`	`struct strbuf line = STRBUF_INIT;`
`35`	`35`	`struct progress *progress;`