зеркало из https://github.com/microsoft/git.git
progress: treat "no terminal" as being in the foreground
progress: treat "no terminal" as being in the foreground
Commit 85cb890
(progress: no progress in background,
2015-04-13) avoids sending progress from background
processes by checking that the process group id of the
current process is the same as that of the controlling
terminal.
If we don't have a terminal, however, this check never
succeeds, and we print no progress at all (until the final
"done" message). This can be seen when cloning a large
repository; instead of getting progress updates for
"counting objects", it will appear to hang then print the
final count.
We can fix this by treating an error return from tcgetpgrp()
as a signal to show the progress.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
9a9a41db83
Коммит
a4fb76ce19
|
@ -74,7 +74,8 @@ static void clear_progress_signal(void)
|
||||||
|
|
||||||
static int is_foreground_fd(int fd)
|
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)
|
static int display(struct progress *progress, unsigned n, const char *done)
|
||||||
|
|
Загрузка…
Ссылка в новой задаче