git-prompt.sh: if pc mode, immediately set PS1 to a plain prompt

diff --git a/trailer.c b/trailer.c
index 30636d20a0637787fd397034e0142c94106cffc6..623adeb02d0e06a83d7b17a9b605ff8c6475a0bd 100644 (file)
--- a/trailer.c
+++ b/trailer.c
@@ -229,7 +229,7 @@ static const char *apply_command(const char *command, const char *arg)
 {
        struct strbuf cmd = STRBUF_INIT;
        struct strbuf buf = STRBUF_INIT;
-       struct child_process cp;
+       struct child_process cp = CHILD_PROCESS_INIT;
        const char *argv[] = {NULL, NULL};
        const char *result;
 
@@ -238,7 +238,6 @@ static const char *apply_command(const char *command, const char *arg)
                strbuf_replace(&cmd, TRAILER_ARG_STRING, arg);
 
        argv[0] = cmd.buf;
-       memset(&cp, 0, sizeof(cp));
        cp.argv = argv;
        cp.env = local_repo_env;
        cp.no_stdin = 1;