format-patch: explicitly switch off color when writing to files

The --color=auto handling is done by seeing if file descriptor 1 (the standard output) is connected to a terminal. format-patch used freopen() to reuse the standard output stream even when sending its output to an on-disk file, and this check is appropriate. In the next step, however, we will stop reusing "FILE *stdout", and instead start using arbitrary file descriptor obtained by doing an fopen(3) ourselves. The check --color=auto does will become useless, as we no longer are writing to the standard output stream. But then, we do not need to guess to begin with. As argued in the commit message of 7787570c (format-patch: ignore ui.color, 2011-09-13), we do not allow the ui.color setting to affect format-patch's output. The only time, therefore, that we allow color sequences to be written to the output files is when the user specified the --color=always command-line option explicitly. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Johannes Schindelin committed Jun 22, 2016 at 17:01 UTC 11f4eb19843c28b1c50d3c1bef1183e6313b87b8
1 file changed +2
builtin/log.c
+2
@@ -1578,6 +1578,8 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
1578 setup_pager();
1579
1580 if (output_directory) {
1581 + if (rev.diffopt.use_color != GIT_COLOR_ALWAYS)
1582 + rev.diffopt.use_color = GIT_COLOR_NEVER;
1583 if (use_stdout)
1584 die(_("standard output, or directory, which one?"));
1585 if (mkdir(output_directory, 0777) < 0 && errno != EEXIST)