summaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2014-04-19 15:19:30 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-04-21 10:31:51 -0700
commit5b88caa417ab221c8f8576332fba8d41dd3986d7 (patch)
tree6b1c7f62901aa55b8ab6606bce559e84cb57a9bc /diff.c
parentrun_external_diff: clean up error handling (diff)
downloadtgif-5b88caa417ab221c8f8576332fba8d41dd3986d7.tar.xz
run_external_diff: drop fflush(NULL)
This fflush was added in d5535ec (Use run_command() to spawn external diff programs instead of fork/exec., 2007-10-19), because flushing buffers before forking is a good habit. But later, 7d0b18a (Add output flushing before fork(), 2008-08-04) added it to the generic run-command interface, meaning that our flush here is redundant. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff.c')
-rw-r--r--diff.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/diff.c b/diff.c
index 174f146d0d..4bad556812 100644
--- a/diff.c
+++ b/diff.c
@@ -2932,7 +2932,6 @@ static void run_external_diff(const char *pgm,
argv_array_push(&argv, pgm);
argv_array_push(&argv, name);
}
- fflush(NULL);
argv_array_pushf(&env, "GIT_DIFF_PATH_COUNTER=%d", ++o->diff_path_counter);
argv_array_pushf(&env, "GIT_DIFF_PATH_TOTAL=%d", q->nr);