Merge branch 'sg/cvs-tests-with-x'

diff --git a/run-command.c b/run-command.c
index 1301b878c7eece7031fb0c9795195435a89ce7a4..a483d5904a3ec1acae8908dd2e699fa00bcaaa9d 100644 (file)
--- a/run-command.c
+++ b/run-command.c
@@ -622,6 +622,11 @@ static void trace_run_command(const struct child_process *cp)
                return;
 
        strbuf_addf(&buf, "trace: run_command:");
+       if (cp->dir) {
+               strbuf_addstr(&buf, " cd ");
+               sq_quote_buf_pretty(&buf, cp->dir);
+               strbuf_addch(&buf, ';');
+       }
        /*
         * The caller is responsible for initializing cp->env from
         * cp->env_array if needed. We only check one place.