[PATCH 3/7] builtin/log.c: stop using global patch_suffix
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Dec 22, 2012, 08:33 UTC
- Message-ID
- <1356165212-5611-4-git-send-email-gitster@pobox.com>
- In-Reply-To
- <1356165212-5611-1-git-send-email-gitster@pobox.com>
The suffix for the output filename is found in rev->patch_suffix; do not keep using the global that is only used to parse the command line and configuration.
Signed-off-by: Junio C Hamano <gitster@pobox.com> --- builtin/log.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/builtin/log.c b/builtin/log.c index f1d086e..7cf157e 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -673,7 +673,7 @@ static int reopen_stdout(struct commit *commit, const char *subject, struct rev_info *rev, int quiet) { struct strbuf filename = STRBUF_INIT; - int suffix_len = strlen(fmt_patch_suffix) + 1; + int suffix_len = strlen(rev->patch_suffix) + 1; if (output_directory) { strbuf_addstr(&filename, output_directory); @@ -684,7 +684,7 @@ static int reopen_stdout(struct commit *commit, const char *subject, strbuf_addch(&filename, '/'); } - get_patch_filename(commit, subject, rev->nr, fmt_patch_suffix, &filename); + get_patch_filename(commit, subject, rev->nr, rev->patch_suffix, &filename); if (!quiet) fprintf(realstdout, "%s\n", filename.buf + outdir_offset);
-- 1.8.0.6.gd28b5d4.dirty