diff options
Diffstat (limited to 'compat')
| -rw-r--r-- | compat/fsmonitor/fsm-health-win32.c | 1 | ||||
| -rw-r--r-- | compat/fsmonitor/fsm-listen-darwin.c | 1 | ||||
| -rw-r--r-- | compat/fsmonitor/fsm-listen-win32.c | 1 | ||||
| -rw-r--r-- | compat/mingw.c | 2 | ||||
| -rw-r--r-- | compat/simple-ipc/ipc-shared.c | 3 | ||||
| -rw-r--r-- | compat/simple-ipc/ipc-unix-socket.c | 1 |
6 files changed, 5 insertions, 4 deletions
diff --git a/compat/fsmonitor/fsm-health-win32.c b/compat/fsmonitor/fsm-health-win32.c index 2d4e245beb..2aa8c219ac 100644 --- a/compat/fsmonitor/fsm-health-win32.c +++ b/compat/fsmonitor/fsm-health-win32.c @@ -4,6 +4,7 @@ #include "fsm-health.h" #include "fsmonitor--daemon.h" #include "gettext.h" +#include "simple-ipc.h" /* * Every minute wake up and test our health. diff --git a/compat/fsmonitor/fsm-listen-darwin.c b/compat/fsmonitor/fsm-listen-darwin.c index 11b56d3ef1..2fc67442eb 100644 --- a/compat/fsmonitor/fsm-listen-darwin.c +++ b/compat/fsmonitor/fsm-listen-darwin.c @@ -29,6 +29,7 @@ #include "fsmonitor--daemon.h" #include "fsmonitor-path-utils.h" #include "gettext.h" +#include "simple-ipc.h" #include "string-list.h" #include "trace.h" diff --git a/compat/fsmonitor/fsm-listen-win32.c b/compat/fsmonitor/fsm-listen-win32.c index 90a2412284..5a21dade7b 100644 --- a/compat/fsmonitor/fsm-listen-win32.c +++ b/compat/fsmonitor/fsm-listen-win32.c @@ -4,6 +4,7 @@ #include "fsm-listen.h" #include "fsmonitor--daemon.h" #include "gettext.h" +#include "simple-ipc.h" #include "trace2.h" /* diff --git a/compat/mingw.c b/compat/mingw.c index ec5280da16..42053c1f65 100644 --- a/compat/mingw.c +++ b/compat/mingw.c @@ -255,6 +255,8 @@ int mingw_core_config(const char *var, const char *value, } if (!strcmp(var, "core.unsetenvvars")) { + if (!value) + return config_error_nonbool(var); free(unset_environment_variables); unset_environment_variables = xstrdup(value); return 0; diff --git a/compat/simple-ipc/ipc-shared.c b/compat/simple-ipc/ipc-shared.c index e5e1dda8cc..cb176d966f 100644 --- a/compat/simple-ipc/ipc-shared.c +++ b/compat/simple-ipc/ipc-shared.c @@ -1,8 +1,5 @@ #include "git-compat-util.h" #include "simple-ipc.h" -#include "strbuf.h" -#include "pkt-line.h" -#include "thread-utils.h" #ifndef SUPPORTS_SIMPLE_IPC /* diff --git a/compat/simple-ipc/ipc-unix-socket.c b/compat/simple-ipc/ipc-unix-socket.c index b2f4f22ce4..9b3f2cdf8c 100644 --- a/compat/simple-ipc/ipc-unix-socket.c +++ b/compat/simple-ipc/ipc-unix-socket.c @@ -2,7 +2,6 @@ #include "gettext.h" #include "simple-ipc.h" #include "strbuf.h" -#include "pkt-line.h" #include "thread-utils.h" #include "trace2.h" #include "unix-socket.h" |