builtin/log.c: stop using global patch_suffix

gitster · gitster · commit 68cb7b6f85aa · 2012-12-21T23:12:25.000-08:00
The suffix for the output filename is found in rev-&gt;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 &lt;gitster@pobox.com&gt;
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -673,7 +673,7 @@ static int reopen_stdout(struct commit commit, const char subject,`
`673`	`673`	`struct rev_info *rev, int quiet)`
`674`	`674`	`{`
`675`	`675`	`struct strbuf filename = STRBUF_INIT;`
`676`		`- int suffix_len = strlen(fmt_patch_suffix) + 1;`
	`676`	`+ int suffix_len = strlen(rev->patch_suffix) + 1;`
`677`	`677`
`678`	`678`	`if (output_directory) {`
`679`	`679`	`strbuf_addstr(&filename, output_directory);`
`@@ -684,7 +684,7 @@ static int reopen_stdout(struct commit commit, const char subject,`
`684`	`684`	`strbuf_addch(&filename, '/');`
`685`	`685`	`}`
`686`	`686`
`687`		`- get_patch_filename(commit, subject, rev->nr, fmt_patch_suffix, &filename);`
	`687`	`+ get_patch_filename(commit, subject, rev->nr, rev->patch_suffix, &filename);`
`688`	`688`
`689`	`689`	`if (!quiet)`
`690`	`690`	`fprintf(realstdout, "%s\n", filename.buf + outdir_offset);`