[PATCH v5 0/7] Trace env variables in run_command()

[Nguyễn Thái Ngọc Duy]

v5 

 - makes test-run-command safer
 - deletes a dead line
 - fixes an embarassing memory leak

Interdiff

diff --git a/t/helper/test-run-command.c b/t/helper/test-run-command.c
index 0ab71f14fb..153342e44d 100644
--- a/t/helper/test-run-command.c
+++ b/t/helper/test-run-command.c
@@ -57,9 +57,14 @@ int cmd_main(int argc, const char **argv)
        if (argc < 3)
                return 1;
        while (!strcmp(argv[1], "env")) {
+               if (!argv[2])
+                       die("env specifier without a value");
                argv_array_push(&proc.env_array, argv[2]);
                argv += 2;
+               argc -= 2;
        }
+       if (argc < 3)
+               return 1;
        proc.argv = (const char **)argv + 2;
 
        if (!strcmp(argv[1], "start-command-ENOENT")) {
diff --git a/trace.c b/trace.c
index 4bfd3fce10..ad75d683bf 100644
--- a/trace.c
+++ b/trace.c
@@ -286,8 +286,8 @@ static void add_env(struct strbuf *dst, const char *const 
*deltaenv)
        for (e = deltaenv; e && *e; e++) {
                struct strbuf key = STRBUF_INIT;
                char *equals = strchr(*e, '=');
+
                if (equals) {
-                       strbuf_reset(&key);
                        strbuf_add(&key, *e, equals - *e);
                        string_list_insert(&envs, key.buf)->util = equals + 1;
                } else {
@@ -360,6 +360,7 @@ void trace_run_command(const struct child_process *cp)
 
        sq_quote_argv_pretty(&buf, cp->argv);
        print_trace_line(&trace_default_key, &buf);
+       strbuf_release(&buf);
 }
 
 static const char *quote_crnl(const char *path)

Jeff King (2):
  sq_quote_argv: drop maxlen parameter
  trace: avoid unnecessary quoting

Nguyễn Thái Ngọc Duy (5):
  trace.c: move strbuf_release() out of print_trace_line()
  trace.c: introduce trace_run_command()
  trace.c: print program 'git' when child_process.git_cmd is set
  trace.c: print env vars in trace_run_command()
  trace.c: print new cwd in trace_run_command()

 builtin/am.c                |  2 +-
 builtin/rev-parse.c         |  4 +-
 quote.c                     | 30 ++++++++++++--
 quote.h                     | 10 ++++-
 run-command.c               |  3 +-
 t/helper/test-run-command.c |  9 +++++
 t/t0061-run-command.sh      | 22 ++++++++++
 trace.c                     | 97 +++++++++++++++++++++++++++++++++++++++++++--
 trace.h                     |  3 ++
 9 files changed, 169 insertions(+), 11 deletions(-)

-- 
2.15.1.600.g899a5f85c6