Zhang LeI have a translation project which uses UTF-8 as charset. So the patch must be encoded in UTF-8, not just the commit msg etc. And we use google group as our mailing list.
Recently, mails saved from gmail are encoded using local charset based on google group's setting. This seems smart but it caused inconvenience for our project.
Since we have no control on what google will do, so I took another way, i.e. add this option to git-mailinfo. I hope this could benefit others as well.
Changelog:
v2 -> v3: Removed 'const' type qualifier from handle_patch()'s parameter Fixed typos in commit msg
v1 -> v2: Clarified how -u/--encoding is handled in git-mailinfo's documentation
Signed-off-by: Zhang Le <r0bertz@gentoo.org> --- Documentation/git-mailinfo.txt | 6 +++++- builtin/mailinfo.c | 10 ++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-)
Show changes to 2 files +13 −3
Documentation/git-mailinfo.txt, builtin/mailinfo.c
diff --git a/Documentation/git-mailinfo.txt b/Documentation/git-mailinfo.txt index 3ea5aad..24d5bd7 100644 --- a/Documentation/git-mailinfo.txt +++ b/Documentation/git-mailinfo.txt @@ -45,7 +45,7 @@ OPTIONS them. This used to be optional but now it is the default. + Note that the patch is always used as-is without charset -conversion, even with this flag. +conversion, even with this flag. Unless --recode-patch is used. --encoding=<encoding>:: Similar to -u. But when re-coding, the charset specified here is @@ -54,6 +54,10 @@ conversion, even with this flag. -n:: Disable all charset re-coding of the metadata. +--recode-patch:: + Similar to -u. But what is re-coded is the patch instead of the + metainfo. The default is off. + --scissors:: Remove everything in body before a scissors line. A line that mainly consists of scissors (either ">8" or "8<") and perforation diff --git a/builtin/mailinfo.c b/builtin/mailinfo.c index 4a9729b..bb87b32 100644 --- a/builtin/mailinfo.c +++ b/builtin/mailinfo.c @@ -12,6 +12,7 @@ static FILE *cmitmsg, *patchfile, *fin, *fout; static int keep_subject; static int keep_non_patch_brackets_in_subject; static const char *metainfo_charset; +static int recode_patch; static struct strbuf line = STRBUF_INIT; static struct strbuf name = STRBUF_INIT; static struct strbuf email = STRBUF_INIT; @@ -828,8 +829,10 @@ static int handle_commit_msg(struct strbuf *line) return 0; } -static void handle_patch(const struct strbuf *line) +static void handle_patch(struct strbuf *line) { + if (recode_patch) + convert_to_utf8(line, charset.buf); fwrite(line->buf, 1, line->len, patchfile); patch_lines++; } @@ -1021,7 +1024,7 @@ static int git_mailinfo_config(const char *var, const char *value, void *unused) } static const char mailinfo_usage[] = - "git mailinfo [-k|-b] [-u | --encoding=<encoding> | -n] [--scissors | --no-scissors] msg patch < mail >info"; + "git mailinfo [-k|-b] [-u | --encoding=<encoding> | -n] [--recode-patch] [--scissors | --no-scissors] msg patch < mail >info"; int cmd_mailinfo(int argc, const char **argv, const char *prefix) { @@ -1034,6 +1037,7 @@ int cmd_mailinfo(int argc, const char **argv, const char *prefix) def_charset = (git_commit_encoding ? git_commit_encoding : "UTF-8"); metainfo_charset = def_charset; + recode_patch = 0; while (1 < argc && argv[1][0] == '-') { if (!strcmp(argv[1], "-k")) @@ -1046,6 +1050,8 @@ int cmd_mailinfo(int argc, const char **argv, const char *prefix) metainfo_charset = NULL; else if (!prefixcmp(argv[1], "--encoding=")) metainfo_charset = argv[1] + 11; + else if (!strcmp(argv[1], "--recode-patch")) + recode_patch = 1; else if (!strcmp(argv[1], "--scissors")) use_scissors = 1; else if (!strcmp(argv[1], "--no-scissors"))
-- 1.7.1
