kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'cp/git-flush-is-an-env-bool' into maint-2.43 

Recent conversion to allow more than 0/1 in GIT_FLUSH broke the
mechanism by flipping what yes/no means by mistake, which has been
corrected.

* cp/git-flush-is-an-env-bool:
  write-or-die: fix the polarity of GIT_FLUSH environment variable
maint
Junio C Hamano 2024-02-13 14:44:49 -08:00
parent bd10c45672 b40ba17e44
commit 7687ca5a90
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
write-or-die.c
View File

@ -18,20 +18,20 @@
*/
void maybe_flush_or_die(FILE *f, const char *desc)
{
static int skip_stdout_flush = -1;

if (f == stdout) {
if (skip_stdout_flush < 0) {
skip_stdout_flush = git_env_bool("GIT_FLUSH", -1);
if (skip_stdout_flush < 0) {
static int force_flush_stdout = -1;

if (force_flush_stdout < 0) {
force_flush_stdout = git_env_bool("GIT_FLUSH", -1);
if (force_flush_stdout < 0) {
struct stat st;
if (fstat(fileno(stdout), &st))
skip_stdout_flush = 0;
force_flush_stdout = 1;
else
skip_stdout_flush = S_ISREG(st.st_mode);
force_flush_stdout = !S_ISREG(st.st_mode);
}
}
if (skip_stdout_flush && !ferror(f))
if (!force_flush_stdout && !ferror(f))
return;
}
if (fflush(f)) {