diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-20 05:14:36 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-20 05:14:36 +0000 |
| commit | 09f61306ecfdf0e532c58460d8d868d50021e7db (patch) | |
| tree | b6f46cb23ce41cddcb6e1320d5c1c4bd5d69e899 /trace2 | |
| parent | Adding debian version 1:2.43.0-1. (diff) | |
| download | git-09f61306ecfdf0e532c58460d8d868d50021e7db.tar.xz git-09f61306ecfdf0e532c58460d8d868d50021e7db.zip | |
Merging upstream version 1:2.45.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'trace2')
| -rw-r--r-- | trace2/tr2_ctr.c | 1 | ||||
| -rw-r--r-- | trace2/tr2_sysenv.c | 2 | ||||
| -rw-r--r-- | trace2/tr2_tgt_normal.c | 1 | ||||
| -rw-r--r-- | trace2/tr2_tls.c | 1 | ||||
| -rw-r--r-- | trace2/tr2_tls.h | 1 | ||||
| -rw-r--r-- | trace2/tr2_tmr.c | 1 |
6 files changed, 4 insertions, 3 deletions
diff --git a/trace2/tr2_ctr.c b/trace2/tr2_ctr.c index 87cf903..d3a3371 100644 --- a/trace2/tr2_ctr.c +++ b/trace2/tr2_ctr.c @@ -1,5 +1,4 @@ #include "git-compat-util.h" -#include "thread-utils.h" #include "trace2/tr2_tgt.h" #include "trace2/tr2_tls.h" #include "trace2/tr2_ctr.h" diff --git a/trace2/tr2_sysenv.c b/trace2/tr2_sysenv.c index d3ecac2..048cdd5 100644 --- a/trace2/tr2_sysenv.c +++ b/trace2/tr2_sysenv.c @@ -68,6 +68,8 @@ static int tr2_sysenv_cb(const char *key, const char *value, for (k = 0; k < ARRAY_SIZE(tr2_sysenv_settings); k++) { if (!strcmp(key, tr2_sysenv_settings[k].git_config_name)) { + if (!value) + return config_error_nonbool(key); free(tr2_sysenv_settings[k].value); tr2_sysenv_settings[k].value = xstrdup(value); return 0; diff --git a/trace2/tr2_tgt_normal.c b/trace2/tr2_tgt_normal.c index 38d5ebd..baef48a 100644 --- a/trace2/tr2_tgt_normal.c +++ b/trace2/tr2_tgt_normal.c @@ -2,6 +2,7 @@ #include "config.h" #include "repository.h" #include "run-command.h" +#include "strbuf.h" #include "quote.h" #include "version.h" #include "trace2/tr2_dst.h" diff --git a/trace2/tr2_tls.c b/trace2/tr2_tls.c index 601c9e5..4f75392 100644 --- a/trace2/tr2_tls.c +++ b/trace2/tr2_tls.c @@ -1,4 +1,5 @@ #include "git-compat-util.h" +#include "strbuf.h" #include "thread-utils.h" #include "trace.h" #include "trace2/tr2_tls.h" diff --git a/trace2/tr2_tls.h b/trace2/tr2_tls.h index f904980..3dfe655 100644 --- a/trace2/tr2_tls.h +++ b/trace2/tr2_tls.h @@ -1,7 +1,6 @@ #ifndef TR2_TLS_H #define TR2_TLS_H -#include "strbuf.h" #include "trace2/tr2_ctr.h" #include "trace2/tr2_tmr.h" diff --git a/trace2/tr2_tmr.c b/trace2/tr2_tmr.c index 31d0e4d..51f564b 100644 --- a/trace2/tr2_tmr.c +++ b/trace2/tr2_tmr.c @@ -1,5 +1,4 @@ #include "git-compat-util.h" -#include "thread-utils.h" #include "trace2/tr2_tgt.h" #include "trace2/tr2_tls.h" #include "trace2/tr2_tmr.h" |