From: Adrian Dudau <Adrian.Dudau@enea.com>
To: "git@vger.kernel.org" <git@vger.kernel.org>
Subject: format-patch subject-prefix gets truncated when using the --numbered flag
Date: Tue, 28 Feb 2017 15:59:16 +0000 [thread overview]
Message-ID: <1488297556.2955.11.camel@enea.com> (raw)
Hello,
I noticed that the --subject-prefix string gets truncated sometimes,
but only when using the --numbered flat. Here's an example:
addu@sestofb11:/data/fb/addu/git$ export longm="very very very very
very very very very very very very very very very long prefix"
addu@sestofb11:/data/fb/addu/git$ git format-patch -1 --subject-
prefix="$longm][PATCH"
As expected, in the generated patch file we have:
Subject: [very very very very very very very very very very very very
very very long prefix][PATCH]
First batch after 2.12
But now, if I pass the --numbered flag too:
addu@sestofb11:/data/fb/addu/git$ git format-patch -1 --numbered --
subject-prefix="$longm][PATCH"
In the generated patch file we get this:
Subject: [very very very very very very very very very very verFirst
batch
after 2.12
This is happening on the latest master branch, so I dug through the
code and tracked the issue to this piece of code in log-tree.c:
if (opt->total > 0) {
static char buffer[64];
snprintf(buffer, sizeof(buffer),
"Subject: [%s%s%0*d/%d] ",
opt->subject_prefix,
*opt->subject_prefix ? " " : "",
digits_in_number(opt->total),
opt->nr, opt->total);
subject = buffer;
} else if (opt->total == 0 && opt->subject_prefix && *opt-
>subject_prefix) {
static char buffer[256];
snprintf(buffer, sizeof(buffer),
"Subject: [%s] ",
opt->subject_prefix);
subject = buffer;
} else {
subject = "Subject: ";
}
Apparently the size of the "buffer" var is different in the two
situations. Anybody knows if this is by design or just an old
oversight?
I can send a patch to fix it but I'm not very familiar with the git
code and I'm afraid some hidden consequence I don't see right now.
Cheers,
--Adrian
next reply other threads:[~2017-02-28 16:29 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-28 15:59 Adrian Dudau [this message]
2017-02-28 17:42 ` format-patch subject-prefix gets truncated when using the --numbered flag Junio C Hamano
2017-02-28 19:33 ` Junio C Hamano
2017-02-28 22:44 ` Jeff King
2017-02-28 18:17 ` Jeff King
2017-03-01 11:36 ` [PATCH 1/2] log-tree: factor out fmt_output_email_subject() René Scharfe
2017-03-01 11:37 ` [PATCH 2/2] pretty: use fmt_output_email_subject() René Scharfe
2017-03-01 15:41 ` René Scharfe
2017-03-01 18:08 ` Junio C Hamano
2017-03-01 19:32 ` Jeff King
2017-03-01 19:38 ` Junio C Hamano
2017-03-01 19:43 ` Jeff King
2017-03-01 19:22 ` Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1488297556.2955.11.camel@enea.com \
--to=adrian.dudau@enea.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).