summaryrefslogtreecommitdiff
path: root/trace.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2016-08-05 03:58:38 -0400
committerJunio C Hamano <gitster@pobox.com>2016-08-05 09:28:17 -0700
commit6f25305799f0bbddbac1d678293e8c5cf404deb3 (patch)
tree4efc903742c4ecad1c4206910a30c782f9cbb4dc /trace.c
parentca5c701ca50c24807793294c5ed22230858ac5e6 (diff)
downloadgit-6f25305799f0bbddbac1d678293e8c5cf404deb3.tar.gz
trace: do not fall back to stderrjk/trace-fixup
If the trace code cannot open a specified file, or does not understand the contents of the GIT_TRACE variable, it falls back to printing trace output to stderr. This is an attempt to be helpful, but in practice it just ends up annoying. The user was trying to get the output to go somewhere else, so spewing it to stderr does not really accomplish that. And as it's intended for debugging, they can presumably re-run the command with their error corrected. So instead of falling back, this patch disables bogus trace keys for the rest of the program, just as we do for write errors. We can drop the "Defaulting to..." part of the error message entirely; after seeing "cannot open '/foo'", the user can assume that tracing is skipped. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'trace.c')
-rw-r--r--trace.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/trace.c b/trace.c
index 083eb984e1..7508aea028 100644
--- a/trace.c
+++ b/trace.c
@@ -61,10 +61,9 @@ static int get_trace_fd(struct trace_key *key)
else if (is_absolute_path(trace)) {
int fd = open(trace, O_WRONLY | O_APPEND | O_CREAT, 0666);
if (fd == -1) {
- warning("could not open '%s' for tracing: %s\n"
- " Defaulting to tracing on stderr...",
+ warning("could not open '%s' for tracing: %s",
trace, strerror(errno));
- key->fd = STDERR_FILENO;
+ trace_disable(key);
} else {
key->fd = fd;
key->need_close = 1;
@@ -72,10 +71,9 @@ static int get_trace_fd(struct trace_key *key)
} else {
warning("unknown trace value for '%s': %s\n"
" If you want to trace into a file, then please set %s\n"
- " to an absolute pathname (starting with /)\n"
- " Defaulting to tracing on stderr...",
+ " to an absolute pathname (starting with /)",
key->key, trace, key->key);
- key->fd = STDERR_FILENO;
+ trace_disable(key);
}
key->initialized = 1;