From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 22 Dec 2012 06:24:03 +0000 (-0800)
Subject: builtin/log.c: stop using global patch_suffix
X-Git-Tag: v2.4.6~5^2~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=68cb7b6f85aa032c33e49137364da9b76b1d95a1;p=git

builtin/log.c: stop using global patch_suffix

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>
---

diff --git a/builtin/log.c b/builtin/log.c
index f1d086e68b..7cf157e3ea 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);