summaryrefslogtreecommitdiff
path: root/builtin/log.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-12-22 05:39:37 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-12-22 07:55:40 (GMT)
commit38ec23ac893e96a9027c1cf8112b3d97a0384d39 (patch)
tree46262595ee767c7396dce8638a6d88a211a41367 /builtin/log.c
parent021f2f4c1aed011c664844408325fe683a4046a8 (diff)
downloadgit-38ec23ac893e96a9027c1cf8112b3d97a0384d39.zip
git-38ec23ac893e96a9027c1cf8112b3d97a0384d39.tar.gz
git-38ec23ac893e96a9027c1cf8112b3d97a0384d39.tar.bz2
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>
Diffstat (limited to 'builtin/log.c')
-rw-r--r--builtin/log.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/builtin/log.c b/builtin/log.c
index d9946ec..3c6f20a 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -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);