Merge branch 'lm/squelch-bg-progress'

gitster · gitster · commit 17e785f6bace · 2015-05-22T12:41:58.000-07:00
The controlling tty-based heuristics to squelch progress output did not consider that the process may not be talking to a tty at all (e.g. sending the progress to sideband #2). This is a finishing touch to a topic that is already in 'master'. * lm/squelch-bg-progress: progress: treat "no terminal" as being in the foreground
diff --git a/progress.c b/progress.c
@@ -74,7 +74,8 @@ static void clear_progress_signal(void)
 
 static int is_foreground_fd(int fd)
 {
-	return getpgid(0) == tcgetpgrp(fd);
+	int tpgrp = tcgetpgrp(fd);
+	return tpgrp < 0 || tpgrp == getpgid(0);
 }
 
 static int display(struct progress *progress, unsigned n, const char *done)

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,8 @@ static void clear_progress_signal(void)`
`74`	`74`
`75`	`75`	`static int is_foreground_fd(int fd)`
`76`	`76`	`{`
`77`		`- return getpgid(0) == tcgetpgrp(fd);`
	`77`	`+ int tpgrp = tcgetpgrp(fd);`
	`78`	`+ return tpgrp < 0 \|\| tpgrp == getpgid(0);`
`78`	`79`	`}`
`79`	`80`
`80`	`81`	`static int display(struct progress progress, unsigned n, const char done)`