get_patch_filename(): drop "just-numbers" hack

The function chooses from three operating modes (format using the
subject, the commit, or just number) based on NULL-ness of two of
its parameters, which is an ugly hack for sharing only a bit of
code.

Separate out the "just numbers" part out to the callers.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano
2012-12-21 21:39:37 -08:00
parent 021f2f4c1a
commit 38ec23ac89
2 changed files with 18 additions and 16 deletions

View File

@ -684,7 +684,10 @@ static int reopen_stdout(struct commit *commit, const char *subject,
strbuf_addch(&filename, '/');
}
get_patch_filename(&filename, commit, subject, rev);
if (rev->numbered_files)
strbuf_addf(&filename, "%d", rev->nr);
else
get_patch_filename(&filename, commit, subject, rev);
if (!quiet)
fprintf(realstdout, "%s\n", filename.buf + outdir_offset);