From: Chandra Pratap <chandrapratap3519@xxxxxxxxx>
Among Git's environment variable, the ones marked as "Boolean"
accept values in a way similar to Boolean configuration variables,
i.e. values like 'yes', 'on', 'true' and positive numbers are
taken as "on" and values like 'no', 'off', 'false' are taken as
"off".
GIT_FLUSH can be used to force Git to use non-buffered I/O when
writing to stdout. It can only accept two values, '1' which causes
Git to flush more often and '0' which makes all output buffered.
Make GIT_FLUSH accept more values besides '0' and '1' by turning it
into a Boolean environment variable, modifying the required logic.
Update the related documentation.
Signed-off-by: Chandra Pratap <chandrapratap3519@xxxxxxxxx>
---
write-or-die: make GIT_FLUSH a Boolean environment variable
Helped-by: Torsten Bögershausen <tboegi@xxxxxx>
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1628%2FChand-ra%2Fgit_flush-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1628/Chand-ra/git_flush-v2
Pull-Request: https://github.com/gitgitgadget/git/pull/1628
Range-diff vs v1:
1: 2123b43a080 ! 1: 585c76fff68 write-or-die: make GIT_FLUSH a Boolean environment variable
@@ write-or-die.c: void maybe_flush_or_die(FILE *f, const char *desc)
static int skip_stdout_flush = -1;
struct stat st;
- char *cp;
-+ int cp;
if (f == stdout) {
if (skip_stdout_flush < 0) {
@@ write-or-die.c: void maybe_flush_or_die(FILE *f, const char *desc)
- cp = getenv("GIT_FLUSH");
- if (cp)
- skip_stdout_flush = (atoi(cp) == 0);
-+ cp = git_env_bool("GIT_FLUSH", -1);
-+ if (cp >= 0)
-+ skip_stdout_flush = (cp == 0);
- else if ((fstat(fileno(stdout), &st) == 0) &&
+- else if ((fstat(fileno(stdout), &st) == 0) &&
++ if (!git_env_bool("GIT_FLUSH", -1))
++ skip_stdout_flush = 1;
++ else if (!fstat(fileno(stdout), &st) &&
S_ISREG(st.st_mode))
skip_stdout_flush = 1;
+ else
Documentation/git.txt | 16 +++++++---------
write-or-die.c | 9 +++------
2 files changed, 10 insertions(+), 15 deletions(-)
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 2535a30194f..83fd60f2d11 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -724,16 +724,14 @@ for further details.
waiting for someone with sufficient permissions to fix it.
`GIT_FLUSH`::
-// NEEDSWORK: make it into a usual Boolean environment variable
- If this environment variable is set to "1", then commands such
+ If this Boolean environment variable is set to true, then commands such
as 'git blame' (in incremental mode), 'git rev-list', 'git log',
- 'git check-attr' and 'git check-ignore' will
- force a flush of the output stream after each record have been
- flushed. If this
- variable is set to "0", the output of these commands will be done
- using completely buffered I/O. If this environment variable is
- not set, Git will choose buffered or record-oriented flushing
- based on whether stdout appears to be redirected to a file or not.
+ 'git check-attr' and 'git check-ignore' will force a flush of the output
+ stream after each record have been flushed. If this variable is set to
+ false, the output of these commands will be done using completely buffered
+ I/O. If this environment variable is not set, Git will choose buffered or
+ record-oriented flushing based on whether stdout appears to be redirected
+ to a file or not.
`GIT_TRACE`::
Enables general trace messages, e.g. alias expansion, built-in
diff --git a/write-or-die.c b/write-or-die.c
index 42a2dc73cd3..a6acabd329f 100644
--- a/write-or-die.c
+++ b/write-or-die.c
@@ -20,15 +20,12 @@ void maybe_flush_or_die(FILE *f, const char *desc)
{
static int skip_stdout_flush = -1;
struct stat st;
- char *cp;
if (f == stdout) {
if (skip_stdout_flush < 0) {
- /* NEEDSWORK: make this a normal Boolean */
- cp = getenv("GIT_FLUSH");
- if (cp)
- skip_stdout_flush = (atoi(cp) == 0);
- else if ((fstat(fileno(stdout), &st) == 0) &&
+ if (!git_env_bool("GIT_FLUSH", -1))
+ skip_stdout_flush = 1;
+ else if (!fstat(fileno(stdout), &st) &&
S_ISREG(st.st_mode))
skip_stdout_flush = 1;
else
base-commit: 1a87c842ece327d03d08096395969aca5e0a6996
--
gitgitgadget
