builtin/repack.c: extract showing progress to a variable

ttaylorr · gitster · commit 5f18e31f4642 · 2021-09-28T21:20:56.000-07:00
We only ask whether stderr is a tty before calling
'prune_packed_objects()', but the subsequent patch will add another use.

Extract this check into a variable so that both can use it without
having to call 'isatty()' twice.

Signed-off-by: Taylor Blau &lt;me@ttaylorr.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin/repack.c b/builtin/repack.c
@@ -446,6 +446,7 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
 	struct strbuf line = STRBUF_INIT;
 	int i, ext, ret;
 	FILE *out;
+	int show_progress = isatty(2);
 
 	/* variables to be filled by option parsing */
 	int pack_everything = 0;
@@ -719,7 +720,7 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
 			}
 			strbuf_release(&buf);
 		}
-		if (!po_args.quiet && isatty(2))
+		if (!po_args.quiet && show_progress)
 			opts |= PRUNE_PACKED_VERBOSE;
 		prune_packed_objects(opts);
 

Original file line number	Diff line number	Diff line change
`@@ -446,6 +446,7 @@ int cmd_repack(int argc, const char *argv, const char prefix)`
`446`	`446`	`struct strbuf line = STRBUF_INIT;`
`447`	`447`	`int i, ext, ret;`
`448`	`448`	`FILE *out;`
	`449`	`+ int show_progress = isatty(2);`
`449`	`450`
`450`	`451`	`/* variables to be filled by option parsing */`
`451`	`452`	`int pack_everything = 0;`
`@@ -719,7 +720,7 @@ int cmd_repack(int argc, const char *argv, const char prefix)`
`719`	`720`	`}`
`720`	`721`	`strbuf_release(&buf);`
`721`	`722`	`}`
`722`		`- if (!po_args.quiet && isatty(2))`
	`723`	`+ if (!po_args.quiet && show_progress)`
`723`	`724`	`opts \|= PRUNE_PACKED_VERBOSE;`
`724`	`725`	`prune_packed_objects(opts);`
`725`	`726`