diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-12-21 21:39:37 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-12-21 23:55:40 -0800 |
| commit | 38ec23ac893e96a9027c1cf8112b3d97a0384d39 (patch) | |
| tree | 46262595ee767c7396dce8638a6d88a211a41367 | |
| parent | 021f2f4c1aed011c664844408325fe683a4046a8 (diff) | |
| download | git-38ec23ac893e96a9027c1cf8112b3d97a0384d39.tar.gz | |
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>
| -rw-r--r-- | builtin/log.c | 5 | ||||
| -rw-r--r-- | log-tree.c | 29 |
2 files changed, 18 insertions, 16 deletions
diff --git a/builtin/log.c b/builtin/log.c index d9946ecd2f..3c6f20a235 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); diff --git a/log-tree.c b/log-tree.c index ceed6b62e6..d9f86ce624 100644 --- a/log-tree.c +++ b/log-tree.c @@ -307,21 +307,18 @@ void get_patch_filename(struct strbuf *buf, int nr = info->nr; int suffix_len = strlen(suffix) + 1; int start_len = buf->len; + int max_len = start_len + FORMAT_PATCH_NAME_MAX - suffix_len; - strbuf_addf(buf, commit || subject ? "%04d-" : "%d", nr); - if (commit || subject) { - int max_len = start_len + FORMAT_PATCH_NAME_MAX - suffix_len; + strbuf_addf(buf, "%04d-", nr); + if (subject) + strbuf_addstr(buf, subject); + else if (commit) { struct pretty_print_context ctx = {0}; - - if (subject) - strbuf_addstr(buf, subject); - else if (commit) - format_commit_message(commit, "%f", buf, &ctx); - - if (max_len < buf->len) - strbuf_setlen(buf, max_len); - strbuf_addstr(buf, suffix); + format_commit_message(commit, "%f", buf, &ctx); } + if (max_len < buf->len) + strbuf_setlen(buf, max_len); + strbuf_addstr(buf, suffix); } void log_write_email_headers(struct rev_info *opt, struct commit *commit, @@ -390,9 +387,11 @@ void log_write_email_headers(struct rev_info *opt, struct commit *commit, mime_boundary_leader, opt->mime_boundary); extra_headers = subject_buffer; - get_patch_filename(&filename, - opt->numbered_files ? NULL : commit, NULL, - opt); + if (opt->numbered_files) + strbuf_addf(&filename, "%d", opt->nr); + else + get_patch_filename(&filename, commit, NULL, + opt); snprintf(buffer, sizeof(buffer) - 1, "\n--%s%s\n" "Content-Type: text/x-patch;" |