diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-02-13 13:39:10 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-02-13 13:39:10 -0800 |
| commit | 3efeec3a75995eb7d3b250f58535023db6c261e7 (patch) | |
| tree | 345c9975d330e0bb6205131f7eb168140ba08311 /builtin/am.c | |
| parent | ead8dbe2e14ee9a2a18ccd0ad7bca806e1be0d54 (diff) | |
| parent | 090a09272ac3bead828519b66eb62d53b53ecf7d (diff) | |
| download | git-3efeec3a75995eb7d3b250f58535023db6c261e7.tar.gz | |
Merge branch 'nd/trace-with-env'
The tracing machinery learned to report tweaking of environment
variables as well.
* nd/trace-with-env:
run-command.c: print new cwd in trace_run_command()
run-command.c: print env vars in trace_run_command()
run-command.c: print program 'git' when tracing git_cmd mode
run-command.c: introduce trace_run_command()
trace.c: move strbuf_release() out of print_trace_line()
trace: avoid unnecessary quoting
sq_quote_argv: drop maxlen parameter
Diffstat (limited to 'builtin/am.c')
| -rw-r--r-- | builtin/am.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/am.c b/builtin/am.c index acfe9d3c8c..5bdd2d7578 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -1061,7 +1061,7 @@ static void am_setup(struct am_state *state, enum patch_format patch_format, } write_state_text(state, "scissors", str); - sq_quote_argv(&sb, state->git_apply_opts.argv, 0); + sq_quote_argv(&sb, state->git_apply_opts.argv); write_state_text(state, "apply-opt", sb.buf); if (state->rebasing) |